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/cordova/config.xml b/cordova/config.xml index fa16d75ec..9079ddc8a 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.5.3" + android-versionCode="57" + ios-CFBundleVersion="1.5.3"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 811f4663d..f2d85e42c 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.2 + 1.5.3 CFBundleSignature ???? CFBundleVersion - 1.5.2 + 1.5.3 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 991fbc756..3b2f69640 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Bitcoin Wallet diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml index d9b7c4d96..48eb8b4e6 100644 --- a/cordova/wp/Properties/WMAppManifest.xml +++ b/cordova/wp/Properties/WMAppManifest.xml @@ -8,7 +8,7 @@ - + Assets\icon@2.png diff --git a/package.json b/package.json index 25f06ec21..a082c5260 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.5.2", + "version": "1.5.3", "keywords": [ "wallet", "copay", diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 102ef57b6..80902f1a7 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -447,7 +447,7 @@
- sync + sync
Initial transaction history synchronization can take some minutes for wallets with many transactions. diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index af2f9ba4c..927f7f0c0 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -28,6 +28,7 @@ angular.module('copayApp.controllers').controller('exportController', return; } + $rootScope.$emit('Local/BackupDone'); notification.success(gettext('Success'), gettext('Encrypted export file saved')); go.walletHome(); }); @@ -96,6 +97,7 @@ angular.module('copayApp.controllers').controller('exportController', self.error = true; } else { self.error = false; + $rootScope.$emit('Local/BackupDone'); } return cb(ew); }); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index d2e3d5ab4..6d640e878 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -434,9 +434,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(); @@ -449,6 +450,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() { @@ -940,9 +944,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() { @@ -1371,10 +1375,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/init.js b/src/js/init.js index 054bf0b91..f2d1f1dca 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -32,9 +32,6 @@ angular.element(document).ready(function() { window.location = '#/cordova/pause/'; }, 100); } - setTimeout(function() { - window.ignoreMobilePause = false; - }, 100); }, false); document.addEventListener('resume', function() { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4c1f5a117..317d48aa5 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -637,7 +637,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) { diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 48408a006..b2dfd4da2 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.5.2 +Version=1.5.3 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index f46d0e7af..173c88058 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index 16455da88..385a71d02 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.5.2" +#define MyAppVersion "1.5.3" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe"