Fix setting of token balance on account switch in send screen from field.

3 files changed, 3 insertions, 3 deletions

diff --git a/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js b/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
index 402b744e4..33cb63b43 100644
--- a/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
+++ b/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
@@ -39,7 +39,7 @@ function mapDispatchToProps (dispatch) {
     setSendTokenBalance: (usersToken, selectedToken) => {
         if (!usersToken) return
 
-        const tokenBalance = calcTokenBalance(usersToken, selectedToken)
+        const tokenBalance = calcTokenBalance({ usersToken, selectedToken })
         dispatch(setSendTokenBalance(tokenBalance))
     },
   }
diff --git a/ui/app/components/send_/send-content/send-from-row/tests/send-from-row-container.test.js b/ui/app/components/send_/send-content/send-from-row/tests/send-from-row-container.test.js
index 785b3d3ef..e080b2fe3 100644
--- a/ui/app/components/send_/send-content/send-from-row/tests/send-from-row-container.test.js
+++ b/ui/app/components/send_/send-content/send-from-row/tests/send-from-row-container.test.js
@@ -29,7 +29,7 @@ proxyquire('../send-from-row.container.js', {
     getSendFromObject: (s) => `mockFrom:${s}`,
   },
   './send-from-row.selectors.js': { getFromDropdownOpen: (s) => `mockFromDropdownOpen:${s}` },
-  '../../send.utils.js': { calcTokenBalance: (a, b) => a + b },
+  '../../send.utils.js': { calcTokenBalance: ({ usersToken, selectedToken }) => usersToken + selectedToken },
   '../../../../actions': actionSpies,
   '../../../../ducks/send.duck': duckActionSpies,
 })
diff --git a/ui/app/components/send_/send.utils.js b/ui/app/components/send_/send.utils.js
index f09a02a6a..71a8a35c4 100644
--- a/ui/app/components/send_/send.utils.js
+++ b/ui/app/components/send_/send.utils.js
@@ -158,7 +158,7 @@ function getParamsForGasEstimate (selectedAddress, symbol, data) {
 
 function calcTokenBalance ({ selectedToken, usersToken }) {
   const { decimals } = selectedToken || {}
-  return calcTokenAmount(usersToken.balance.toString(), decimals)
+  return calcTokenAmount(usersToken.balance.toString(), decimals) + ''
 }
 
 function doesAmountErrorRequireUpdate ({