From d3dbdebbcfaf9efccafd9ff1d23995f083bf95c7 Mon Sep 17 00:00:00 2001
From: Aaron Greenspan <afg419@gmail.com>
Date: Wed, 20 Jan 2021 23:21:24 -0700
Subject: [PATCH] ui: no mutations, less hacky

---
 ui/src/app/modals/os-welcome/os-welcome.page.ts | 4 +++-
 ui/src/app/services/startup-alerts.notifier.ts  | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/modals/os-welcome/os-welcome.page.ts b/ui/src/app/modals/os-welcome/os-welcome.page.ts
index bb64d7aad..975cf9523 100644
--- a/ui/src/app/modals/os-welcome/os-welcome.page.ts
+++ b/ui/src/app/modals/os-welcome/os-welcome.page.ts
@@ -28,6 +28,8 @@ export class OSWelcomePage {
         .then(() => this.apiService.acknowledgeOSWelcome(this.config.version))
         .catch(console.error)
 
-    return this.modalCtrl.dismiss({ autoCheckUpdates: this.autoCheckUpdates })
+    // return false to skip subsequent alert modals
+    // return true to show subsequent alert modals
+    return this.modalCtrl.dismiss(this.autoCheckUpdates)
   }
 }
diff --git a/ui/src/app/services/startup-alerts.notifier.ts b/ui/src/app/services/startup-alerts.notifier.ts
index 5ba8137f9..d4436d697 100644
--- a/ui/src/app/services/startup-alerts.notifier.ts
+++ b/ui/src/app/services/startup-alerts.notifier.ts
@@ -39,7 +39,7 @@ export class StartupAlertsNotifier {
         c.hasRun = true
         if (!checkRes) return
         const displayRes = await previousDisplay
-        if (c.shouldRun(server) && !!displayRes) return c.display(checkRes)
+        if (displayRes) return c.display(checkRes)
       }, Promise.resolve(true))
   }
 
@@ -103,8 +103,7 @@ export class StartupAlertsNotifier {
 
       await modal.present()
       modal.onWillDismiss().then(res => {
-        s = Object.assign(s, res.data)
-        return resolve(true)
+        return resolve(res.data)
       })
     })
   }