diff options
| author | Mark Stacey <markjstacey@gmail.com> | 2019-09-01 00:26:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-01 00:26:49 +0800 |
| commit | 87cf0ced1344e9db55f9bb9e1b4c050ec8fd7d88 (patch) | |
| tree | e358575c7bff9e856b0da6763f788cc8851ca95d | |
| parent | 887b2572f5cd95a5a2c006b890cad9f6ed2db5bd (diff) | |
| download | tangerine-wallet-browser-87cf0ced1344e9db55f9bb9e1b4c050ec8fd7d88.tar.gz tangerine-wallet-browser-87cf0ced1344e9db55f9bb9e1b4c050ec8fd7d88.tar.zst tangerine-wallet-browser-87cf0ced1344e9db55f9bb9e1b4c050ec8fd7d88.zip | |
Fix confirm token transaction amount display (#7081)
The token amount displayed when confirming a token transaction was
wrongly being converted to a string in the container. As a result, the
conversion into the user's preferred currency would fail.
A default value of '0' was added for the token amount as well, to
prevent `undefined` from being rendered as the value. Really the value
should never be undefined, but it was rather difficult to handle that
case without a deeper investigation into how it might occur. The 0
default is consistent with existing rendering logic.
| -rw-r--r-- | ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js | 4 | ||||
| -rw-r--r-- | ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js index dbda3c1dc..8aea19663 100644 --- a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js +++ b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js @@ -28,6 +28,10 @@ export default class ConfirmTokenTransactionBase extends Component { currentCurrency: PropTypes.string, } + static defaultProps = { + tokenAmount: 0, + } + getFiatTransactionAmount () { const { tokenAmount, currentCurrency, conversionRate, contractExchangeRate } = this.props diff --git a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js index 5d2ccb083..e68cee832 100644 --- a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js +++ b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js @@ -39,7 +39,7 @@ const mapStateToProps = (state, ownProps) => { const tokenData = getTokenData(data) const tokenValue = tokenData && getTokenValue(tokenData.params) const toAddress = tokenData && getTokenToAddress(tokenData.params) - const tokenAmount = tokenData && calcTokenAmount(tokenValue, decimals).toString() + const tokenAmount = tokenData && calcTokenAmount(tokenValue, decimals).toNumber() const contractExchangeRate = contractExchangeRateSelector(state) return { |