Merge pull request #141 from blocknative/feature/handle-missing-module

Handle case where wallet module doesn't exist.

Closes #140

Author: lnbc1QWFyb24

src/stores.ts

@@ -22,7 +22,8 @@ export const app: WritableStore = writable({
   walletSelectInProgress: false,
   walletSelectCompleted: false,
   walletCheckInProgress: false,
-  walletCheckCompleted: false
+  walletCheckCompleted: false,
+  autoSelectWallet: ''
 })
 
 export const balanceSyncStatus: {

src/views/WalletSelect.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import BigNumber from 'bignumber.js'
-  import { onDestroy } from 'svelte'
   import { get } from 'svelte/store'
   import { fade } from 'svelte/transition'
 
@@ -53,25 +52,11 @@
 
   let loadingWallet: string | undefined = undefined
 
-  let appState: AppState = {
-    dappId: '',
-    networkId: 1,
-    version: '',
-    mobileDevice: false,
-    darkMode: false,
-    autoSelectWallet: '',
-    walletSelectInProgress: true,
-    walletSelectCompleted: false,
-    walletCheckInProgress: false,
-    walletCheckCompleted: false
-  }
-
-  const unsubscribe = app.subscribe((store: AppState) => (appState = store))
-  onDestroy(unsubscribe)
-
   renderWalletSelect()
 
   async function renderWalletSelect() {
+    const appState = get(app)
+
     wallets = await wallets
 
     const deviceWallets = (wallets as WalletModule[]).filter(
@@ -82,7 +67,10 @@
       const module = deviceWallets.find(
         (m: WalletModule) => m.name === appState.autoSelectWallet
       )
-      module && handleWalletSelect(module)
+
+      app.update(store => ({ ...store, autoSelectWallet: '' }))
+
+      module ? handleWalletSelect(module) : finish({ completed: false })
     } else {
       if (deviceWallets.find(wallet => wallet.preferred)) {
         // if preferred wallets, then split in to preferred and not preferred