cleanup notify disabled logic

Author: Adamj1232

packages/core/src/index.ts

@@ -4,7 +4,11 @@ import disconnectWallet from './disconnect'
 import setChain from './chain'
 import { state } from './store'
 import { reset$ } from './streams'
-import { validateInitOptions, validateNotify, validateNotifyOptions } from './validation'
+import {
+  validateInitOptions,
+  validateNotify,
+  validateNotifyOptions
+} from './validation'
 import initI18N from './i18n'
 import App from './views/Index.svelte'
 import type { InitOptions, OnboardAPI, Notify } from './types'
@@ -106,11 +110,11 @@ function init(options: InitOptions): OnboardAPI {
   if (typeof notify !== 'undefined') {
     if ('desktop' in notify || 'mobile' in notify) {
       const error = validateNotifyOptions(notify)
-  
+
       if (error) {
         throw error
       }
-  
+
       if (
         (!notify.desktop || (notify.desktop && !notify.desktop.position)) &&
         accountCenter &&
@@ -128,6 +132,7 @@ function init(options: InitOptions): OnboardAPI {
         notify.mobile.position = accountCenter.mobile.position
       }
       let notifyUpdate: Partial<Notify>
+
       if (device.type === 'mobile' && notify.mobile) {
         notifyUpdate = {
           ...APP_INITIAL_STATE.notify,
@@ -139,15 +144,34 @@ function init(options: InitOptions): OnboardAPI {
           ...notify.desktop
         }
       }
+      if (!apiKey || !notifyUpdate.enabled) {
+        notifyUpdate.enabled = false
+      }
       updateNotify(notifyUpdate)
     } else {
       const error = validateNotify(notify as Notify)
-  
+
       if (error) {
         throw error
       }
-      updateNotify(notify as Notify)
+      const notifyUpdate: Partial<Notify> = {
+        ...APP_INITIAL_STATE.notify,
+        ...notify
+      }
+
+      if (!apiKey || !notifyUpdate.enabled) {
+        notifyUpdate.enabled = false
+      }
+      console.log(notifyUpdate)
+      updateNotify(notifyUpdate)
+    }
+  } else {
+    const notifyUpdate: Partial<Notify> = APP_INITIAL_STATE.notify
+
+    if (!apiKey) {
+      notifyUpdate.enabled = false
     }
+    updateNotify(notifyUpdate)
   }
 
   if (svelteInstance) {

packages/core/src/views/Index.svelte

@@ -8,6 +8,9 @@
   import AccountCenter from './account-center/Index.svelte'
   import Notify from './notify/Index.svelte'
   import { configuration } from '../configuration'
+import type { Observable } from 'rxjs';
+import type { Notification } from '../types'
+
 
   const { device } = configuration
   const accountCenter$ = state
@@ -18,9 +21,7 @@
     .select('notify')
     .pipe(startWith(state.get().notify), shareReplay(1))
 
-  const notifications$ = $notify$.enabled
-    ? state.select('notifications').pipe(startWith(state.get().notifications))
-    : null
+  const notifications$: Observable<Notification[]> = state.select('notifications').pipe(startWith(state.get().notifications))
 
   const positioningDefaults = {
     topLeft: 'top: 0; left: 0;',