fix: Init wallet device.

yanguoyu · Feb 4, 2023 · 3806557 · 3806557
1 parent b9aa2c9
commit 3806557
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/neuron-ui/src/services/localCache.ts b/packages/neuron-ui/src/services/localCache.ts
@@ -88,13 +88,13 @@ export const currentWallet = {
     window.localStorage.setItem(LocalCacheKey.CurrentWallet, walletStr)
     return true
   },
-  load: (): { [index: string]: string } => {
+  load: (): State.WalletIdentity | undefined => {
     const walletStr = window.localStorage.getItem(LocalCacheKey.CurrentWallet) || '{}'
     try {
-      return JSON.parse(walletStr)
+      return JSON.parse(walletStr) as State.WalletIdentity
     } catch (err) {
       console.error(`Cannot parse current wallet`)
-      return {}
+      return undefined
     }
   },
 }

diff --git a/packages/neuron-ui/src/states/init/wallet.ts b/packages/neuron-ui/src/states/init/wallet.ts
@@ -10,10 +10,13 @@ export const emptyWallet: State.Wallet = {
 const wallet = currentWallet.load()
 
 export const walletState: State.Wallet = {
-  name: wallet.name || '',
-  id: wallet.id || '',
+  name: wallet?.name || '',
+  id: wallet?.id || '',
   balance: '0',
   addresses: addresses.load(),
+  device: wallet?.device,
+  isHD: wallet?.isHD,
+  isWatchOnly: wallet?.isWatchOnly,
 }
 
 export default walletState