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

Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit

Browse Source 
Gracefully handle null token balance in new ui send.
This commit is contained in:
Dan Finlay 2018-03-06 15:05:43 -08:00 committed by GitHub
commit 52b4876cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/app/send-v2.js
View File

@ -361,8 +361,9 @@ SendTransactionScreen.prototype.validateAmount = function (value) {
}) })
} }
const verifyTokenBalance = selectedToken && tokenBalance !== null
let sufficientTokens let sufficientTokens
if (selectedToken) { if (verifyTokenBalance) {
sufficientTokens = isTokenBalanceSufficient({ sufficientTokens = isTokenBalanceSufficient({
tokenBalance, tokenBalance,
amount, amount,
@ -377,7 +378,7 @@ SendTransactionScreen.prototype.validateAmount = function (value) {
if (conversionRate && !sufficientBalance) { if (conversionRate && !sufficientBalance) {
amountError = 'Insufficient funds.' amountError = 'Insufficient funds.'
} else if (selectedToken && !sufficientTokens) { } else if (verifyTokenBalance && !sufficientTokens) {
amountError = 'Insufficient tokens.' amountError = 'Insufficient tokens.'
} else if (amountLessThanZero) { } else if (amountLessThanZero) {
amountError = 'Can not send negative amounts of ETH.' amountError = 'Can not send negative amounts of ETH.'
@ -492,9 +493,12 @@ SendTransactionScreen.prototype.renderFooter = function () {
goHome, goHome,
clearSend, clearSend,
gasTotal, gasTotal,
tokenBalance,
selectedToken,
errors: { amount: amountError, to: toError }, errors: { amount: amountError, to: toError },
} = this.props } = this.props
const missingTokenBalance = selectedToken && !tokenBalance
const noErrors = !amountError && toError === null const noErrors = !amountError && toError === null
return h('div.page-container__footer', [ return h('div.page-container__footer', [
@ -505,7 +509,7 @@ SendTransactionScreen.prototype.renderFooter = function () {
}, },
}, 'Cancel'), }, 'Cancel'),
h('button.btn-clear.page-container__footer-button', { h('button.btn-clear.page-container__footer-button', {
disabled: !noErrors || !gasTotal, disabled: !noErrors || !gasTotal || missingTokenBalance,
onClick: event => this.onSubmit(event), onClick: event => this.onSubmit(event),
}, 'Next'), }, 'Next'),
]) ])