Fix calculating of balance sufficiency and tx params when sending tok…

…en transaction.
MetaMask · Feb 25, 2019 · a599ccd · a599ccd
1 parent b6e154d
commit a599ccd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
@@ -26,7 +26,7 @@ import {
 } from '../../../../ducks/gas.duck'
 import { getGasLoadingError, gasFeeIsInError, getGasButtonGroupShown } from './send-gas-row.selectors.js'
 import { showModal, setGasPrice, setGasLimit, setGasTotal } from '../../../../actions'
-import { getAdvancedInlineGasShown, getCurrentEthBalance } from '../../../../selectors'
+import { getAdvancedInlineGasShown, getCurrentEthBalance, getSelectedToken } from '../../../../selectors'
 import SendGasRow from './send-gas-row.component'
 
 export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(SendGasRow)
@@ -42,7 +42,7 @@ function mapStateToProps (state) {
   const balance = getCurrentEthBalance(state)
 
   const insufficientBalance = !isBalanceSufficient({
-    amount: getSendAmount(state),
+    amount: getSelectedToken(state) ? '0x0' : getSendAmount(state),
     gasTotal,
     balance,
     conversionRate,

diff --git a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
@@ -35,6 +35,7 @@ proxyquire('../send-gas-row.container.js', {
   '../../../../selectors': {
     getCurrentEthBalance: (s) => `mockCurrentEthBalance:${s}`,
     getAdvancedInlineGasShown: (s) => `mockAdvancedInlineGasShown:${s}`,
+    getSelectedToken: () => false,
   },
   '../../send.selectors.js': {
     getConversionRate: (s) => `mockConversionRate:${s}`,

diff --git a/ui/app/components/send/send-footer/send-footer.container.js b/ui/app/components/send/send-footer/send-footer.container.js
@@ -66,7 +66,7 @@ function mapDispatchToProps (dispatch) {
       })
 
       selectedToken
-        ? dispatch(signTokenTx(selectedToken.address, to, txParams.amount, txParams))
+        ? dispatch(signTokenTx(selectedToken.address, to, amount, txParams))
         : dispatch(signTx(txParams))
     },
     update: ({

diff --git a/ui/app/components/send/send-footer/tests/send-footer-container.test.js b/ui/app/components/send/send-footer/tests/send-footer-container.test.js
@@ -15,7 +15,7 @@ const actionSpies = {
 const utilsStubs = {
   addressIsNew: sinon.stub().returns(true),
   constructTxParams: sinon.stub().returns({
-    amount: 'mockConstructedAmount',
+    value: 'mockAmount',
   }),
   constructUpdatedTx: sinon.stub().returns('mockConstructedUpdatedTxParams'),
 }
@@ -117,7 +117,7 @@ describe('send-footer container', () => {
         )
         assert.deepEqual(
           actionSpies.signTokenTx.getCall(0).args,
-          [ '0xabc', 'mockTo', 'mockConstructedAmount', { amount: 'mockConstructedAmount' } ]
+          [ '0xabc', 'mockTo', 'mockAmount', { value: 'mockAmount' } ]
         )
       })
 
@@ -145,7 +145,7 @@ describe('send-footer container', () => {
         )
         assert.deepEqual(
           actionSpies.signTx.getCall(0).args,
-          [ { amount: 'mockConstructedAmount' } ]
+          [ { value: 'mockAmount' } ]
         )
       })
     })