diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 4973c8c77..8cf3e0a5b 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -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; }; diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 754d8fb9e..d6e7fe823 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -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; diff --git a/src/js/controllers/sidebar.js b/src/js/controllers/sidebar.js index f48a725ab..a514fcefd 100644 --- a/src/js/controllers/sidebar.js +++ b/src/js/controllers/sidebar.js @@ -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'); diff --git a/src/js/services/notificationsService.js b/src/js/services/notificationsService.js index 169458eed..d34ed6858 100644 --- a/src/js/services/notificationsService.js +++ b/src/js/services/notificationsService.js @@ -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;