Merge pull request #2718 from matiu/feat/splash-import

Feat/splash import

src/js/controllers/index.js

@@ -721,7 +721,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.noFocusedWallet = true;
       self.isComplete = null;
       self.walletName = null;
-      go.addWallet();
+      go.path('import');
     });
   });
 

src/js/controllers/preferences.js

@@ -10,10 +10,13 @@ angular.module('copayApp.controllers').controller('preferencesController',
       isoCode: config.wallet.settings.alternativeIsoCode
     }; 
     var fc = profileService.focusedClient;
-    $scope.encrypt = fc.hasPrivKeyEncrypted();
+    if (fc)
+      $scope.encrypt = fc.hasPrivKeyEncrypted();
 
     var unwatch = $scope.$watch('encrypt', function(val) {
       var fc = profileService.focusedClient;
+      if (!fc) return;
+
       if (val && !fc.hasPrivKeyEncrypted()) {
         $rootScope.$emit('Local/NeedsPassword', true, function(err, password) {
           if (err || !password) {

src/js/controllers/preferencesColor.js

@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
   function($scope, configService, profileService, go) {
     var config = configService.getSync();
     this.colorOpts = [
+      '#7A8C9E',
       '#F38F12',
       '#F4D03F',
       '#4A90E2',
@@ -11,7 +12,6 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
       '#9B59B6',
       '#E856EF',
       '#F883B4',
-      '#7A8C9E',
     ];
 
     var fc = profileService.focusedClient;

src/js/controllers/walletHome.js

@@ -357,6 +357,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       return;
 
     var fc = profileService.focusedClient;
+    if (!fc)
+      return;
+
     $timeout(function() {
       storageService.getLastAddress(fc.credentials.walletId, function(err, addr) {
         if (addr) {