feat: remove empty current wallet handler from the main view

and add the handler in the callback of init function
nervosnetwork · Jul 28, 2019 · 5810cbb · 5810cbb
1 parent 476a918
commit 5810cbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -22,8 +22,7 @@ import {
   Command as CommandSubject,
 } from 'services/subjects'
 import { ckbCore, getTipBlockNumber, getBlockchainInfo } from 'services/chain'
-import { Routes, ConnectionStatus } from 'utils/const'
-import { WalletWizardPath } from 'components/WalletWizard'
+import { ConnectionStatus } from 'utils/const'
 import {
   networks as networksCache,
   currentNetworkID as currentNetworkIDCache,
@@ -102,7 +101,6 @@ export const useOnCurrentWalletChange = ({
     if (walletID) {
       initAppState()(dispatch, history)
     } else {
-      history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
       initAppState()(dispatch, history)
     }
   }, [walletID, dispatch, history])

diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/app.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/app.ts
@@ -18,7 +18,6 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
       transactionList: true,
     },
   })
-  setTimeout(() => {})
   getNeuronWalletState()
     .then(res => {
       if (res.status) {
@@ -39,6 +38,9 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
           type: NeuronWalletActions.UpdateTransactionList,
           payload: transactions,
         })
+        if (!wallet) {
+          history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
+        }
 
         currentWalletCache.save(wallet)
         walletsCache.save(wallets)
@@ -47,6 +49,9 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
         history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
       }
     })
+    .catch(() => {
+      history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
+    })
     .finally(() => {
       dispatch({
         type: AppActions.UpdateLoadings,