feat(neuron-ui): navigate to the Overview view on wallet switching

nervosnetwork · Aug 2, 2019 · bea4b20 · bea4b20
1 parent c0a20bd
commit bea4b20
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/app.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/app.ts
@@ -13,13 +13,6 @@ import {
 } from 'utils/localCache'
 
 export const initAppState = () => (dispatch: StateDispatch, history: any) => {
-  dispatch({
-    type: AppActions.UpdateLoadings,
-    payload: {
-      addressList: true,
-      transactionList: true,
-    },
-  })
   getNeuronWalletState()
     .then(res => {
       if (res.status) {
@@ -49,6 +42,8 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
         })
         if (!wallet) {
           history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
+        } else {
+          history.push(Routes.Overview)
         }
 
         currentWalletCache.save(wallet)
@@ -63,15 +58,6 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
     .catch(() => {
       history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
     })
-    .finally(() => {
-      dispatch({
-        type: AppActions.UpdateLoadings,
-        payload: {
-          addressList: false,
-          transactionList: false,
-        },
-      })
-    })
 }
 
 export const addPopup = (text: string) => (dispatch: StateDispatch) => {