diff options
author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-19 05:14:27 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 05:14:27 +0800 |
commit | 25e57939920d4685a20b4e7b3a14060e9d3314c7 (patch) | |
tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /ui/app/conf-tx.js | |
parent | 9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff) | |
parent | 0e01abdf7154067ca50bf279340b868aefd8343f (diff) | |
download | tangerine-wallet-browser-3.1.0.tar tangerine-wallet-browser-3.1.0.tar.gz tangerine-wallet-browser-3.1.0.tar.bz2 tangerine-wallet-browser-3.1.0.tar.lz tangerine-wallet-browser-3.1.0.tar.xz tangerine-wallet-browser-3.1.0.tar.zst tangerine-wallet-browser-3.1.0.zip |
Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0
Version 3.1.0
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 8e255a867..a6e03c3ed 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -41,12 +41,13 @@ ConfirmTxScreen.prototype.render = function () { var provider = state.provider var unconfTxs = state.unconfTxs var unconfMsgs = state.unconfMsgs + var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) - var index = state.index !== undefined ? state.index : 0 + var index = state.index !== undefined && unconfTxList[index] ? state.index : 0 var txData = unconfTxList[index] || {} - var txParams = txData.txParams + var txParams = txData.params || {} var isNotification = isPopupOrNotification() === 'notification' - if (!txParams) return null + if (unconfTxList.length === 0) return null return ( @@ -116,15 +117,19 @@ ConfirmTxScreen.prototype.render = function () { } function currentTxView (opts) { - if ('txParams' in opts.txData) { + const { txData } = opts + const { txParams, msgParams } = txData + + if (txParams) { // This is a pending transaction return h(PendingTx, opts) - } else if ('msgParams' in opts.txData) { + } else if (msgParams) { // This is a pending message to sign return h(PendingMsg, opts) } } ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) { + if (!txData.txParams) return false var state = this.props var address = txData.txParams.from || state.selectedAccount var account = state.accounts[address] |