diff options
| author | Adam Soltys <[email protected]> | 2016-10-13 07:07:22 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2016-11-01 20:07:03 -0700 |
| commit | 8b629813fe732af3cf3390c9d348dce15509d850 (patch) | |
| tree | 66e6749ebac4cec665768df193868379359ca9f4 | |
| parent | 076dbb62f7b05305e9be91af36f32c56caf9448c (diff) | |
| download | coinos-server-8b629813fe732af3cf3390c9d348dce15509d850.tar.gz coinos-server-8b629813fe732af3cf3390c9d348dce15509d850.zip | |
Fix wallet bugs
| -rw-r--r-- | public/js/wallet.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/public/js/wallet.js b/public/js/wallet.js index cd513202..655b3a8c 100644 --- a/public/js/wallet.js +++ b/public/js/wallet.js @@ -491,7 +491,11 @@ convertedAmount = function() { var amount, difference, tolerance; +<<<<<<< 076dbb62f7b05305e9be91af36f32c56caf9448c if (!(g.amount && !isNaN(parseFloat(g.amount)))) { +======= + if (!(g.amount && isNumeric(g.amount))) { +>>>>>>> Fix wallet bugs g.amount = amount; } amount = parseFloat($('#amount').val() * multiplier() / g.exchange).toFixed(precision()); |