From ece1ecb90b6b013b5ea6f81de562d4a391d0f700 Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 8 Sep 2016 14:53:49 -0700 Subject: Fix wording in changelog and bug --- CHANGELOG.md | 2 +- ui/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e44f603d..6a49897d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Current Master -- Add network checks for unconfirmed transactions. +- Fix bug where pending transactions from Test net (or other networks) show up In Main net. - Add fiat conversion values to more views. - On fresh install, open a new tab with the MetaMask Introduction video. - Block negative values from transactions. diff --git a/ui/index.js b/ui/index.js index 0cd6ac735..0e69b00d6 100644 --- a/ui/index.js +++ b/ui/index.js @@ -35,7 +35,7 @@ function startApp (metamaskState, accountManager, opts) { // if unconfirmed txs, start on txConf page var unconfirmedTxsAll = txHelper(metamaskState.unconfTxs, metamaskState.unconfMsgs, metamaskState.network) - if (unconfirmedTxsAll > 0) { + if (unconfirmedTxsAll.length > 0) { store.dispatch(actions.showConfTxPage()) } -- cgit v1.2.3