diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-23 05:34:56 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-23 05:38:17 +0800 |
| commit | e1077836ce916e2bd788451e3f365324024a1c0c (patch) | |
| tree | 77954f105cc7c693a57ac8790c928286bed5d384 /ui/app/reducers/app.js | |
| parent | 13f22ff6b087f3865f84a0672a9013ada88be61a (diff) | |
| download | tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar.gz tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar.bz2 tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar.lz tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar.xz tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.tar.zst tangerine-wallet-browser-e1077836ce916e2bd788451e3f365324024a1c0c.zip | |
Add Confirm Send token screen
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index fbabad0ef..c64046518 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -380,36 +380,36 @@ function reduceApp (state, action) { case actions.COMPLETED_TX: log.debug('reducing COMPLETED_TX for tx ' + action.value) - const otherUnconfActions = getUnconfActionList(state) - .filter(tx => tx.id !== action.value) - const hasOtherUnconfActions = otherUnconfActions.length > 0 - - if (hasOtherUnconfActions) { - log.debug('reducer detected txs - rendering confTx view') - return extend(appState, { - transForward: false, - currentView: { - name: 'confTx', - context: 0, - }, - warning: null, - }) - } else { - log.debug('attempting to close popup') - return extend(appState, { - // indicate notification should close - shouldClose: true, - transForward: false, - warning: null, - currentView: { - name: 'accountDetail', - context: state.metamask.selectedAddress, - }, - accountDetail: { - subview: 'transactions', - }, - }) - } + // const otherUnconfActions = getUnconfActionList(state) + // .filter(tx => tx.id !== action.value) + // const hasOtherUnconfActions = otherUnconfActions.length > 0 + + // if (hasOtherUnconfActions) { + // log.debug('reducer detected txs - rendering confTx view') + // return extend(appState, { + // transForward: false, + // currentView: { + // name: 'confTx', + // context: 0, + // }, + // warning: null, + // }) + // } else { + log.debug('attempting to close popup') + return extend(appState, { + // indicate notification should close + shouldClose: true, + transForward: false, + warning: null, + currentView: { + name: 'accountDetail', + context: state.metamask.selectedAddress, + }, + accountDetail: { + subview: 'transactions', + }, + }) + // } case actions.NEXT_TX: return extend(appState, { |