diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-22 08:21:16 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-22 08:21:16 +0800 |
commit | f5b0795ac5582dd53de728479cf47c43eabfe67c (patch) | |
tree | 9b03db0e3a5d3dfd913abcad6cfbadaff71531d6 /ui/app/conf-tx.js | |
parent | 9123e70434fcd35dcb79a587e6d5c00734cb99e4 (diff) | |
download | tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.gz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.bz2 tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.lz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.xz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.zst tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.zip |
change all instances of selectedAddress to selectedAccount.
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 8d23adfe5..0b1dcac45 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -18,7 +18,7 @@ function mapStateToProps (state) { return { identities: state.metamask.identities, accounts: state.metamask.accounts, - selectedAddress: state.metamask.selectedAddress, + selectedAccount: state.metamask.selectedAccount, unconfTxs: state.metamask.unconfTxs, unconfMsgs: state.metamask.unconfMsgs, index: state.appState.currentView.context, @@ -90,12 +90,12 @@ ConfirmTxScreen.prototype.render = function () { // Properties txData: txData, key: txData.id, - selectedAddress: state.selectedAddress, + selectedAccount: state.selectedAccount, accounts: state.accounts, identities: state.identities, insufficientBalance: this.checkBalnceAgainstTx(txData), // Actions - buyEth: this.buyEth.bind(this, txParams.from || state.selectedAddress), + buyEth: this.buyEth.bind(this, txParams.from || state.selectedAccount), sendTransaction: this.sendTransaction.bind(this, txData), cancelTransaction: this.cancelTransaction.bind(this, txData), signMessage: this.signMessage.bind(this, txData), @@ -120,7 +120,7 @@ ConfirmTxScreen.prototype.checkBalnceAgainstTx = function (txData) { var state = this.props var txParams = txData.txParams || {} - var address = txParams.from || state.selectedAddress + var address = txParams.from || state.selectedAccount var account = state.accounts[address] var balance = account ? account.balance : '0x0' |