diff options
| -rw-r--r-- | public/js/wallet.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/public/js/wallet.js b/public/js/wallet.js index 655b3a8c..24ff146f 100644 --- a/public/js/wallet.js +++ b/public/js/wallet.js @@ -491,11 +491,7 @@ 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()); @@ -560,3 +556,11 @@ }; }).call(this); +<<<<<<< 73af154d7e064ed6a46583639c8b72e2c3c88731 +======= + + +})() +},{}]},{},[1]) +; +>>>>>>> Use blockchain.info as explorer |