fix router initialisation (#726)

bloomwalletio · Sep 18, 2023 · 14295a6 · 14295a6
1 parent ff970b8
commit 14295a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte
@@ -73,18 +73,16 @@
         features.analytics.appStart.enabled && Platform.trackEvent('app-start')
         await cleanupEmptyProfiles()
         checkAndMigrateProfiles()
-
         Platform.onEvent('deep-link-request', handleDeepLink)
 
         setTimeout(() => {
             splash = false
-            initialiseRouters()
             // check if deep link request was received while splash screen was active
             Platform.DeepLinkManager.checkForDeepLinkRequest()
         }, 3000)
-
         initAppSettings.set($appSettings)
 
+        initialiseRouters()
         initialiseRouterManager({
             extensions: [
                 [RouterManagerExtensionName.GetAppRouter, getAppRouter],

diff --git a/packages/shared/src/lib/core/router/actions/initialiseRouterManager.ts b/packages/shared/src/lib/core/router/actions/initialiseRouterManager.ts
@@ -1,16 +1,10 @@
-import { get } from 'svelte/store'
-
 import { IRouterManager, IRouterManagerOptions } from '../interfaces'
 import { routerManager } from '../stores'
 
 export function initialiseRouterManager(options: IRouterManagerOptions): void {
-    if (get(routerManager)) {
-        throw new Error('Router manager has already been initialised.')
-    } else {
-        const { extensions } = options
-        const _routerManager = {
-            ...Object.fromEntries(extensions),
-        }
-        routerManager.set(<IRouterManager>(<unknown>_routerManager))
+    const { extensions } = options
+    const _routerManager = {
+        ...Object.fromEntries(extensions),
     }
+    routerManager.set(<IRouterManager>(<unknown>_routerManager))
 }