From 112c1adc11438c8131d142607c6580967f422c91 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 13 Feb 2015 13:05:56 -0300
Subject: [PATCH] Fixes loading message after press a button

---
 js/controllers/home.js          |  5 ++--
 js/controllers/import.js        | 47 ++++++++++++++++++---------------
 js/controllers/importProfile.js | 13 +++++----
 js/controllers/send.js          |  4 +--
 views/home.html                 |  4 +--
 views/import.html               |  2 +-
 views/importProfile.html        |  2 +-
 7 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/js/controllers/home.js b/js/controllers/home.js
index 35fe74d76..5dd6f1b2a 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -127,7 +127,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
       return;
     }
 
-    $scope.open(form.email.$modelValue, form.password.$modelValue);
+    $timeout(function() {
+      $scope.open(form.email.$modelValue, form.password.$modelValue);
+    }, 100);
   };
 
 
@@ -165,7 +167,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
         } else {
           $scope.error = 'Unknown error';
         }
-        $rootScope.starting = false;
         $timeout(function() {
           $rootScope.$digest();
         }, 1)
diff --git a/js/controllers/import.js b/js/controllers/import.js
index 1e177ee09..933d7f16c 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -70,33 +70,36 @@ angular.module('copayApp.controllers').controller('ImportController',
 
       $rootScope.starting = true;
 
-      $scope.importOpts = {};
+      $timeout(function() {
 
-      var skipFields = [];
+        $scope.importOpts = {};
 
-      if ($scope.skipPublicKeyRing)
-        skipFields.push('publicKeyRing');
+        var skipFields = [];
 
-      if ($scope.skipTxProposals)
-        skipFields.push('txProposals');
+        if ($scope.skipPublicKeyRing)
+          skipFields.push('publicKeyRing');
 
-      if (skipFields)
-        $scope.importOpts.skipFields = skipFields;
+        if ($scope.skipTxProposals)
+          skipFields.push('txProposals');
 
-      if (backupFile) {
-        reader.readAsBinaryString(backupFile);
-      } else {
-        updateStatus('Importing wallet - Procesing backup...');
-        identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
-          if (err) {
-            $rootScope.starting = false;
-            $scope.error = 'Could not read wallet. Please check your password';
-            $timeout(function() {
-              $rootScope.$digest();
-            }, 1);
-          }
-        });
-      }
+        if (skipFields)
+          $scope.importOpts.skipFields = skipFields;
+
+        if (backupFile) {
+          reader.readAsBinaryString(backupFile);
+        } else {
+          updateStatus('Importing wallet - Procesing backup...');
+          identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
+            if (err) {
+              $rootScope.starting = false;
+              $scope.error = 'Could not read wallet. Please check your password';
+              $timeout(function() {
+                $rootScope.$digest();
+              }, 1);
+            }
+          });
+        }
+      }, 100);
     };
 
 
diff --git a/js/controllers/importProfile.js b/js/controllers/importProfile.js
index 4b978e2e9..ffbef560b 100644
--- a/js/controllers/importProfile.js
+++ b/js/controllers/importProfile.js
@@ -70,10 +70,13 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
       
       $rootScope.starting = true;
 
-      if (backupFile) {
-        reader.readAsBinaryString(backupFile);
-      } else {
-        _importBackup(backupText);
-      }
+      $timeout(function() {
+
+        if (backupFile) {
+          reader.readAsBinaryString(backupFile);
+        } else {
+          _importBackup(backupText);
+        }
+      }, 100);
     };
   });
diff --git a/js/controllers/send.js b/js/controllers/send.js
index 67871c33f..c5a8b0793 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -185,7 +185,7 @@ angular.module('copayApp.controllers').controller('SendController',
       $scope.loading = true;
       $scope.creatingTX = true;
       if ($scope.isWindowsPhoneApp)
-          $rootScope.wpInputFocused = true;
+        $rootScope.wpInputFocused = true;
 
       $timeout(function () {
           var comment = form.comment.$modelValue;
@@ -212,7 +212,7 @@ angular.module('copayApp.controllers').controller('SendController',
               txStatus.notify(status);
               $scope.resetForm();
           });
-      }, 1);
+      }, 100);
     };
 
     // QR code Scanner
diff --git a/views/home.html b/views/home.html
index 86ac11e78..638cede5d 100644
--- a/views/home.html
+++ b/views/home.html
@@ -121,9 +121,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">
diff --git a/views/import.html b/views/import.html
index a47532a6e..176fc5709 100644
--- a/views/import.html
+++ b/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>
diff --git a/views/importProfile.html b/views/importProfile.html
index 4008a5572..12f0816fb 100644
--- a/views/importProfile.html
+++ b/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>