diff options
author | kumavis <aaron@kumavis.me> | 2017-01-25 08:09:57 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-25 08:09:57 +0800 |
commit | bb1ee8e6497502427ee65fd60a62b1937cf0dd4c (patch) | |
tree | 6774f622ad14ede0b6c439d61bfdd00ca8d927ce /ui | |
parent | 74dc20bdf179cbd8b25f6fae007553784466e3ff (diff) | |
parent | 4f39e8192cd94ad45d68992d5d1129f1612b1aa6 (diff) | |
download | tangerine-wallet-browser-bb1ee8e6497502427ee65fd60a62b1937cf0dd4c.tar.gz tangerine-wallet-browser-bb1ee8e6497502427ee65fd60a62b1937cf0dd4c.tar.zst tangerine-wallet-browser-bb1ee8e6497502427ee65fd60a62b1937cf0dd4c.zip |
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/actions.js | 20 | ||||
-rw-r--r-- | ui/app/conf-tx.js | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index bf3617310..78af80886 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -231,7 +231,21 @@ function createNewVaultAndRestore (password, seed) { } function createNewVaultAndKeychain (password) { - return callBackgroundThenUpdate(background.createNewVaultAndKeychain, password) + return (dispatch) => { + dispatch(actions.showLoadingIndication()) + background.createNewVaultAndKeychain(password, (err, newState) => { + if (err) { + return dispatch(actions.displayWarning(err.message)) + } + background.placeSeedWords((err, newState) => { + if (err) { + return dispatch(actions.displayWarning(err.message)) + } + dispatch(actions.hideLoadingIndication()) + dispatch(actions.updateMetamaskState(newState)) + }) + }) + } } function revealSeedConfirmation () { @@ -286,8 +300,8 @@ function navigateToNewAccountScreen() { } } -function addNewAccount (ringNumber = 0) { - return callBackgroundThenUpdate(background.addNewAccount, ringNumber) +function addNewAccount () { + return callBackgroundThenUpdate(background.addNewAccount) } function showInfoPage () { diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index a6e03c3ed..1bd69f7d9 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -134,7 +134,7 @@ ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) { var address = txData.txParams.from || state.selectedAccount var account = state.accounts[address] var balance = account ? account.balance : '0x0' - var maxCost = new BN(txData.maxCost) + var maxCost = new BN(txData.maxCost, 16) var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16) return maxCost.gt(balanceBn) |