diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
| commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
| tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /ui/app/selectors/confirm-transaction.js | |
| parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
| parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
| download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip | |
fix conflicts
Diffstat (limited to 'ui/app/selectors/confirm-transaction.js')
| -rw-r--r-- | ui/app/selectors/confirm-transaction.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js index 6e760c429..86b10bac3 100644 --- a/ui/app/selectors/confirm-transaction.js +++ b/ui/app/selectors/confirm-transaction.js @@ -126,7 +126,8 @@ const TOKEN_PARAM_VALUE = '_value' export const tokenAmountAndToAddressSelector = createSelector( tokenDataParamsSelector, - params => { + tokenDecimalsSelector, + (params, tokenDecimals) => { let toAddress = '' let tokenAmount = 0 @@ -136,6 +137,10 @@ export const tokenAmountAndToAddressSelector = createSelector( toAddress = toParam ? toParam.value : params[0].value const value = valueParam ? Number(valueParam.value) : Number(params[1].value) tokenAmount = roundExponential(value) + + if (tokenDecimals) { + tokenAmount = calcTokenAmount(value, tokenDecimals) + } } return { |