From 575e99b490e44370aaf2e4ef8bfeac8bb033293f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 13 Feb 2015 16:34:12 -0300
Subject: [PATCH] Disable Sendform when sending a transaction

---
 js/controllers/send.js | 44 ++++++++++++++++++++----------------------
 views/send.html        | 27 ++++++--------------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/js/controllers/send.js b/js/controllers/send.js
index c5a8b0793..100531945 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -183,35 +183,33 @@ angular.module('copayApp.controllers').controller('SendController',
       }
 
       $scope.loading = true;
-      $scope.creatingTX = true;
       if ($scope.isWindowsPhoneApp)
         $rootScope.wpInputFocused = true;
 
       $timeout(function () {
-          var comment = form.comment.$modelValue;
-          var merchantData = $scope._merchantData;
-          var address, amount;
-          if (!merchantData) {
-              address = form.address.$modelValue;
-              amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
-          }
+        var comment = form.comment.$modelValue;
+        var merchantData = $scope._merchantData;
+        var address, amount;
+        if (!merchantData) {
+          address = form.address.$modelValue;
+          amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
+        }
 
-          w.spend({
-              merchantData: merchantData,
-              toAddress: address,
-              amountSat: amount,
-              comment: comment,
-          }, function (err, txid, status) {
-              $scope.loading = false;
-              $scope.creatingTX = false;
-              if ($scope.isWindowsPhoneApp)
-                  $rootScope.wpInputFocused = false;
+        w.spend({
+          merchantData: merchantData,
+          toAddress: address,
+          amountSat: amount,
+          comment: comment,
+        }, function (err, txid, status) {
+          $scope.loading = false;
+          if ($scope.isWindowsPhoneApp)
+          $rootScope.wpInputFocused = false;
 
-              if (err)
-                  return $scope.setError(err);
-              txStatus.notify(status);
-              $scope.resetForm();
-          });
+          if (err)
+            return $scope.setError(err);
+          txStatus.notify(status);
+          $scope.resetForm();
+        });
       }, 100);
     };
 
diff --git a/views/send.html b/views/send.html
index fe173d962..f3a6fdd3d 100644
--- a/views/send.html
+++ b/views/send.html
@@ -1,5 +1,5 @@
 <div class="send" ng-controller="SendController" ng-init="init()">
-  <div class="columns" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
+  <div class="columns" ng-show="$root.wallet.balanceInfo.lockedBalance">
     <div class="panel">
       <div class="left">
         <i class="fi-info size-42 m10r"></i>
@@ -32,25 +32,9 @@
     </div>
   </div>
 
-  <div class="row" ng-show="creatingTX">
-    <div class="large-12 columns">
-      <div class="panel">
-        <div class="box-notification">
-          <div class="box-icon secondary">
-            <i class="fi-bitcoin-circle icon-rotate spinner size-24"></i>
-          </div>
-          <span class="text-secondary size-14">
-            Creating Transaction...
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-  <div class="row" ng-show="!fetchingURL && !creatingTX">
+  <div class="row" ng-show="!fetchingURL">
     <div class="large-8 large-centered columns"> 
-      <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
+      <form name="sendForm" ng-submit="submitForm(sendForm)" ng-disabled="loading" novalidate>
         <div class="panel">
           <div class="box-notification" ng-show="error  && !hideForWP ">
             <div class="box-icon error">
@@ -159,7 +143,7 @@
           <div class="row">
             <div class="large-6 medium-6 small-12 columns text-right">
               <button type="submit" class="button primary expand" ng-disabled="sendForm.$invalid || loading">
-                <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i> Send
+                Send
               </button>
             </div>
             <div class="large-4 medium-4 small-12 columns text-left">
@@ -171,7 +155,8 @@
                   <a translate class="button radius tiny warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i> </a>
                 </div>
               </div>
-              <a ng-click="resetForm()" class="button expand warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">Cancel</a>
+              <a ng-click="resetForm()" class="button expand warning m0" 
+                ng-show="(_merchantData || lockAddress) && !loading">Cancel</a>
             </div>
           </div>
         </div>