Merge pull request #2414 from cmgustavo/bug/ux-loading-01

Fixes loading message after press a button

views/home.html

@@ -119,9 +119,9 @@
 
 
 
-        <button translate type="submit" class="button primary radius expand m0" ng-disabled="loginForm.$invalid">
+        <button translate type="submit" class="button primary radius expand m0" 
+          ng-disabled="loginForm.$invalid">
           Sign in
- {{hideAll}}
         </button>
       </form>
         <div ng-if="usingLocalStorage" class="text-gray size-12 m10v">

views/import.html

@@ -86,7 +86,7 @@
 
             <div class="text-right m20t">
               <button translate type="submit" class="button expand black m0" 
-                ng-disabled="importForm.$invalid || $root.starting">
+                ng-disabled="importForm.$invalid">
                 Import backup
               </button>
             </div>

views/importProfile.html

@@ -47,7 +47,7 @@
 
           <button translate type="submit" 
             class="button primary radius expand m0" 
-            ng-disabled="importProfileForm.$invalid || $root.starting">
+            ng-disabled="importProfileForm.$invalid">
             Import backup
           </button>
         </form>

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>