diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html
index a26b2d4d4..5c0c33faf 100644
--- a/public/views/preferencesColor.html
+++ b/public/views/preferencesColor.html
@@ -1,18 +1,11 @@
-
+
-
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index 7aa84db56..5281d0166 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -1,47 +1,41 @@
'use strict';
-angular.module('copayApp.controllers').controller('preferencesColorController',
- function($scope, $timeout, $log, configService, profileService, go) {
- var config = configService.getSync();
- this.colorOpts = [
- '#DD4B39',
- '#F38F12',
- '#FAA77F',
- '#D0B136',
- '#9EDD72',
- '#29BB9C',
- '#019477',
- '#77DADA',
- '#4A90E2',
- '#484ED3',
- '#9B59B6',
- '#E856EF',
- '#FF599E',
- '#7A8C9E',
- ];
+angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $log, configService, profileService, go) {
- var fc = profileService.focusedClient;
- var walletId = fc.credentials.walletId;
+ $scope.colorList = [
+ '#DD4B39',
+ '#F38F12',
+ '#FAA77F',
+ '#D0B136',
+ '#9EDD72',
+ '#29BB9C',
+ '#019477',
+ '#77DADA',
+ '#4A90E2',
+ '#484ED3',
+ '#9B59B6',
+ '#E856EF',
+ '#FF599E',
+ '#7A8C9E',
+ ];
- var config = configService.getSync();
- config.colorFor = config.colorFor || {};
- this.color = config.colorFor[walletId] || '#4A90E2';
+ var fc = profileService.focusedClient;
+ var walletId = fc.credentials.walletId;
+ var config = configService.getSync();
+ config.colorFor = config.colorFor || {};
- this.save = function(color) {
- var self = this;
- var opts = {
- colorFor: {}
- };
- opts.colorFor[walletId] = color;
-
- configService.set(opts, function(err) {
- if (err) $log.warn(err);
- go.preferences();
- $scope.$emit('Local/ColorUpdated');
- $timeout(function() {
- $scope.$apply();
- }, 100);
- });
+ $scope.currentColor = config.colorFor[walletId] || '#4A90E2';
+ $scope.save = function(color) {
+ var opts = {
+ colorFor: {}
};
- });
+ opts.colorFor[walletId] = color;
+
+ configService.set(opts, function(err) {
+ go.preferences();
+ if (err) $log.warn(err);
+ $scope.$emit('Local/ColorUpdated');
+ });
+ };
+});