Display backup message in addressbook

public/views/modals/destination-address.html

@@ -58,16 +58,21 @@
       <div ng-if="!gettingAddress">
         <ul class="no-bullet">
           <li class="line-b" ng-repeat="w in wallets">
-          <a ng-click="selectWallet(w.id, w.name)" class="db oh">
+            <a ng-click="selectWallet(w.id, w.name)" class="db oh">
-            <div class="avatar-wallet"
+              <div class="avatar-wallet"
-              ng-style="{'background-color':w.color}">
+                ng-style="{'background-color':w.color}">
-              <i class="icon-wallet size-21"></i>
+                <i class="icon-wallet size-21"></i>
-            </div>
+              </div>
-            <div class="ellipsis name-wallet text-bold">{{w.name || w.id}}</div>
+              <div class="ellipsis name-wallet text-bold">{{w.name || w.id}}
-            <div class="size-12">{{w.m}} of {{w.n}}
+                <span class="has-error right text-light size-12" ng-show="w.needsBackup">
-              <span ng-show="w.network=='testnet'">[Testnet]</span>
+                  <i class="icon-close-circle size-14"></i>
-            </div>
+                  <span class="vm" translate>Needs backup</span>
-          </a>
+                </span>
+              </div>
+              <div class="size-12">{{w.m}} of {{w.n}}
+                <span ng-show="w.network=='testnet'">[Testnet]</span>
+              </div>
+            </a>
           </li>
         </ul>
       </div>

public/views/walletHome.html

@@ -420,11 +420,7 @@
                     <i class="icon-close-circle size-14"></i>
                     <span class="vm" translate>Not valid</span>
                   </span>
-                  <span class="has-error right size-12" ng-show="home.destinationWalletNeedsBackup">
+                  <small class="right text-primary" ng-show="!sendForm.address.$invalid">
-                    <i class="icon-close-circle size-14"></i>
-                    <span class="vm" translate>Destination wallet needs backup</span>
-                  </span>
-                  <small class="right text-primary" ng-show="!sendForm.address.$invalid && !home.destinationWalletNeedsBackup">
                     <i class="icon-checkmark-circle size-14"></i>
                   </small>
                 </span>
@@ -508,7 +504,7 @@
                 <a fast-click callback-fn="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
               </div>
               <div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
-                <button class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || home.destinationWalletNeedsBackup"
+                <button class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
                   ng-style="{'background-color':index.backgroundColor}" fast-click callback-fn="home.submitForm()" translate>
                   Send
                 </button>

src/css/main.css

@@ -603,10 +603,6 @@ ul.manage li {
   color: #fff;
 }
 
-.name-wallet i {
-  color: #B6E9DF;
-}
-
 .locked {
   font-size: 11px;
   color: #7A8C9E;

src/js/controllers/index.js

@@ -128,6 +128,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
       self.externalSource = fc.getPrivKeyExternalSourceName();
       self.account = fc.credentials.account;
+      self.needsBackup = profileService.isBackupNeeded(self.walletId);
 
       if (self.externalSource == 'trezor')
         self.account++;
@@ -152,19 +153,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         }
       }
 
-      profileService.isBackupNeeded(self.walletId, function(needsBackup) {
+      self.openWallet(function() {
-        self.needsBackup = needsBackup;
+        if (!self.isComplete) {
-        self.openWallet(function() {
+          $log.debug('Wallet not complete after update... redirecting');
-          if (!self.isComplete) {
+          go.path('copayers');
-            $log.debug('Wallet not complete after update... redirecting');
+        } else {
-            go.path('copayers');
+          if ($state.is('copayers')) {
-          } else {
+            $log.debug('Wallet Complete after update... redirect to home');
-            if ($state.is('copayers')) {
+            go.walletHome();
-              $log.debug('Wallet Complete after update... redirect to home');
-              go.walletHome();
-            }
           }
-        });
+        }
       });
     });
   };

src/js/controllers/walletHome.js

@@ -130,7 +130,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   var confirm_msg = gettextCatalog.getString('Confirm');
 
   this.openDestinationAddressModal = function(wallets, address) {
-    self.destinationWalletNeedsBackup = null;
     $rootScope.modalOpened = true;
     var fc = profileService.focusedClient;
     self.lockAddress = false;
@@ -261,10 +260,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
             return;
           }
 
-          profileService.isBackupNeeded(walletId, function(needsBackup) {
+          $modalInstance.close(addr);
-            self.destinationWalletNeedsBackup = needsBackup;
-            $modalInstance.close(addr);
-          });
         });
       };
     };
@@ -856,7 +852,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.submitForm = function() {
-    if (!$scope._amount || !$scope._address || self.destinationWalletNeedsBackup) return;
+    if (!$scope._amount || !$scope._address) return;
     var fc = profileService.focusedClient;
     var unitToSat = this.unitToSatoshi;
     var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
@@ -988,7 +984,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   this.resetForm = function() {
     this.resetError();
-    this.destinationWalletNeedsBackup = null;
     this._paypro = null;
     this.lockedCurrentFeePerKb = null;
 

src/js/services/profileService.js

@@ -181,18 +181,6 @@ angular.module('copayApp.services')
       });
     };
 
-    root.isBackupNeeded = function(walletId, cb) {
-      var c = root.getClient(walletId);
-      if (c.isPrivKeyExternal()) return cb(false);
-      if (!c.credentials.mnemonic) return cb(false);
-      if (c.credentials.network == 'testnet') return cb(false);
-
-      storageService.getBackupFlag(walletId, function(err, val) {
-        if (err || val) return cb(false);
-        return cb(true);
-      });
-    };
-
     root._seedWallet = function(opts, cb) {
       opts = opts || {};
       if (opts.bwsurl)
@@ -306,8 +294,8 @@ angular.module('copayApp.services')
 
         // check if exist
         if (lodash.find(root.profile.credentials, {
-          'walletId': walletData.walletId
+            'walletId': walletData.walletId
-        })) {
+          })) {
           return cb(gettext('Cannot join the same wallet more that once'));
         }
       } catch (ex) {
@@ -680,6 +668,14 @@ angular.module('copayApp.services')
       });
     };
 
+    root.isBackupNeeded = function(walletId) {
+      var c = root.getClient(walletId);
+      if (c.isPrivKeyExternal()) return false;
+      if (!c.credentials.mnemonic) return false;
+      if (c.credentials.network == 'testnet') return false;
+      return true;
+    };
+
     root.getWallets = function(network) {
       if (!root.profile) return [];
 
@@ -694,7 +690,8 @@ angular.module('copayApp.services')
           id: c.walletId,
           network: c.network,
           color: config.colorFor[c.walletId] || '#4A90E2',
-          copayerId: c.copayerId
+          copayerId: c.copayerId,
+          needsBackup: root.isBackupNeeded(c.walletId)
         };
       });
       if (network) {