aboutsummaryrefslogtreecommitdiffstats
path: root/ui/index.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
commit6f86c5f8ee6779eddfde1fbc32e356bbc80708f3 (patch)
tree3458a0b05c8e0664ae6d853b47a385225ea722d2 /ui/index.js
parent5f8d3085d7603135849eb22ad22c70733c236c2d (diff)
downloadtangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.gz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.bz2
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.lz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.xz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.zst
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.zip
Add network checks for unconfirmed Txs
Diffstat (limited to 'ui/index.js')
-rw-r--r--ui/index.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/index.js b/ui/index.js
index 8cf74f6ee..0cd6ac735 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -3,7 +3,7 @@ const h = require('react-hyperscript')
const Root = require('./app/root')
const actions = require('./app/actions')
const configureStore = require('./app/store')
-
+const txHelper = require('./lib/tx-helper')
module.exports = launchApp
function launchApp (opts) {
@@ -34,7 +34,8 @@ function startApp (metamaskState, accountManager, opts) {
})
// if unconfirmed txs, start on txConf page
- if (Object.keys(metamaskState.unconfTxs || {}).length) {
+ var unconfirmedTxsAll = txHelper(metamaskState.unconfTxs, metamaskState.unconfMsgs, metamaskState.network)
+ if (unconfirmedTxsAll > 0) {
store.dispatch(actions.showConfTxPage())
}