diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-19 13:58:46 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-19 13:58:46 +0800 |
| commit | c8c773d6416f92c520a509a9811d73f68aa00fc0 (patch) | |
| tree | 495a798eeb4a5272c80d93725f5146a6fbcf85c8 /ui/index.js | |
| parent | 5bdee96e73f65a0b369277e9c56b0afe5159e65b (diff) | |
| parent | de1da7d1b215ade650fc644adf63384a401dc240 (diff) | |
| download | tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.gz tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.bz2 tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.lz tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.xz tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.zst tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.zip | |
Merge branch 'NewUI-flat' into merge
Diffstat (limited to 'ui/index.js')
| -rw-r--r-- | ui/index.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/index.js b/ui/index.js index ae05cbe67..fff677471 100644 --- a/ui/index.js +++ b/ui/index.js @@ -38,8 +38,11 @@ function startApp (metamaskState, accountManager, opts) { // if unconfirmed txs, start on txConf page const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network) - if (unapprovedTxsAll.length > 0) { - store.dispatch(actions.showConfTxPage()) + const numberOfUnapprivedTx = unapprovedTxsAll.length + if (numberOfUnapprivedTx > 0) { + store.dispatch(actions.showConfTxPage({ + id: unapprovedTxsAll[numberOfUnapprivedTx - 1].id, + })) } accountManager.on('update', function (metamaskState) { |