aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-07-19 03:20:31 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-07-19 03:20:31 +0800
commit2bdda0848f5d7509a326e5bcfa027ca8bb2cc445 (patch)
tree77f6a5ceddbc4262c3a3d6656bdc9b3810cd7b8d
parent121874aeb651a294a68a506337553b9e9e7f7076 (diff)
parent866237c2c886af2af02544ebb365df8e6ec75f28 (diff)
downloadtangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar.gz
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar.bz2
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar.lz
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar.xz
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.tar.zst
tangerine-wallet-browser-2bdda0848f5d7509a326e5bcfa027ca8bb2cc445.zip
Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into FixReopeningBug
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/components/pending-tx-details.js3
-rw-r--r--ui/app/reducers.js8
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index faaa3138c..4e67df837 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- Fixed bug that would prevent the plugin from reopening on the first try after receiving a new transaction while locked.
+
## 2.6.1 2016-07-13
- Fix tool tips on Eth balance to show the 6 decimals
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index a6f72a89b..2fb0eae3f 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -28,7 +28,8 @@ PTXP.render = function () {
var txParams = txData.txParams || {}
var address = txParams.from || props.selectedAddress
var identity = props.identities[address] || { address: address }
- var balance = props.accounts[address].balance
+ var account = props.accounts[address]
+ var balance = account ? account.balance : '0x0'
var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16)
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 9243ddba4..a691cf614 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -7,6 +7,8 @@ const reduceIdentities = require('./reducers/identities')
const reduceMetamask = require('./reducers/metamask')
const reduceApp = require('./reducers/app')
+window.METAMASK_CACHED_LOG_STATE = null
+
module.exports = rootReducer
function rootReducer (state, action) {
@@ -35,5 +37,11 @@ function rootReducer (state, action) {
state.appState = reduceApp(state, action)
+ window.METAMASK_CACHED_LOG_STATE = state
return state
}
+
+window.logState = function() {
+ var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, null, 2)
+ console.log(stateString)
+}