diff options
| -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()); |