feat(neuron-ui): handle current-wallet update and wallet-list update …

…separately
nervosnetwork · Aug 2, 2019 · bd4c109 · bd4c109
1 parent 5623f3b
commit bd4c109
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -154,7 +154,11 @@ export const useSubscription = ({
           updateTransaction({ walletID, hash: txHash })
           break
         }
-        case 'wallet': {
+        case 'current-wallet': {
+          updateCurrentWallet()(dispatch)
+          break
+        }
+        case 'wallets': {
           updateWalletList()(dispatch)
           updateCurrentWallet()(dispatch)
           break

diff --git a/packages/neuron-ui/src/types/Subject/index.d.ts b/packages/neuron-ui/src/types/Subject/index.d.ts
@@ -17,7 +17,7 @@ declare namespace Subject {
   }
   interface DataUpdateMetaInfo {
     walletID?: string
-    dataType: 'address' | 'transaction' | 'wallet' | 'network'
+    dataType: 'address' | 'transaction' | 'current-wallet' | 'wallets' | 'network'
     actionType: 'create' | 'update' | 'delete'
   }
   type NetworkList = State.Network[]

diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
@@ -40,14 +40,14 @@ app.on('ready', async () => {
   WalletListSubject.pipe(debounceTime(50)).subscribe(({ currentWallet = null, currentWalletList = [] }) => {
     const walletList = currentWalletList.map(({ id, name }) => ({ id, name }))
     const currentWalletId = currentWallet ? currentWallet.id : null
-    dataUpdateSubject.next({ dataType: 'wallet', actionType: 'update' })
+    dataUpdateSubject.next({ dataType: 'wallets', actionType: 'update' })
     updateApplicationMenu(walletList, currentWalletId)
   })
 
   CurrentWalletSubject.pipe(debounceTime(50)).subscribe(async ({ currentWallet = null, walletList = [] }) => {
     updateApplicationMenu(walletList, currentWallet ? currentWallet.id : null)
     if (currentWallet) {
-      dataUpdateSubject.next({ dataType: 'wallet', actionType: 'update' })
+      dataUpdateSubject.next({ dataType: 'current-wallet', actionType: 'update' })
     }
   })
 

diff --git a/packages/neuron-wallet/src/models/subjects/data-update.ts b/packages/neuron-wallet/src/models/subjects/data-update.ts
@@ -2,7 +2,7 @@ import { Subject } from 'rxjs'
 import WindowManager from '../window-manager'
 
 export const DataUpdateSubject = new Subject<{
-  dataType: 'address' | 'transaction' | 'wallet' | 'network'
+  dataType: 'address' | 'transaction' | 'wallets' | 'current-wallet' | 'network'
   actionType: 'create' | 'update' | 'delete'
 }>()
 

diff --git a/packages/neuron-wallet/src/models/window-manager.ts b/packages/neuron-wallet/src/models/window-manager.ts
@@ -8,7 +8,9 @@ export default class WindowManager {
     }
   }
 
-  public static dataUpdated = (meta: { dataType: 'wallet' | 'address' | 'transaction' | 'network' }) => {
+  public static dataUpdated = (meta: {
+    dataType: 'current-wallet' | 'wallets' | 'address' | 'transaction' | 'network'
+  }) => {
     if (WindowManager.mainWindow) {
       WindowManager.mainWindow.webContents.send('data-updated', meta)
     }