From aa60944e30b7d1d9680b5ca53e8b61a8edb47904 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 30 Aug 2017 00:08:35 -0230 Subject: [PATCH] Remove default to confirm screen on login. --- ui/app/reducers/app.js | 4 ---- ui/index.js | 6 ------ 2 files changed, 10 deletions(-) diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index f444aaf38..b2e5543ea 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -14,10 +14,6 @@ function reduceApp (state, action) { if (selectedAddress) { name = 'accountDetail' } - if (hasUnconfActions) { - log.debug('pending txs detected, defaulting to conf-tx view.') - name = 'confTx' - } var defaultView = { name, diff --git a/ui/index.js b/ui/index.js index a729138d3..f748c1ea2 100644 --- a/ui/index.js +++ b/ui/index.js @@ -36,12 +36,6 @@ function startApp (metamaskState, accountManager, opts) { networkVersion: opts.networkVersion, }) - // if unconfirmed txs, start on txConf page - const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.network) - if (unapprovedTxsAll.length > 0) { - store.dispatch(actions.showConfTxPage()) - } - accountManager.on('update', function (metamaskState) { store.dispatch(actions.updateMetamaskState(metamaskState)) })