From dd9c5c166403a43911dd7649c00ede1711eaae3b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 01:41:16 -0300 Subject: [PATCH 1/7] Fix disclaimer error --- src/js/controllers/disclaimer.js | 2 +- src/js/controllers/paperWallet.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js index ec9b6ba65..eaaaf6325 100644 --- a/src/js/controllers/disclaimer.js +++ b/src/js/controllers/disclaimer.js @@ -2,7 +2,7 @@ angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $log, profileService, isCordova, storageService, applicationService, gettextCatalog, uxLanguage, go) { - self = this; + var self = this; self.tries = 0; var create = function(noWallet) { diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index 79e570e6a..f3ecb0fd3 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -1,6 +1,6 @@ angular.module('copayApp.controllers').controller('paperWalletController', function($scope, $http, $timeout, $log, configService, profileService, go, addressService, txStatus, bitcore) { - self = this; + var self = this; var fc = profileService.focusedClient; var rawTx; From a2ed57e55df224dc1fbc8025f822ed4074809ede Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 01:45:01 -0300 Subject: [PATCH 2/7] New release v1.6.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 5e568eb6c..45472b3fa 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.6.2" + android-versionCode="60" + ios-CFBundleVersion="1.6.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 cf8fc1f8f..91524b074 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6.1 + 1.6.2 CFBundleSignature ???? CFBundleVersion - 1.6.1 + 1.6.2 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index a3f26df3f..f36ca0e4f 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 bfd79bba2..e1297c836 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 8efeaa78a..72a50a541 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.6.1", + "version": "1.6.2", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index f3ea94db9..421cf9b43 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.6.1 +Version=1.6.2 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index c8e19df34..6a4543029 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.6.1" +#define MyAppVersion "1.6.2" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "Copay.exe" From 2f2f0c839e88a66476ac40b158c19c70b7496859 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 16 Dec 2015 11:32:07 -0300 Subject: [PATCH 3/7] fix button on small device --- public/views/disclaimer.html | 21 ++++++++------------- src/css/main.css | 19 ++++++++++++++----- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 8b510ac99..e6388694e 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -1,24 +1,19 @@ -
-
- icon -
-
-
- WELCOME TO COPAY -

A multisignature bitcoin wallet

+
+ WELCOME TO COPAY +

A multisignature bitcoin wallet

-

Terms of Use
+
Terms of Use

-

@@ -26,7 +21,7 @@

-

I affirm that I have read, understood, and agree with these terms.

+

I affirm that I have read, understood, and agree with these terms.

@@ -42,8 +37,8 @@ Creating Wallet...
-
-
diff --git a/src/css/main.css b/src/css/main.css index b5d820417..570191954 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -396,16 +396,23 @@ ul.tx-copayers { border-bottom: none; } -.backup .button-box { - background: #F1F3F5; +.button-box { position: fixed; bottom: 0; left: 0; width: 100%; - padding: 0.5rem 1rem 1rem; + padding: 0.8rem; z-index: 9999; } +.backup .button-box { + background: #F6F7F9; +} + +.splash .button-box { + background: #2C3E50; +} + .backup input[type="text"] { border-bottom: 1px solid #CAD4DB; } @@ -1223,7 +1230,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { background: #213140; border: 1px solid #4B6178; border-radius: 5px; - margin: 1.6rem; + margin: 1rem; color: #A5B2BF; line-height: 30px; padding: 0.5rem; @@ -1231,8 +1238,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .scrollArea ul { font-size: 0.8rem; - text-align: justify; + text-align: left; margin-left: 0; + line-height: 1.4; + margin-bottom: 0; } .scrollArea li { From 8882ca8e874af3e3b73706336638a299ca81def6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 16:15:40 -0300 Subject: [PATCH 4/7] Fixes proposals with multiple outputs with only one output --- src/js/services/txFormatService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index d94d9bf92..15032794d 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -24,8 +24,8 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS root.processTx = function(tx) { if (!tx) return; - var outputs = tx.outputs ? tx.outputs.length : 0; - if (outputs > 1 && tx.action != 'received') { + var outputs = lodash.isArray(tx.outputs) ? tx.outputs.length : 0; + if (outputs && tx.action != 'received') { tx.hasMultiplesOutputs = true; tx.recipientCount = outputs; tx.amount = lodash.reduce(tx.outputs, function(total, o) { From 804c37bffa4575ae99b5477ab645e651a836c890 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 16:22:40 -0300 Subject: [PATCH 5/7] Adds example. Refactory --- src/js/controllers/index.js | 19 +++++++++++++++++++ src/js/services/txFormatService.js | 5 ++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 4a70af0d9..575b29eae 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -495,6 +495,25 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.pendingTxProposalsCountForUs = 0; var now = Math.floor(Date.now() / 1000); + /* Uncomment to test multiple outputs */ + /* + var txp = { + message: 'test multi-output', + fee: 1000, + createdOn: new Date() / 1000, + outputs: [] + }; + function addOutput(n) { + txp.outputs.push({ + amount: 600, + toAddress: '2N8bhEwbKtMvR2jqMRcTCQqzHP6zXGToXcK', + message: 'output #' + (Number(n) + 1) + }); + }; + lodash.times(150, addOutput); + txps.push(txp); + */ + lodash.each(txps, function(tx) { tx = txFormatService.processTx(tx); diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index 15032794d..8a78249f5 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -24,10 +24,9 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS root.processTx = function(tx) { if (!tx) return; - var outputs = lodash.isArray(tx.outputs) ? tx.outputs.length : 0; - if (outputs && tx.action != 'received') { + if (lodash.isArray(tx.outputs) && tx.action != 'received') { tx.hasMultiplesOutputs = true; - tx.recipientCount = outputs; + tx.recipientCount = tx.outputs.length; tx.amount = lodash.reduce(tx.outputs, function(total, o) { o.amountStr = formatAmountStr(o.amount); o.alternativeAmountStr = formatAlternativeStr(o.amount); From 61f13cf580e72f628430468f67335e55888f1180 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 16:29:30 -0300 Subject: [PATCH 6/7] New release v1.6.3 --- 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 45472b3fa..a9a657c17 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.6.3" + android-versionCode="61" + ios-CFBundleVersion="1.6.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 91524b074..40c67a536 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6.2 + 1.6.3 CFBundleSignature ???? CFBundleVersion - 1.6.2 + 1.6.3 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index f36ca0e4f..b78624e42 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 e1297c836..a043188f8 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 72a50a541..76f5c46e8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.6.2", + "version": "1.6.3", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 421cf9b43..e05bdf9b2 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.6.2 +Version=1.6.3 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index 6a4543029..5800d2b89 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.6.2" +#define MyAppVersion "1.6.3" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "Copay.exe" From 8c90f6f346c04f1174c3eeaddf110171f90f9a09 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 16 Dec 2015 16:40:02 -0300 Subject: [PATCH 7/7] Check if array is empty --- src/js/services/txFormatService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index 8a78249f5..1061ede76 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -24,7 +24,7 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS root.processTx = function(tx) { if (!tx) return; - if (lodash.isArray(tx.outputs) && tx.action != 'received') { + if (lodash.isArray(tx.outputs) && tx.outputs.length > 0 && tx.action != 'received') { tx.hasMultiplesOutputs = true; tx.recipientCount = tx.outputs.length; tx.amount = lodash.reduce(tx.outputs, function(total, o) {