From 33a790763b8d91fd7c515fcb54d6389abdbe179e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 22 Jan 2016 12:11:08 -0300 Subject: [PATCH 1/4] Release v1.8.1 --- cordova/config.xml | 6 +++--- cordova/ios/Copay-Info.plist | 4 ++-- cordova/wp/Package.appxmanifest | 2 +- cordova/wp/Properties/WMAppManifest.xml | 2 +- package.json | 2 +- webkitbuilds/.desktop | 2 +- webkitbuilds/setup-win.iss | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cordova/config.xml b/cordova/config.xml index 548b6d78f..22b005b7a 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.8.1" + android-versionCode="66" + ios-CFBundleVersion="1.8.1"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 887229faf..5311365b6 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.0 + 1.8.1 CFBundleSignature ???? CFBundleVersion - 1.8.0 + 1.8.1 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 571713b44..037aa6a28 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 c71dc685a..30482aa2c 100644 --- a/cordova/wp/Properties/WMAppManifest.xml +++ b/cordova/wp/Properties/WMAppManifest.xml @@ -9,7 +9,7 @@ - + Assets\icon@2.png diff --git a/package.json b/package.json index 82bbd9e37..0442ba62f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.8.0", + "version": "1.8.1", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 61d4ddace..dc21bbc16 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.8.0 +Version=1.8.1 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index cafc93ff4..d54a1264d 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.8.0" +#define MyAppVersion "1.8.1" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "Copay.exe" From ef0caadb4284e735d90cdd78313170579882372f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 22 Jan 2016 12:39:44 -0300 Subject: [PATCH 2/4] fix refresh in multisig --- src/js/controllers/walletHome.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 8bd468743..f9cce3bba 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -259,7 +259,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.openTxpModal = function(tx, copayers, isGlidera) { $rootScope.modalOpened = true; var fc = profileService.focusedClient; - var refreshUntilItChanges = false; var currentSpendUnconfirmed = configWallet.spendUnconfirmed; var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; @@ -278,8 +277,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } } $scope.tx = tx; - - refreshUntilItChanges = false; $scope.currentSpendUnconfirmed = currentSpendUnconfirmed; $scope.getShortNetworkName = function() { @@ -341,7 +338,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); return; } - refreshUntilItChanges = true; $modalInstance.close(txp); return; }); @@ -404,7 +400,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (memo) $log.info(memo); - refreshUntilItChanges = true; $modalInstance.close(txpb); } }); @@ -442,11 +437,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (txp) { txStatus.notify(txp, function() { - $scope.$emit('Local/TxProposalAction', refreshUntilItChanges); + $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted'); }); } else { $timeout(function() { - $scope.$emit('Local/TxProposalAction', refreshUntilItChanges); + $scope.$emit('Local/TxProposalAction'); }, 100); } }); @@ -857,7 +852,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } else { go.walletHome(); txStatus.notify(txp, function() { - $scope.$emit('Local/TxProposalAction', true); + $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted'); }); }; }); From be223b614a254dab7826014c7bc6bd41007b6e41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 22 Jan 2016 15:38:13 -0300 Subject: [PATCH 3/4] Show popup before the spinner on mobile --- src/js/services/txSignService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/txSignService.js b/src/js/services/txSignService.js index d54060d2d..e32f79920 100644 --- a/src/js/services/txSignService.js +++ b/src/js/services/txSignService.js @@ -175,12 +175,12 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope }; root.prepareAndSignAndBroadcast = function(txp, opts, cb) { - reportSigningStatus(opts); root.prepare(function(err) { if (err) { stopReport(opts); return cb(err); }; + reportSigningStatus(opts); root.signAndBroadcast(txp, opts, function(err, txp) { if (err) { stopReport(opts); From 8da0d3982ab029afb2a6f98fd644c7231817193b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 22 Jan 2016 15:46:11 -0300 Subject: [PATCH 4/4] Release v1.8.2 --- cordova/config.xml | 6 +++--- cordova/ios/Copay-Info.plist | 4 ++-- cordova/wp/Package.appxmanifest | 2 +- cordova/wp/Properties/WMAppManifest.xml | 2 +- package.json | 2 +- webkitbuilds/.desktop | 2 +- webkitbuilds/setup-win.iss | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cordova/config.xml b/cordova/config.xml index 22b005b7a..c278ef45b 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.8.2" + android-versionCode="67" + ios-CFBundleVersion="1.8.2"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 5311365b6..96653b100 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.1 + 1.8.2 CFBundleSignature ???? CFBundleVersion - 1.8.1 + 1.8.2 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 037aa6a28..87c8bd3bf 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 30482aa2c..15a1d38e8 100644 --- a/cordova/wp/Properties/WMAppManifest.xml +++ b/cordova/wp/Properties/WMAppManifest.xml @@ -9,7 +9,7 @@ - + Assets\icon@2.png diff --git a/package.json b/package.json index 0442ba62f..4772c6c31 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.8.1", + "version": "1.8.2", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index dc21bbc16..fdff2693a 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.8.1 +Version=1.8.2 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index d54a1264d..c166442a7 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.8.1" +#define MyAppVersion "1.8.2" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "Copay.exe"