From ea2060511eb32ef8c78a38fcb5298768d67b1028 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 16 Feb 2016 14:37:34 -0300
Subject: [PATCH] refactor

---
 src/js/controllers/index.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 747fdf914..cc6f40efc 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -136,26 +136,28 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.initGlidera();
 
       self.setCustomBWSFlag();
-
-      $rootScope.$apply();
-      if (fc.isPrivKeyExternal()) {
-        self.needsBackup = false;
+      self.isBackupNeeded(fc, function(needsBackup) {
+        self.needsBackup = needsBackup;
         self.openWallet();
-      } else {
-        storageService.getBackupFlag(self.walletId, function(err, val) {
-          if (!fc.credentials.mnemonic) {
-            storageService.setBackupFlag(self.walletId, function(err) {
-              $log.debug('Backup stored');
-              self.needsBackup = false;
-            });
-          } else
-            self.needsBackup = self.network == 'testnet' ? false : !val;
-          self.openWallet();
-        });
-      }
+      });
     });
   };
 
+  self.isBackupNeeded = function(fc, cb) {
+    if (fc.isPrivKeyExternal()) return cb(false);
+
+    if (!fc.credentials.mnemonic) {
+      storageService.setBackupFlag(self.walletId, function(err) {
+        $log.debug('Backup stored');
+        return cb(false);
+      });
+    } else {
+      storageService.getBackupFlag(self.walletId, function(err, val) {
+        return cb(self.network == 'testnet' ? false : !val);
+      });
+    }
+  };
+
   self.setCustomBWSFlag = function() {
     var defaults = configService.getDefaults();
     var config = configService.getSync();