From 9ab6c09d5d532dc1f16df44b1efeea87359cf1f5 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sun, 26 Apr 2015 18:41:21 -0300
Subject: [PATCH] better -generating address- status

---
 public/img/qr.png                | Bin 0 -> 3423 bytes
 public/views/walletHome.html     |  26 +++++++++++++++++++++++---
 src/css/main.css                 |   6 ++++--
 src/js/controllers/walletHome.js |  21 +++++++++++++--------
 4 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 public/img/qr.png

diff --git a/public/img/qr.png b/public/img/qr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e5212b71de7eca9a47b8861fe8cce16cd8306e
GIT binary patch
literal 3423
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
PZ_JTHE_PKm0V)3ms~eID

literal 0
HcmV?d00001

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 2691e0fc9..6f9a6c7c2 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -185,16 +185,36 @@
     </div>
   </div>
   <div ng-show="!index.needsBackup || home.skipBackup">
-    <div class="row" ng-if="home.addr">
+    <div class="row">
       <!-- Address-->
       <div class="large-12 columns">
         <h2 class="text-center m10t" translate>My Bitcoin address</h2>
+        <div  ng-show="!home.generatingAddress">
         <div class="text-center" ng-click="home.copyAddress(home.addr)">
           <qrcode size="220" data="bitcoin:{{home.addr}}"></qrcode>
           <div class="m10t">
             <h4 ng-class="{'enable_text_select': !index.isCordova}" class="size-12">{{home.addr}}</h4>
           </div>
         </div>
+        </div>
+        <div  ng-show="home.generatingAddress">
+        <div class="text-center"  style="margin-bottom:14px;">
+          <div style="height:220px; width:220px; margin:auto; background: url(img/qr.png) white">
+            <div class="spinner" style="margin-top:80px">
+              <div class="rect1"></div>
+              <div class="rect2"></div>
+              <div class="rect3"></div>
+              <div class="rect4"></div>
+              <div class="rect5"></div>
+            </div>
+          </div>
+  
+          <div class="m10t">
+            <h4 class="size-12">...</h4>
+          </div>
+        </div>
+        </div>
+ 
         <div class="m10t text-center" ng-show="index.isCordova">
           <span class="button outline dark-gray tiny"
             ng-click="home.shareAddress(home.addr)">
@@ -207,10 +227,10 @@
         </div>
       </div>
     </div>
-    <div class="row m20t" ng-if="home.addr">
+    <div class="row m20t">
       <div class="large-12 columns">
         <button class="button black expand radius" ng-click="home.newAddress()"
-          ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline" translate>
+          ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
           Generate new address
         </button>
       </div>
diff --git a/src/css/main.css b/src/css/main.css
index 42e52ec4f..8610ed7a2 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1144,11 +1144,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 
 /*/////////////////// SPINNER ////////////////////*/
 
-#history .spinner {
+#history .spinner, #receive .spinner {
   height: 46px;
 }
 
-#history .spinner > div {
+#history .spinner > div,
+#receive .spinner > div
+{
   background-color: #7A8C9E;
 }
 
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index d32fb1ede..314ae0c5a 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -272,17 +272,21 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   this.newAddress = function() {
     var fc = profileService.focusedClient;
-    self.setOngoingProcess('Generating Address');
+    self.generatingAddress = true;
     fc.createAddress(function(err, addr) {
-      self.setOngoingProcess();
       if (err) {
         $log.debug('Creating address ERROR:', err);
         $scope.$emit('Local/ClientError', err);
-      } else {
-        self.addr = addr.address;
-        storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() {});
+        self.generatingAddress = false;
+        $scope.$digest();
+        return;
       }
-      $scope.$digest();
+      self.addr = addr.address;
+      storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() {
+
+        self.generatingAddress = false;
+        $scope.$digest();
+      });
     });
   };
 
@@ -290,7 +294,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     var fc = profileService.focusedClient;
     $timeout(function() {
       storageService.getLastAddress(fc.credentials.walletId, function(err, addr) {
-        if (addr) {
+        // TODO
+        if (addr && 0) {
           self.addr = addr;
         } else {
           self.newAddress();
@@ -500,7 +505,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       profileService.lockFC();
       self.setOngoingProcess();
 
-      if (err) { 
+      if (err) {
         return cb(err);
       }