diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a06c86496..543b1c200 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -10,6 +10,10 @@
You do not have any wallet
+
+
+
+
@@ -457,4 +461,4 @@
-
+
diff --git a/src/css/mobile.css b/src/css/mobile.css
index e1929ad2d..f4fab59a6 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -97,7 +97,7 @@ _:-ms-fullscreen, :root .main {
}
.tab-bar h1 {
- color: #1ABC9C;
+ color: #7A8C9E;
font-weight: 500;
font-size: 14px;
}
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index ba63e4225..742db5a84 100644
--- a/src/js/controllers/preferences.js
+++ b/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) {
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index d6e7fe823..d01a878fb 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/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;
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index cf35c0bb3..1f9894080 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -356,6 +356,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) {