From 9d1f0082ea7adf9f1729f055ca44dbb7ed0ac10d Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Tue, 22 Apr 2014 16:07:14 -0300
Subject: [PATCH 1/2] Improve send form: check if address is valid using
 bitcore

---
 css/main.css     |  8 ++++----
 index.html       | 12 ++++++------
 js/directives.js | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/css/main.css b/css/main.css
index 869544273..4bf8e3fb4 100644
--- a/css/main.css
+++ b/css/main.css
@@ -197,11 +197,13 @@ span.panel-res {
 }
 
 small.is-valid {
-  color: #04B404; 
+  color: #04B404;
+  font-weight: bold;
 }
 
 small.has-error {
   color: #f04124;
+  font-weight: bold;
 }
 
 @media (max-width: 641px) {
@@ -244,9 +246,7 @@ button.secondary:hover { background-color: #FFDF00 !important;}
 .m30a {margin: 30px auto;}
 .br100 {border-radius: 100%;}
 
-
-input.ng-dirty.ng-invalid { 
+.signin input.ng-dirty.ng-invalid { 
   border: 2px red solid;
 }
 
-
diff --git a/index.html b/index.html
index 52c9ff94e..feaf65534 100644
--- a/index.html
+++ b/index.html
@@ -79,7 +79,7 @@
 
     <!-- Templates -->
     <script type="text/ng-template" id="signin.html">
-      <div ng-controller="SigninController">
+      <div class="signin" ng-controller="SigninController">
         <div data-alert class="alert-box info round" ng-show="loading">
           Connecting to wallet...
         </div>
@@ -369,11 +369,11 @@
                 <div class="large-12 columns">
                   <label for="address">To address
                     <small ng-hide="!sendForm.address.$pristine">required</small>
-                    <small class="is-valid" ng-show="!sendForm.address.$invalid && !sendForm.address.$pristine">is valid!</small>
+                    <small class="is-valid" ng-show="!sendForm.address.$invalid && !sendForm.address.$pristine">valid!</small>
                     <small class="has-error" ng-show="sendForm.address.$invalid && !sendForm.address.$pristine">
-                    is not valid</small>
+                    not valid</small>
                   </label>
-                  <input type="text" id="address" name="address" placeholder="Send to" ng-model="address" ng-minlength="20" ng-maxlength="37" required>
+                  <input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
                 </div>
               </div>
 
@@ -382,9 +382,9 @@
                   <div class="row collapse">
                     <label for="amount">Amount 
                       <small ng-hide="!sendForm.amount.$pristine">required</small>
-                      <small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">is valid!</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">
-                      is not valid</small>
+                      not valid</small>
                     </label>
                     <div class="small-9 columns">
                       <input type="number" id="amount" name="amount" placeholder="Amount" ng-model="amount" min="0.0001" max="10000000" required>
diff --git a/js/directives.js b/js/directives.js
index ad9a93a7c..bfb68782e 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -1 +1,23 @@
 'use strict';
+
+angular.module('copay')
+  .directive('validAddress', [function() {
+
+    var bitcore = require('bitcore');
+    var Address = bitcore.Address;
+
+    return {
+      require: 'ngModel',
+      link: function (scope, elem, attrs, ctrl) {
+        var validator = function(value){
+          var a = new Address(value);
+          ctrl.$setValidity('validAddress', a.isValid());
+          return value;
+        };
+
+        ctrl.$parsers.unshift(validator);
+        ctrl.$formatters.unshift(validator);
+      }
+    };
+  }]);
+

From 294c08691373a4f6784bdb78c1a5fc7d1786c079 Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Tue, 22 Apr 2014 16:21:14 -0300
Subject: [PATCH 2/2] Fix: check if available to spend is enought to send money

---
 js/controllers/send.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/controllers/send.js b/js/controllers/send.js
index cc9c4f673..276468464 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -13,7 +13,7 @@ angular.module('copay.send').controller('SendController',
         return;
       }
 
-      if ($rootScope.totalBalance <= form.amount.$modelValue) {
+      if ($rootScope.availableBalance <= form.amount.$modelValue) {
         $rootScope.flashMessage = { message: 'You have not enough amount to send', type: 'error'};
         return;
       }