From 89c5aac9ed82972185e3d4f90cdf286e89443a9b Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 17 May 2022 16:12:59 -0700
Subject: [PATCH] tap ui settings get to avoid dup

---
 src-ui/src/app/app.module.ts                |  1 -
 src-ui/src/app/services/settings.service.ts | 17 +++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 79bbe9700..0c9d628d0 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -87,7 +87,6 @@ import localeSr from '@angular/common/locales/sr'
 import localeSv from '@angular/common/locales/sv'
 import localeTr from '@angular/common/locales/tr'
 import localeZh from '@angular/common/locales/zh'
-import { Observable } from 'rxjs'
 import { SettingsService } from './services/settings.service'
 
 registerLocaleData(localeBe)
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 4aa125380..6ab52d086 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -10,7 +10,7 @@ import {
 } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
 import { CookieService } from 'ngx-cookie-service'
-import { first, Observable } from 'rxjs'
+import { first, Observable, tap } from 'rxjs'
 import {
   BRIGHTNESS,
   estimateBrightnessForColor,
@@ -60,13 +60,14 @@ export class SettingsService {
 
   // this is called by the app initializer in app.module
   public initializeSettings(): Observable<PaperlessUiSettings> {
-    let settings$ = this.http.get<PaperlessUiSettings>(this.baseUrl)
-    settings$.pipe(first()).subscribe((uisettings) => {
-      Object.assign(this.settings, uisettings.settings)
-      this.maybeMigrateSettings()
-      this.displayName = uisettings.display_name.trim()
-    })
-    return settings$
+    return this.http.get<PaperlessUiSettings>(this.baseUrl).pipe(
+      first(),
+      tap((uisettings) => {
+        Object.assign(this.settings, uisettings.settings)
+        this.maybeMigrateSettings()
+        this.displayName = uisettings.display_name.trim()
+      })
+    )
   }
 
   public updateAppearanceSettings(