diff --git a/cordova/android/res/drawable-hdpi/icon.png b/cordova/android/res/drawable-hdpi/icon.png index f58ea36ea..004d81868 100644 Binary files a/cordova/android/res/drawable-hdpi/icon.png and b/cordova/android/res/drawable-hdpi/icon.png differ diff --git a/cordova/android/res/drawable-ldpi/icon.png b/cordova/android/res/drawable-ldpi/icon.png index c4619026a..1db5b04b5 100644 Binary files a/cordova/android/res/drawable-ldpi/icon.png and b/cordova/android/res/drawable-ldpi/icon.png differ diff --git a/cordova/android/res/drawable-mdpi/icon.png b/cordova/android/res/drawable-mdpi/icon.png index 7dfd61b57..df8674d24 100644 Binary files a/cordova/android/res/drawable-mdpi/icon.png and b/cordova/android/res/drawable-mdpi/icon.png differ diff --git a/cordova/android/res/drawable-xhdpi/icon.png b/cordova/android/res/drawable-xhdpi/icon.png index 861d79981..699245f5d 100644 Binary files a/cordova/android/res/drawable-xhdpi/icon.png and b/cordova/android/res/drawable-xhdpi/icon.png differ diff --git a/cordova/android/res/drawable-xxhdpi/icon.png b/cordova/android/res/drawable-xxhdpi/icon.png new file mode 100644 index 000000000..e63d54900 Binary files /dev/null and b/cordova/android/res/drawable-xxhdpi/icon.png differ diff --git a/cordova/android/res/drawable-xxxhdpi/icon.png b/cordova/android/res/drawable-xxxhdpi/icon.png new file mode 100644 index 000000000..4bb14b580 Binary files /dev/null and b/cordova/android/res/drawable-xxxhdpi/icon.png differ diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index c770ac4c7..8052aab29 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -425,9 +425,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; // This handles errors from BWS/index with are nomally - // trigger from async events (like updates) - self.handleError = function(err) { - $log.warn('Client ERROR:', err); + // trigger from async events (like updates). + // Debounce function avoids multiple popups + var _handleError = function(err) { + $log.warn('Client ERROR: ', err); if (err.code === 'NOT_AUTHORIZED') { self.notAuthorized = true; go.walletHome(); @@ -440,6 +441,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.showErrorPopup(msg); } }; + + self.handleError = lodash.debounce(_handleError, 1000); + self.openWallet = function() { var fc = profileService.focusedClient; $timeout(function() { @@ -920,9 +924,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.warn('Showing err popup:' + msg); self.showAlert = { msg: msg, - close: function(err) { + close: function() { self.showAlert = null; - if (cb) return cb(err); + if (cb) return cb(); }, }; $timeout(function() { @@ -1344,10 +1348,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r ); }); - $rootScope.$on('Local/ShowAlert', function(event, msg, cb) { - self.showErrorPopup(msg, cb); - }); - $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) { self.askPassword = { isSetup: isSetup, diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 3463318d8..1ba501b8d 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -630,7 +630,7 @@ angular.module('copayApp.services') name: config.aliasFor[c.walletId] || c.walletName, id: c.walletId, network: c.network, - color: config.colorFor[c.walletId] || '#2C3E50' + color: config.colorFor[c.walletId] || '#4A90E2' }; }); ret = lodash.filter(ret, function(w) {