From 1ee921b089383f072bb94b1081e85289a836c765 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Sat, 5 Sep 2020 23:44:33 +0200
Subject: [PATCH] Fix bug with user badge that is not appearing

---
 UI/MoreScreen.ts | 10 ++++++----
 UI/UserBadge.ts  |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UI/MoreScreen.ts b/UI/MoreScreen.ts
index 57eeef2..55d6fbe 100644
--- a/UI/MoreScreen.ts
+++ b/UI/MoreScreen.ts
@@ -19,7 +19,7 @@ export class MoreScreen extends UIElement {
 
     }
 
-    private static createLinkButton(layout: Layout, customThemeDefinition: string = undefined) {
+    private createLinkButton(layout: Layout, customThemeDefinition: string = undefined) {
         if (layout === undefined) {
             return undefined;
         }
@@ -28,7 +28,9 @@ export class MoreScreen extends UIElement {
             return undefined;
         }
         if (layout.hideFromOverview) {
-            if (State.state.osmConnection.GetPreference("hidden-theme-" + layout.id + "-enabled").data !== "true") {
+            const pref = State.state.osmConnection.GetPreference("hidden-theme-" + layout.id + "-enabled");
+            this.ListenTo(pref);
+            if (pref.data !== "true") {
                 return undefined;
             }
         }
@@ -93,7 +95,7 @@ export class MoreScreen extends UIElement {
             if (layout.id !== k) {
                 continue; // This layout was added multiple time due to an uppercase
             }
-            els.push(MoreScreen.createLinkButton(layout));
+            els.push(this.createLinkButton(layout));
         }
 
 
@@ -102,7 +104,7 @@ export class MoreScreen extends UIElement {
             els.push(Translations.t.general.customThemeIntro)
 
             for (const installed of State.state.installedThemes.data) {
-                els.push(MoreScreen.createLinkButton(installed.layout, installed.definition));
+                els.push(this.createLinkButton(installed.layout, installed.definition));
             }
         }
 
diff --git a/UI/UserBadge.ts b/UI/UserBadge.ts
index c15b778..f06e836 100644
--- a/UI/UserBadge.ts
+++ b/UI/UserBadge.ts
@@ -5,9 +5,7 @@ import {VariableUiElement} from "./Base/VariableUIElement";
 import Translations from "./i18n/Translations";
 import {UserDetails} from "../Logic/Osm/OsmConnection";
 import {State} from "../State";
-import {Utils} from "../Utils";
 import {UIEventSource} from "../Logic/UIEventSource";
-import {SubtleButton} from "./Base/SubtleButton";
 import {InitUiElements} from "../InitUiElements";
 import Combine from "./Base/Combine";
 
@@ -25,7 +23,7 @@ export class UserBadge extends UIElement {
     constructor() {
         super(State.state.osmConnection.userDetails);
         this._userDetails = State.state.osmConnection.userDetails;
-        this._languagePicker = InitUiElements.CreateLanguagePicker();
+        this._languagePicker = InitUiElements.CreateLanguagePicker() ?? new FixedUiElement("");
         this._loginButton = Translations.t.general.loginWithOpenStreetMap
             .Clone()
             .SetClass("userbadge-login")