diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-04-21 13:07:00 +0800 |
|---|---|---|
| committer | kumavis <kumavis@users.noreply.github.com> | 2016-04-21 13:07:00 +0800 |
| commit | db85827b2be19d7bfc7dfaeec4786c4d051b6629 (patch) | |
| tree | 39075d39ddcfbcb80016d61a22942451dbc745b9 /ui/app/util.js | |
| parent | f82a4de725e384ab4bb39c57f83a3dbb406c8db6 (diff) | |
| parent | 532edf670e8c30db958765141974f3fb0f5ec44c (diff) | |
| download | tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.gz tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.zst tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.zip | |
Merge pull request #125 from MetaMask/TransactionList
Add transaction history to account detail view
Diffstat (limited to 'ui/app/util.js')
| -rw-r--r-- | ui/app/util.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/util.js b/ui/app/util.js index 18862fade..5dbcffa7e 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -28,6 +28,7 @@ module.exports = { ethToWei: ethToWei, weiToEth: weiToEth, normalizeToWei: normalizeToWei, + normalizeNumberToWei: normalizeNumberToWei, valueTable: valueTable, bnTable: bnTable, } @@ -85,13 +86,18 @@ function dataSize(data) { // returns a BN in wei function normalizeToWei(amount, currency) { try { - var ether = amount.div(bnTable[currency]) - var wei = ether.mul(bnTable.wei) - return wei + return amount.mul(bnTable.wei).div(bnTable[currency]) } catch (e) {} return amount } +var multiple = new ethUtil.BN('1000', 10) +function normalizeNumberToWei(n, currency) { + var enlarged = n * 1000 + var amount = new ethUtil.BN(String(enlarged), 10) + return normalizeToWei(amount, currency).div(multiple) +} + function readableDate(ms) { var date = new Date(ms) var month = date.getMonth() |