Merge pull request #492 from hermeznetwork/develop

Develop
hermeznetwork · May 19, 2021 · 8945369 · 8945369
2 parents 128b3d6 + 7ec8348
commit 8945369
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/store/login/login.reducer.js b/src/store/login/login.reducer.js
@@ -43,7 +43,10 @@ function loginReducer (state = initialLoginState, action) {
   switch (action.type) {
     case loginActionTypes.GO_TO_WALLET_SELECTOR_STEP: {
       return {
-        ...initialLoginState
+        ...state,
+        currentStep: initialLoginState.currentStep,
+        steps: { ...initialLoginState.steps },
+        addAccountAuthTask: { ...initialLoginState.addAccountAuthTask }
       }
     }
     case loginActionTypes.GO_TO_ACCOUNT_SELECTOR_STEP: {
@@ -221,7 +224,12 @@ function loginReducer (state = initialLoginState, action) {
       }
     }
     case loginActionTypes.RESET_STATE: {
-      return initialLoginState
+      return {
+        ...state,
+        currentStep: initialLoginState.currentStep,
+        steps: { ...initialLoginState.steps },
+        addAccountAuthTask: { ...initialLoginState.addAccountAuthTask }
+      }
     }
     default: {
       return state

diff --git a/src/views/shared/token-balance/token-balance.view.jsx b/src/views/shared/token-balance/token-balance.view.jsx
@@ -9,7 +9,7 @@ function TokenBalance ({ amount, symbol }) {
   return (
     <p className={classes.root}>
       <span className={classes.amount}>
-        {!isNaN(amount) ? amount.toFixed(2) : '--'} {symbol || <></>}
+        {!isNaN(amount) ? amount : '--'} {symbol || <></>}
       </span>
     </p>
   )