aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-31 07:08:31 +0800
committerkumavis <aaron@kumavis.me>2017-01-31 07:08:31 +0800
commitf9b31fe2c3a43339a4519761e4c8b2f3813e85e0 (patch)
tree123f368b533b374a89cb5e5da593d3babb5002e2 /ui/app/conf-tx.js
parentb1de2cdefa2341eeab8d0269a1b14b349fdd5d16 (diff)
downloadtangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.gz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.bz2
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.lz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.xz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.zst
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.zip
rename selectedAccount to selectedAddress
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 1bd69f7d9..ca6c28ac9 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -19,7 +19,7 @@ function mapStateToProps (state) {
return {
identities: state.metamask.identities,
accounts: state.metamask.accounts,
- selectedAccount: state.metamask.selectedAccount,
+ selectedAddress: state.metamask.selectedAddress,
unconfTxs: state.metamask.unconfTxs,
unconfMsgs: state.metamask.unconfMsgs,
index: state.appState.currentView.context,
@@ -99,12 +99,12 @@ ConfirmTxScreen.prototype.render = function () {
// Properties
txData: txData,
key: txData.id,
- selectedAccount: state.selectedAccount,
+ selectedAddress: state.selectedAddress,
accounts: state.accounts,
identities: state.identities,
insufficientBalance: this.checkBalanceAgainstTx(txData),
// Actions
- buyEth: this.buyEth.bind(this, txParams.from || state.selectedAccount),
+ buyEth: this.buyEth.bind(this, txParams.from || state.selectedAddress),
sendTransaction: this.sendTransaction.bind(this, txData),
cancelTransaction: this.cancelTransaction.bind(this, txData),
signMessage: this.signMessage.bind(this, txData),
@@ -131,7 +131,7 @@ function currentTxView (opts) {
ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {
if (!txData.txParams) return false
var state = this.props
- var address = txData.txParams.from || state.selectedAccount
+ var address = txData.txParams.from || state.selectedAddress
var account = state.accounts[address]
var balance = account ? account.balance : '0x0'
var maxCost = new BN(txData.maxCost, 16)