diff options
| author | Adam Soltys <[email protected]> | 2016-10-13 07:07:22 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2016-11-12 00:03:13 -0800 |
| commit | b913f0ca6d466b1c9ae904bb7444a082a72e1b97 (patch) | |
| tree | f5b0d7274f520d43c9373d51dd73c556a456de2b /public | |
| parent | 00495209692ebf94f1c18577dfdbdf56a74acaba (diff) | |
| download | coinos-server-b913f0ca6d466b1c9ae904bb7444a082a72e1b97.tar.gz coinos-server-b913f0ca6d466b1c9ae904bb7444a082a72e1b97.zip | |
Fix wallet bugs
Diffstat (limited to 'public')
| -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()); |