m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

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

Browse Source
This commit is contained in:
Kevin Serrano 2016-07-18 12:20:31 -07:00
commit 2bdda0848f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## 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 ## 2.6.1 2016-07-13
- Fix tool tips on Eth balance to show the 6 decimals - Fix tool tips on Eth balance to show the 6 decimals

3
ui/app/components/pending-tx-details.js
View File

@ -28,7 +28,8 @@ PTXP.render = function () {
var txParams = txData.txParams || {} var txParams = txData.txParams || {}
var address = txParams.from || props.selectedAddress var address = txParams.from || props.selectedAddress
var identity = props.identities[address] || { address: address } 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 gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16)
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)

8
ui/app/reducers.js
View File

@ -7,6 +7,8 @@ const reduceIdentities = require('./reducers/identities')
const reduceMetamask = require('./reducers/metamask') const reduceMetamask = require('./reducers/metamask')
const reduceApp = require('./reducers/app') const reduceApp = require('./reducers/app')
window.METAMASK_CACHED_LOG_STATE = null
module.exports = rootReducer module.exports = rootReducer
function rootReducer (state, action) { function rootReducer (state, action) {
@ -35,5 +37,11 @@ function rootReducer (state, action) {
state.appState = reduceApp(state, action) state.appState = reduceApp(state, action)
window.METAMASK_CACHED_LOG_STATE = state
return state return state
} }
window.logState = function() {
var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, null, 2)
console.log(stateString)
}