change default color for wallet

This commit is contained in:
bechi 2015-05-11 10:18:18 -03:00
commit 1c3af263ea
4 changed files with 7 additions and 7 deletions

View file

@ -339,7 +339,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateColor = function() {
var config = configService.getSync();
config.colorFor = config.colorFor || {};
self.backgroundColor = config.colorFor[self.walletId] || '#2C3E50';
self.backgroundColor = config.colorFor[self.walletId] || '#7A8C9E';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
};

View file

@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
'#9B59B6',
'#E856EF',
'#F883B4',
'#2C3E50',
'#7A8C9E',
];
var fc = profileService.focusedClient;
@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
var config = configService.getSync();
config.colorFor = config.colorFor || {};
this.color = config.colorFor[walletId] || '#2C3E50';
this.color = config.colorFor[walletId] || '#7A8C9E';
this.save = function(color) {
var self = this;

View file

@ -41,7 +41,7 @@ angular.module('copayApp.controllers').controller('sidebarController',
n: c.n,
name: c.walletName,
id: c.walletId,
color: config.colorFor[c.walletId] || '#2C3E50',
color: config.colorFor[c.walletId] || '#7A8C9E',
};
});
self.wallets = lodash.sortBy(ret, 'walletName');

View file

@ -26,15 +26,15 @@ angular.module('copayApp.services')
if (!last) return false;
// rules...
if (last.type === 'NewTxProposal'
if (last.type === 'NewTxProposal'
&& notificationData.type === 'TxProposalAcceptedBy')
return true;
if (last.type === 'TxProposalFinallyAccepted'
if (last.type === 'TxProposalFinallyAccepted'
&& notificationData.type === 'NewOutgoingTx')
return true;
if (last.type === 'TxProposalRejectedBy'
if (last.type === 'TxProposalRejectedBy'
&& notificationData.type === 'TxProposalFinallyRejected')
return true;