From afe4512a0a4c4f24fd444d5be38d8e605f56a11f Mon Sep 17 00:00:00 2001
From: Johnny Almonte <johnny243@users.noreply.github.com>
Date: Wed, 24 Jun 2020 00:31:47 -0400
Subject: [PATCH 1/2] fix: initialize userPreferences in preferencesManager

---
 app/assets/javascripts/services/preferencesManager.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/services/preferencesManager.ts b/app/assets/javascripts/services/preferencesManager.ts
index b5da00165..1a19d8867 100644
--- a/app/assets/javascripts/services/preferencesManager.ts
+++ b/app/assets/javascripts/services/preferencesManager.ts
@@ -25,6 +25,9 @@ export class PreferencesManager extends ApplicationService {
   }
 
   streamPreferences() {
+    if (!this.userPreferences) {
+      this.loadSingleton();
+    }
     this.application!.streamItems(
       ContentType.UserPrefs,
       () => {

From cec1ec9d7e4d9a5d57189952cfeb832299309d10 Mon Sep 17 00:00:00 2001
From: Johnny Almonte <johnny243@users.noreply.github.com>
Date: Wed, 24 Jun 2020 08:34:04 -0400
Subject: [PATCH 2/2] refactor: rename loadSingleton to reloadSingleton

---
 app/assets/javascripts/services/preferencesManager.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/services/preferencesManager.ts b/app/assets/javascripts/services/preferencesManager.ts
index 1a19d8867..e70b4df02 100644
--- a/app/assets/javascripts/services/preferencesManager.ts
+++ b/app/assets/javascripts/services/preferencesManager.ts
@@ -17,6 +17,7 @@ export class PreferencesManager extends ApplicationService {
   /** @override */
   async onAppLaunch() {
     super.onAppLaunch();
+    this.reloadSingleton();
     this.streamPreferences();
   }
 
@@ -25,18 +26,15 @@ export class PreferencesManager extends ApplicationService {
   }
 
   streamPreferences() {
-    if (!this.userPreferences) {
-      this.loadSingleton();
-    }
     this.application!.streamItems(
       ContentType.UserPrefs,
       () => {
-        this.loadSingleton();
+        this.reloadSingleton();
       }
     );
   }
 
-  private async loadSingleton() {
+  private async reloadSingleton() {
     if(this.loadingPrefs) {
       return;
     }