Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into FixReopeningBug

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)
+}