diff options
| author | Dan <danjm.com@gmail.com> | 2017-09-14 10:20:13 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-16 07:23:23 +0800 |
| commit | 54bbf8d8590014b92e7857f30bdc2d8f3779431a (patch) | |
| tree | 0d9a5939fad15afe90b61de390fffb5f2d9ba9cd /ui/app/components | |
| parent | b0f1fba2e5fbde573b46a284285985e63f1a3618 (diff) | |
| download | tangerine-wallet-browser-54bbf8d8590014b92e7857f30bdc2d8f3779431a.tar.gz tangerine-wallet-browser-54bbf8d8590014b92e7857f30bdc2d8f3779431a.tar.zst tangerine-wallet-browser-54bbf8d8590014b92e7857f30bdc2d8f3779431a.zip | |
Handle transaction totals in WEI in tx-list, send and pending.
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/pending-tx.js | 4 | ||||
| -rw-r--r-- | ui/app/components/tx-list-item.js | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 6eb2fb2b2..c1b079a25 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -88,6 +88,7 @@ PendingTx.prototype.getTotal = function () { fromCurrency: 'ETH', toCurrency: 'USD', numberOfDecimals: 2, + fromDenomination: 'WEI', conversionRate, }) const ETH = conversionUtil(amountBn, { @@ -95,6 +96,7 @@ PendingTx.prototype.getTotal = function () { toNumericBase: 'dec', fromCurrency: 'ETH', toCurrency: 'ETH', + fromDenomination: 'WEI', conversionRate, numberOfDecimals: 6, }) @@ -109,6 +111,7 @@ PendingTx.prototype.getTotal = function () { fromCurrency: 'ETH', toCurrency: 'USD', numberOfDecimals: 2, + fromDenomination: 'WEI', conversionRate, }) const ETH = conversionUtil(amountBn, { @@ -116,6 +119,7 @@ PendingTx.prototype.getTotal = function () { toNumericBase: 'dec', fromCurrency: 'ETH', toCurrency: 'ETH', + fromDenomination: 'WEI', conversionRate, numberOfDecimals: 6, }) diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index d45aea964..8422c02b9 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -60,6 +60,7 @@ TxListItem.prototype.getSendEtherTotal = function () { toNumericBase: 'dec', fromCurrency: 'ETH', toCurrency: 'USD', + fromDenomination: 'WEI', numberOfDecimals: 2, conversionRate, }) @@ -68,6 +69,7 @@ TxListItem.prototype.getSendEtherTotal = function () { toNumericBase: 'dec', fromCurrency: 'ETH', toCurrency: 'ETH', + fromDenomination: 'WEI', conversionRate, numberOfDecimals: 6, }) |