Ensure that the confirm screen renders before the home screen if ther…

…e are unapproved txs.
MetaMask · Apr 24, 2019 · fe1b940 · fe1b940
1 parent 8f7577f
commit fe1b940
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
@@ -34,17 +34,14 @@ export default class Home extends PureComponent {
     if (Object.keys(suggestedTokens).length > 0) {
         history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE)
     }
-
-    if (unconfirmedTransactionsCount > 0) {
-      history.push(CONFIRM_TRANSACTION_ROUTE)
-    }
   }
 
   render () {
     const {
       forgottenPassword,
       seedWords,
       providerRequests,
+      unconfirmedTransactionsCount,
     } = this.props
 
     // seed words
@@ -62,6 +59,9 @@ export default class Home extends PureComponent {
       )
     }
 
+    if (unconfirmedTransactionsCount > 0) {
+      return <Redirect to={{ pathname: CONFIRM_TRANSACTION_ROUTE }} />
+    }
     return (
       <div className="main-container">
         <div className="account-and-transaction-details">