diff options
author | Alexander Tseung <alextsg@users.noreply.github.com> | 2018-11-20 08:06:34 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-20 08:06:34 +0800 |
commit | 4c87c05a02d5bf5634234a74910e5d3e559dd413 (patch) | |
tree | 638338429538e6bc62b5ad812c11e1f7925fe184 /ui/app/components/currency-display/currency-display.container.js | |
parent | 7fe37276a17cbbcb566a0650603eb5ed6115179b (diff) | |
download | tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar.gz tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar.bz2 tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar.lz tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar.xz tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.tar.zst tangerine-wallet-browser-4c87c05a02d5bf5634234a74910e5d3e559dd413.zip |
Fix rounding issue when sending max tokens (#5695)
* Fix rounding issue when sending max tokens
* Ensure amount row shows exact amount of max tokens on send screen (#2)
* Fix tests
* Change stored redux value from BigNumber to hex string. Fix TokenInput default value
Diffstat (limited to 'ui/app/components/currency-display/currency-display.container.js')
-rw-r--r-- | ui/app/components/currency-display/currency-display.container.js | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/ui/app/components/currency-display/currency-display.container.js b/ui/app/components/currency-display/currency-display.container.js index 6ddf07172..e581f8a5e 100644 --- a/ui/app/components/currency-display/currency-display.container.js +++ b/ui/app/components/currency-display/currency-display.container.js @@ -20,15 +20,24 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => { currency, denomination, hideLabel, + displayValue: propsDisplayValue, + suffix: propsSuffix, ...restOwnProps } = ownProps const toCurrency = currency || currentCurrency - const convertedValue = getValueFromWeiHex({ - value, fromCurrency: nativeCurrency, toCurrency, conversionRate, numberOfDecimals, toDenomination: denomination, - }) - const displayValue = formatCurrency(convertedValue, toCurrency) - const suffix = hideLabel ? undefined : toCurrency.toUpperCase() + + const displayValue = propsDisplayValue || formatCurrency( + getValueFromWeiHex({ + value, + fromCurrency: nativeCurrency, + toCurrency, conversionRate, + numberOfDecimals, + toDenomination: denomination, + }), + toCurrency + ) + const suffix = propsSuffix || (hideLabel ? undefined : toCurrency.toUpperCase()) return { ...restStateProps, |