Fix Wallet interface definition

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -33,6 +33,10 @@ export interface WalletCheckModule {
   reset?: () => void
 }
 
+export interface Connect {
+  (): Promise<{ message: string } | string[] | undefined>
+}
+
 export interface WalletCheckModal {
   heading: string
   description: string
@@ -42,7 +46,7 @@ export interface WalletCheckModal {
     text: string
   }
   eventCode: string
-  action?: () => Promise<{ message: string } | undefined>
+  action?: Connect | null
   icon?: string
 }
 
@@ -58,7 +62,7 @@ export interface UserState {
   address: string
   network: number
   balance: string
-  wallet: Wallet | null
+  wallet: Wallet
   mobileDevice: boolean
   appNetworkId: number
 }
@@ -127,7 +131,7 @@ export interface Helpers {
 
 export interface WalletInterface {
   name: string | undefined
-  connect?: () => Promise<{ message: string } | string[] | undefined>
+  connect?: Connect | null
   disconnect?: () => void
   address: StateSyncer
   network: StateSyncer
@@ -141,12 +145,12 @@ export interface StateSyncer {
 }
 
 export interface Wallet {
-  name: string
-  provider: any
-  type: 'hardware' | 'injected' | 'sdk'
-  instance?: any
-  connect?: () => Promise<{ message: string } | undefined>
-  dashboard?: () => void
+  name: string | null
+  provider: any | null
+  type: 'hardware' | 'injected' | 'sdk' | null
+  instance?: any | null
+  connect?: Connect | null
+  dashboard?: () => void | null
 }
 
 export interface CommonWalletOptions {

src/modules/check/derivation-path.ts

@@ -1,4 +1,4 @@
-import { WalletCheckModal, StateAndHelpers } from '../../interfaces'
+import { WalletCheckModal, StateAndHelpers, Connect } from '../../interfaces'
 import { usbIcon } from './icons'
 
 interface DerivationPaths {
@@ -189,12 +189,13 @@ function derivationPath(
             wallet.name === 'Ledger' ? 'and the Ethereum app is open, ' : ''
           }then select a derivation path to connect your accounts:`,
         eventCode: 'derivationPath',
-        html: derivationSelectHtmlString(wallet.name),
+        html: derivationSelectHtmlString(wallet.name as string),
         button: {
           text: 'Connect',
           onclick: async () => {
             state.loading = true
-            const path = state.dPath || derivationPaths[wallet.name][0].path
+            const path =
+              state.dPath || derivationPaths[wallet.name as string][0].path
             try {
               const validPath = await wallet.provider.setPath(
                 path,
@@ -214,11 +215,9 @@ function derivationPath(
 
             state.error = ''
 
-            wallet.connect &&
-              wallet
-                .connect()
+            if (wallet.connect) {
+              ;(wallet.connect as Connect)()
                 .then(() => {
-                  // @TODO add path to local store
                   deleteWindowProperties()
                   state.loading = false
                   state.completed = true
@@ -227,6 +226,7 @@ function derivationPath(
                   state.error = error.message
                   state.loading = false
                 })
+            }
           }
         },
 

src/stores.ts

@@ -125,11 +125,11 @@ export function resetWalletState(options?: {
     // no options object, so do a full reset by disconnecting and setting interface to null
     if (!options) {
       wallet.update(() => ({
-        name: undefined,
-        provider: undefined,
-        connect: undefined,
-        instance: undefined,
-        dashboard: undefined
+        name: null,
+        provider: null,
+        connect: null,
+        instance: null,
+        dashboard: null
       }))
 
       currentInterface.disconnect && currentInterface.disconnect()
@@ -142,11 +142,11 @@ export function resetWalletState(options?: {
     // if walletName is the same as the current interface name then do a full reset (checking if to do a disconnect)
     if (currentInterface.name === walletName) {
       wallet.update(() => ({
-        name: undefined,
-        provider: undefined,
-        connect: undefined,
-        instance: undefined,
-        dashboard: undefined
+        name: null,
+        provider: null,
+        connect: null,
+        instance: null,
+        dashboard: null
       }))
 
       !disconnected &&

src/views/WalletCheck.svelte

@@ -28,7 +28,8 @@
     WalletSelectFunction,
     AppState,
     WalletCheckModal,
-    UserState
+    UserState,
+    Connect
   } from '../interfaces'
 
   export let walletSelect: WalletSelectFunction
@@ -155,8 +156,7 @@
 
     activeModal &&
       activeModal.action &&
-      activeModal
-        .action()
+      (activeModal.action as Connect)()
         .then(() => {
           actionResolved = true
           loading = false