Ensure tokenAmount is always a string

ui/app/helpers/utils/confirm-tx.util.js

@@ -122,9 +122,10 @@ export function hasUnconfirmedTransactions (state) {
 }
 
 export function roundExponential (value) {
+  const stringValue = String(value)
   const PRECISION = 4
-  const bigNumberValue = new BigNumber(String(value))
+  const bigNumberValue = new BigNumber(stringValue)
 
   // In JS, numbers with exponentials greater than 20 get displayed as an exponential.
-  return bigNumberValue.e > 20 ? Number(bigNumberValue.toPrecision(PRECISION)) : value
+  return bigNumberValue.e > 20 ? bigNumberValue.toPrecision(PRECISION) : stringValue
 }

ui/app/pages/confirm-send-token/confirm-send-token.component.js

@@ -7,7 +7,7 @@ export default class ConfirmSendToken extends Component {
   static propTypes = {
     history: PropTypes.object,
     editTransaction: PropTypes.func,
-    tokenAmount: PropTypes.number,
+    tokenAmount: PropTypes.string,
   }
 
   handleEdit (confirmTransactionData) {

ui/app/selectors/confirm-transaction.js

@@ -150,68 +150,15 @@ export const tokenAddressSelector = createSelector(
   (txParams) => txParams && txParams.to,
 )
 
-const TOKEN_PARAM_SPENDER = '_spender'
 const TOKEN_PARAM_TO = '_to'
 const TOKEN_PARAM_VALUE = '_value'
 
-export const tokenAmountAndToAddressSelector = createSelector(
-  tokenDataArgsSelector,
-  tokenDecimalsSelector,
-  (args, tokenDecimals) => {
-    let toAddress = ''
-    let tokenAmount = 0
-
-    if (args && args.length) {
-      const toParam = args[TOKEN_PARAM_TO]
-      const valueParam = args[TOKEN_PARAM_VALUE]
-      toAddress = toParam || args[0]
-      const value = valueParam ? valueParam.toString() : args[1].toString()
-
-      if (tokenDecimals) {
-        tokenAmount = calcTokenAmount(value, tokenDecimals).toString()
-      }
-
-      tokenAmount = roundExponential(tokenAmount)
-    }
-
-    return {
-      toAddress,
-      tokenAmount,
-    }
-  },
-)
-
-export const approveTokenAmountAndToAddressSelector = createSelector(
-  tokenDataArgsSelector,
-  tokenDecimalsSelector,
-  (args, tokenDecimals) => {
-    let toAddress = ''
-    let tokenAmount = 0
-
-    if (args && args.length) {
-      toAddress = args[TOKEN_PARAM_SPENDER]
-      const value = args[TOKEN_PARAM_VALUE].toString()
-
-      if (tokenDecimals) {
-        tokenAmount = calcTokenAmount(value, tokenDecimals).toString()
-      }
-
-      tokenAmount = roundExponential(tokenAmount)
-    }
-
-    return {
-      toAddress,
-      tokenAmount,
-    }
-  },
-)
-
 export const sendTokenTokenAmountAndToAddressSelector = createSelector(
   tokenDataArgsSelector,
   tokenDecimalsSelector,
   (args, tokenDecimals) => {
     let toAddress = ''
-    let tokenAmount = 0
+    let tokenAmount = '0'
 
     if (args && args.length) {
       toAddress = args[TOKEN_PARAM_TO]

ui/app/selectors/tests/confirm-transaction.test.js

@@ -1,8 +1,6 @@
 import assert from 'assert'
 import {
   unconfirmedTransactionsCountSelector,
-  tokenAmountAndToAddressSelector,
-  approveTokenAmountAndToAddressSelector,
   sendTokenTokenAmountAndToAddressSelector,
   contractExchangeRateSelector,
   conversionRateSelector,
@@ -43,54 +41,6 @@ describe('Confirm Transaction Selector', function () {
     })
   })
 
-  describe('tokenAmountAndToAddressSelector', function () {
-
-    const state = {
-      confirmTransaction: {
-        tokenData: {
-          name: 'transfer',
-          args: getEthersArrayLikeFromObj({
-            '_to': '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-            '_value': { toString: () => '1' },
-          }),
-        },
-        tokenProps: {
-          tokenDecimals: '2',
-          tokenSymbol: 'META',
-        },
-      },
-    }
-
-    it('returns calculated token amount based on token value and token decimals and recipient address', function () {
-      assert.deepEqual(tokenAmountAndToAddressSelector(state),
-        { toAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', tokenAmount: 0.01 })
-    })
-  })
-
-  describe('approveTokenAmountAndToAddressSelector', function () {
-
-    const state = {
-      confirmTransaction: {
-        tokenData: {
-          name: 'approve',
-          args: getEthersArrayLikeFromObj({
-            '_spender': '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-            '_value': { toString: () => '1' },
-          }),
-        },
-        tokenProps: {
-          tokenDecimals: '2',
-          tokenSymbol: 'META',
-        },
-      },
-    }
-
-    it('returns token amount and recipient for approve token allocation spending', function () {
-      assert.deepEqual(approveTokenAmountAndToAddressSelector(state),
-        { toAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', tokenAmount: 0.01 })
-    })
-  })
-
   describe('sendTokenTokenAmountAndToAddressSelector', function () {
 
     const state = {
@@ -111,7 +61,7 @@ describe('Confirm Transaction Selector', function () {
 
     it('returns token address and calculated token amount', function () {
       assert.deepEqual(sendTokenTokenAmountAndToAddressSelector(state),
-        { toAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', tokenAmount: 0.01 })
+        { toAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc', tokenAmount: '0.01' })
     })
 
   })