From 8b629813fe732af3cf3390c9d348dce15509d850 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 13 Oct 2016 07:07:22 -0700
Subject: Fix wallet bugs

---
 public/js/wallet.js | 4 ++++
 1 file changed, 4 insertions(+)

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());
-- 
cgit v1.2.3