From a76de35bb0e6fecf36111b698d9e7ad7fb997235 Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Thu, 12 Jun 2014 11:09:18 -0300
Subject: [PATCH] Fixes validation of input form. Improved error message

---
 index.html       |  7 ++++---
 js/directives.js | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index c369e0920..8d286503e 100644
--- a/index.html
+++ b/index.html
@@ -649,9 +649,10 @@
                     <label for="amount">Amount
                       <small ng-hide="!sendForm.amount.$pristine">required</small>
                       <small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">valid!</small>
-                      <small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine">
-                      not valid.</small>
-                      <small ng-show="notEnoughAmount">{{notEnoughAmount}}</small>
+                      <small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
+                        not valid
+                      </small>
+                      <small ng-show="notEnoughAmount">Insufficient funds!</small>
                     </label>
                     <div class="small-9 columns">
                       <input type="number" id="amount" ng-disabled="loading"
diff --git a/js/directives.js b/js/directives.js
index f1f5bbee8..eab6138ab 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -39,16 +39,18 @@ angular.module('copayApp.directives')
   ])
   .directive('enoughAmount', ['$rootScope',
     function($rootScope) {
+      var bitcore = require('bitcore');
+      var feeSat = bitcore.TransactionBuilder.FEE_PER_1000B_SAT;
       return {
         require: 'ngModel',
         link: function(scope, element, attrs, ctrl) {
           var val = function(value) {
-            var vStr = new String(value);
-            var vNum = Number(vStr);
+            var availableBalanceNum = ($rootScope.availableBalance * bitcore.util.COIN).toFixed(0);
+            var vNum = Number((value * bitcore.util.COIN).toFixed(0)) + feeSat;
             if (typeof vNum == "number" && vNum > 0) {
-              if ($rootScope.availableBalance <= vNum) {
+              if (availableBalanceNum < vNum) {
                 ctrl.$setValidity('enoughAmount', false);
-                scope.notEnoughAmount = 'Insufficient funds!';
+                scope.notEnoughAmount = true;
               } else {
                 ctrl.$setValidity('enoughAmount', true);
                 scope.notEnoughAmount = null;