From d3c951a28c33ab78ee7e4eaf1baed592d719ca30 Mon Sep 17 00:00:00 2001 From: Andy Date: Mon, 29 Aug 2016 10:11:08 +0100 Subject: [PATCH 01/80] Allow for a fee of zero --- src/js/services/feeService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index de1caa722..5142edf66 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -30,7 +30,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP var feeLevelValue = lodash.find(levels, { level: feeLevel }); - if (!feeLevelValue || !feeLevelValue.feePerKB) + if (!feeLevelValue || feeLevelValue.feePerKB == null) return cb({ message: 'Could not get dynamic fee for level: ' + feeLevel }); From 26ad0cc110ce411de791175cbd801be614b42765 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 1 Nov 2016 14:56:53 -0400 Subject: [PATCH 02/80] better spacing for tx description --- src/js/directives/gravatar.js | 4 ++-- src/sass/views/walletDetails.scss | 5 ++++- www/views/walletDetails.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/js/directives/gravatar.js b/src/js/directives/gravatar.js index c76817b5e..2f85fe0eb 100644 --- a/src/js/directives/gravatar.js +++ b/src/js/directives/gravatar.js @@ -16,6 +16,6 @@ angular.module('copayApp.directives') scope.emailHash = md5.createHash(scope.email.toLowerCase() || ''); } }, - template: '{{ name }}' - } + template: '{{ name }}' + }; }); diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 37438bc1d..6c265fe58 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -21,7 +21,10 @@ } &__tx-icon { float: left; - margin-right: 10px; + margin-right: 25px; + } + &__tx-message { + margin-right: 1rem; } } diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 1526a0688..4579ec229 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -156,7 +156,7 @@
-
{{btx.message}}
+
{{btx.message}}
{{btx.note.body}}
{{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}} From d83114f292be27c23b5f910dd39dc1881c59060e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 1 Nov 2016 16:47:44 -0400 Subject: [PATCH 03/80] refactor tx detail list item to use flexbox --- src/sass/views/walletDetails.scss | 30 ++++++++++++++++- www/views/walletDetails.html | 56 ++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 6c265fe58..ab99e6d6e 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -14,10 +14,13 @@ } &__tx-time { color: $light-gray; + font-size: 14px; } &__tx-title { - padding-top: 10px; + //padding-top: 10px; + flex-grow: 1; color: $dark-gray; + overflow: hidden; } &__tx-icon { float: left; @@ -26,6 +29,31 @@ &__tx-message { margin-right: 1rem; } + + &__list { + + } + + &__item { + display: flex; + align-items: center; + background: #fff; + padding-left: 1rem; + } + + &__tx-content { + display: flex; + align-items: center; + flex-grow: 1; + padding: 1rem 0; + padding-right: 1rem; + border-bottom: 1px solid rgb(245, 245, 245); + overflow: hidden; + } + + &__tx-amount { + white-space: nowrap; + } } #walletDetails { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 4579ec229..6fe91f2a0 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -125,7 +125,7 @@
-
+ + +
+
+ + + + + +
+
+
+
{{btx.note.body}}
+
Received
+
+ +
+
{{btx.message}}
+
{{btx.note.body}}
+
+ {{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}} +
+
Sent
+
+ +
+
{{btx.note.body}}
+
Moved
+
+ Invalid +
+ + + + – + + (possible double spend) + + + {{btx.amountStr}} + + +
+ + + Unconfirmed + +
+ +
+
Date: Tue, 1 Nov 2016 17:32:18 -0400 Subject: [PATCH 04/80] prelim group divider style --- src/sass/views/walletDetails.scss | 7 +++ www/views/walletDetails.html | 83 ++++++++++++++++--------------- 2 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index ab99e6d6e..1644d63c8 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -54,6 +54,13 @@ &__tx-amount { white-space: nowrap; } + + &__group-label { + font-size: 14px; + font-weight: 300; + color: #727272; + padding: 2px 1rem; + } } #walletDetails { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 6fe91f2a0..de748befe 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -175,53 +175,56 @@
-->
-
+
+
June
- - - +
+ + + -
-
-
-
{{btx.note.body}}
-
Received
-
- -
-
{{btx.message}}
-
{{btx.note.body}}
-
- {{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}} +
+
+
+
{{btx.note.body}}
+
Received
-
Sent
+ +
+
{{btx.message}}
+
{{btx.note.body}}
+
+ {{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}} +
+
Sent
+
+ +
+
{{btx.note.body}}
+
Moved
+
+ Invalid
-
-
{{btx.note.body}}
-
Moved
-
- Invalid -
- - - - – - - (possible double spend) - - - {{btx.amountStr}} + + + – + + (possible double spend) + + + {{btx.amountStr}} + +
+ + + Unconfirmed + +
-
- - - Unconfirmed - -
- +
From 74a15b824abf5f70c2d0567d2bb301d425db4149 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 1 Nov 2016 17:47:07 -0400 Subject: [PATCH 05/80] wire actual month to group label component --- src/js/controllers/walletDetails.js | 5 +++++ src/sass/views/walletDetails.scss | 1 + www/views/walletDetails.html | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6fd7a8b30..aeec92930 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -149,6 +149,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.txHistory = $scope.completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT); $scope.txHistoryShowMore = $scope.completeTxHistory.length > $scope.txHistory.length; } + console.log('$scope.completeTxHistory', $scope.completeTxHistory); + }; + + $scope.getDate = function(txCreated) { + return new Date(txCreated * 1000); }; $scope.showMore = function() { diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 1644d63c8..009614072 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -64,6 +64,7 @@ } #walletDetails { + background: #F8F8F9; .bar-header { border: 0; background: none; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index de748befe..027d008d5 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -176,7 +176,7 @@
-
June
+
{{getDate(btx.time) | date:'MMMM'}}
From e41b46b42d19f7b08ab3182fa23e8428aae4e434 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 2 Nov 2016 16:35:05 -0400 Subject: [PATCH 06/80] add logic to display grouping labels appropriately --- src/js/controllers/walletDetails.js | 17 +++++++++++++++++ www/views/walletDetails.html | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index aeec92930..af297c720 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -156,6 +156,23 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return new Date(txCreated * 1000); }; + $scope.showGroupHeader = function(index) { + if(index === 0) { + return true; + } + var curTx = $scope.txHistory[index]; + var prevTx = $scope.txHistory[index - 1]; + return !createdDuringSameMonth(curTx, prevTx); + }; + + function createdDuringSameMonth(tx1, tx2) { + var date1 = new Date(tx1.time * 1000); + var date2 = new Date(tx2.time * 1000); + var date1MonthYear = date1.getMonth() + date1.getFullYear(); + var date2MonthYear = date2.getMonth() + date2.getFullYear(); + return date1MonthYear === date2MonthYear; + } + $scope.showMore = function() { $timeout(function() { currentTxHistoryPage++; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 027d008d5..1b8530518 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -176,7 +176,7 @@
-
{{getDate(btx.time) | date:'MMMM'}}
+
{{getDate(btx.time) | date:'MMMM'}}
From 19554b94b6cd77ae4688cc1599b6071c04555066 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 2 Nov 2016 17:01:32 -0400 Subject: [PATCH 07/80] mark the current month as recent --- src/js/controllers/walletDetails.js | 16 ++++++++++++---- www/views/walletDetails.html | 9 ++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index af297c720..bb2506ff4 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -153,7 +153,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.getDate = function(txCreated) { - return new Date(txCreated * 1000); + var date = new Date(txCreated * 1000); + return date; }; $scope.showGroupHeader = function(index) { @@ -168,9 +169,16 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun function createdDuringSameMonth(tx1, tx2) { var date1 = new Date(tx1.time * 1000); var date2 = new Date(tx2.time * 1000); - var date1MonthYear = date1.getMonth() + date1.getFullYear(); - var date2MonthYear = date2.getMonth() + date2.getFullYear(); - return date1MonthYear === date2MonthYear; + return getMonthYear(date1) === getMonthYear(date2); + } + + $scope.isDateInCurrentMonth = function(date) { + var now = new Date(); + return getMonthYear(now) === getMonthYear(date); + }; + + function getMonthYear(date) { + return date.getMonth() + date.getFullYear(); } $scope.showMore = function() { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 1b8530518..278e10c68 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -176,7 +176,14 @@
-
{{getDate(btx.time) | date:'MMMM'}}
+
+ + Recent + + + {{getDate(btx.time) | date:'MMMM'}} + +
From 82e3a4af7c7adc427a6c76a4c6eaef066d60212e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 15:11:06 -0400 Subject: [PATCH 08/80] add confirming state --- www/img/icon-confirming.svg | 22 ++++++++++++++++++++++ www/views/walletDetails.html | 18 ++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 www/img/icon-confirming.svg diff --git a/www/img/icon-confirming.svg b/www/img/icon-confirming.svg new file mode 100644 index 000000000..989af61aa --- /dev/null +++ b/www/img/icon-confirming.svg @@ -0,0 +1,22 @@ + + + + Group 2 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 278e10c68..9e8fa7887 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -186,12 +186,16 @@
- - - + + + + + +
-
+ +
{{btx.note.body}}
Received
@@ -213,6 +217,12 @@ Invalid
+
+
+ Confirming +
+
+ – From 77b59d93fa08a15e9d7b7aed9e5318f068934de3 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 15:24:39 -0400 Subject: [PATCH 09/80] add confirmations item to tx-details --- www/views/modals/tx-details.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 82f560c8c..4acb712b0 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -54,12 +54,21 @@ -
+
Fee {{btx.feeStr}}
+
+ Confirmations + + {{btx.confirmations}} + + + 6+ + +
Timeline
From bddfdac0b12e937dc5b74dc3b05177170576e17d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 15:30:41 -0400 Subject: [PATCH 10/80] add confirming status to tx details view --- www/views/modals/tx-details.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 4acb712b0..a01d744bf 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -10,10 +10,14 @@
-
+
{{btx.action | translate}}
+
+ + Confirming +
{{displayAmount}} {{displayUnit}}
{{btx.alternativeAmountStr}}
From b0e23b72316e908ef744bc2740e512261ec7f8c1 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 15:50:22 -0400 Subject: [PATCH 11/80] show full date in wallet detail list if the transaction occured more than a day ago --- src/js/controllers/walletDetails.js | 6 ++++++ www/views/walletDetails.html | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index bb2506ff4..c01673915 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -172,6 +172,12 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return getMonthYear(date1) === getMonthYear(date2); } + $scope.createdWithinPastDay = function(tx) { + var now = new Date(); + var date = new Date(tx.time * 1000); + return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24); + }; + $scope.isDateInCurrentMonth = function(date) { var now = new Date(); return getMonthYear(now) === getMonthYear(date); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 9e8fa7887..9d933ca79 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -234,7 +234,9 @@
- + + + Unconfirmed From 073b063a48dd4e39362d35df233c6bc82711d34e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 17:29:29 -0400 Subject: [PATCH 12/80] improve tx proposal list item styling --- src/js/controllers/walletDetails.js | 8 +++-- src/sass/views/walletDetails.scss | 8 +++++ www/img/icon-proposal-pending.svg | 23 ++++++++++++ www/views/includes/txp.html | 54 +++++++++++++++++++++++++++-- www/views/tab-home.html | 8 +++-- www/views/walletDetails.html | 20 +++++------ 6 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 www/img/icon-proposal-pending.svg diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index c01673915..64c5b2c35 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -172,9 +172,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return getMonthYear(date1) === getMonthYear(date2); } - $scope.createdWithinPastDay = function(tx) { + $scope.createdWithinPastDay = function(time) { var now = new Date(); - var date = new Date(tx.time * 1000); + var date = new Date(time * 1000); return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24); }; @@ -187,6 +187,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return date.getMonth() + date.getFullYear(); } + $scope.isUnconfirmed = function(tx) { + return !tx.time && (!tx.confirmations || tx.confirmations === 0); + }; + $scope.showMore = function() { $timeout(function() { currentTxHistoryPage++; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 009614072..58ece2d10 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -39,6 +39,14 @@ align-items: center; background: #fff; padding-left: 1rem; + + &__marker { + position: absolute; + height: 100%; + width: 3px; + background: #F5A623; + left: 0; + } } &__tx-content { diff --git a/www/img/icon-proposal-pending.svg b/www/img/icon-proposal-pending.svg new file mode 100644 index 000000000..6314b99ff --- /dev/null +++ b/www/img/icon-proposal-pending.svg @@ -0,0 +1,23 @@ + + + + Group + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 107c0046c..6a66a5d8f 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -1,4 +1,4 @@ - + +
+ + +
+ +
+ + + {{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}} + + + {{tx.message}} + + + Sending + + + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + +
+ +
+
+ Confirming +
+
+ + + + – + + (possible double spend) + + + {{tx.amountStr}} + + +
+ + + + +
+ +
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 865afc0bc..783442eb3 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -37,9 +37,13 @@ {{txpsN}} - + + +
+
+
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 9d933ca79..4b8e4799b 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -96,8 +96,8 @@ Payment Proposals Unsent transactions
-
- +
+
Total Locked Balance: @@ -186,8 +186,8 @@
- - + + @@ -195,7 +195,7 @@
-
+
{{btx.note.body}}
Received
@@ -217,7 +217,7 @@ Invalid
-
+
Confirming
@@ -234,13 +234,13 @@
- - + + - Unconfirmed - + -->
From 155697e0877d89ecbafcd5343f3c23262e9cb149 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 17:38:46 -0400 Subject: [PATCH 13/80] update proposals header styling --- src/sass/views/walletDetails.scss | 4 ++++ www/views/walletDetails.html | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 58ece2d10..f5bf701fc 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -40,6 +40,10 @@ background: #fff; padding-left: 1rem; + &.proposal { + position: relative; + } + &__marker { position: absolute; height: 100%; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 4b8e4799b..a93092a32 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -92,12 +92,16 @@
-
+ +
+ Proposals + Unsent transactions
-
+
Total Locked Balance: From ccdad2c6e44d84430cd913e90575f7bbb2bb0793 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 13:29:19 -0400 Subject: [PATCH 14/80] hide border for last tx in group --- src/js/controllers/walletDetails.js | 9 ++++++++- src/sass/views/walletDetails.scss | 4 ++++ www/views/walletDetails.html | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 64c5b2c35..a8ecb9087 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -157,7 +157,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return date; }; - $scope.showGroupHeader = function(index) { + $scope.isFirstInGroup = function(index) { if(index === 0) { return true; } @@ -166,6 +166,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return !createdDuringSameMonth(curTx, prevTx); }; + $scope.isLastInGroup = function(index) { + if(index === $scope.txHistory.length - 1) { + return true; + } + return $scope.isFirstInGroup(index + 1); + }; + function createdDuringSameMonth(tx1, tx2) { var date1 = new Date(tx1.time * 1000); var date2 = new Date(tx2.time * 1000); diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index f5bf701fc..9ef5291d7 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -61,6 +61,10 @@ padding-right: 1rem; border-bottom: 1px solid rgb(245, 245, 245); overflow: hidden; + + &.no-border { + border: 0; + } } &__tx-amount { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index a93092a32..879544e13 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -180,7 +180,7 @@
-
+
Recent @@ -197,7 +197,7 @@ -
+
From 6f1443c523a59488ea963ba10392693ad1f2639d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 13:45:34 -0400 Subject: [PATCH 15/80] no border for txp on home view --- www/views/includes/txp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 6a66a5d8f..048680023 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -28,7 +28,7 @@
-
+
From 9f79387bb3e1b1f588ef51d2869f7102bbca2109 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 14:56:20 -0400 Subject: [PATCH 16/80] better bitpay card get started state styling --- src/js/controllers/walletDetails.js | 1 + src/sass/views/bitpayCard.scss | 23 +++++++++++++++++++++++ www/views/bitpayCard.html | 8 +++++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a8ecb9087..6d508d423 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -53,6 +53,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun force: !!force, }, function(err, status) { $scope.updatingStatus = false; + console.log('status', status); if (err) { if (err === 'WALLET_NOT_REGISTERED') { $scope.walletNotRegistered = true; diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 70bd2d762..9e97348f1 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -1,4 +1,5 @@ #bitpayCard { + background: white; .bar-header { border: 0; background: #1e3186; @@ -37,4 +38,26 @@ .item-select select { color: #667; } + + .get-started { + + margin-top: 20px; + + &__arrow { + font-size: 56px; + opacity: .2; + } + + h1 { + font-size: 28px; + color: #4A4A4A; + } + + &__text { + font-weight: 300; + color: #8e8e8e; + max-width: 300px; + margin: 0 auto; + } + } } diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 8f1464bc5..4e7297d72 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -41,11 +41,13 @@
- +

Get started

-

Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

+
+ Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide. +
From 92c8e25dc1104d9528cc36ba844974d07a411687 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 15:25:33 -0400 Subject: [PATCH 17/80] better styling for card header --- src/sass/views/bitpayCard.scss | 8 +++++++- www/views/bitpayCard.html | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 9e97348f1..123a936bf 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -14,11 +14,17 @@ width: 100%; text-align: center; padding: 2rem 1rem 1.5rem 1rem; - height: 140px; + height: 160px; border-color: #172565; background-color: #1e3186; background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); color: #fff; + + &__balance { + margin-bottom: 25px; + font-weight: 600; + font-size: 34px; + } } .wallet-details-wallet-info { bottom: 5px; diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 4e7297d72..59a48d583 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -19,7 +19,7 @@
-
${{bitpayCard.bitpayCardCurrentBalance}}
+
${{bitpayCard.bitpayCardCurrentBalance}}
From 27f44220a1cc08e641d8be66779489419ff80688 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 15:42:34 -0400 Subject: [PATCH 18/80] keep card header background color uniform even user scrolls --- src/sass/views/bitpayCard.scss | 14 ++++++++++++++ www/views/bitpayCard.html | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 123a936bf..44a2824bf 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -10,6 +10,20 @@ background-color: transparent; } } + .amount-wrapper { + position: relative; + overflow: visible; + + &:before { + content: ''; + top: -1000px; + left: 0; + position: absolute; + height: 1000px; + width: 100%; + background-color: #1e3186; + } + } .amount { width: 100%; text-align: center; diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 59a48d583..d5a2d12e8 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -16,7 +16,7 @@ Sandbox version. Only for testing purpose
-
+
${{bitpayCard.bitpayCardCurrentBalance}}
From d7932dc31c2d916fee52b1de6ae277ec7d07712e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 16:58:13 -0400 Subject: [PATCH 19/80] reenable scroll bounce for wallet details --- src/sass/views/bitpayCard.scss | 2 +- src/sass/views/walletDetails.scss | 13 +++++++++++++ www/views/bitpayCard.html | 1 + www/views/walletDetails.html | 5 +++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 44a2824bf..fb796869c 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -14,7 +14,7 @@ position: relative; overflow: visible; - &:before { + .amount-bg { content: ''; top: -1000px; left: 0; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 9ef5291d7..9939127c6 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -94,6 +94,19 @@ .nav-bar-block, .bar { background-color: inherit !important; } + .amount-wrapper { + position: relative; + overflow: visible; + + .amount-bg { + content: ''; + top: -1000px; + left: 0; + position: absolute; + height: 1000px; + width: 100%; + } + } .amount { width: 100%; text-align: center; diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index d5a2d12e8..34c345732 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -17,6 +17,7 @@
+
${{bitpayCard.bitpayCardCurrentBalance}}
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 879544e13..5e2967e58 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -10,14 +10,15 @@ - + -
+
+
From 610d42caae61225ab7017d199aa58c81d142588f Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 15:32:28 -0500 Subject: [PATCH 20/80] better proposal styling and fix confirming status on wallet master view --- src/js/controllers/walletDetails.js | 2 +- www/views/includes/txp.html | 15 ++------------- www/views/walletDetails.html | 7 +------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6d508d423..382c870e0 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -196,7 +196,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun } $scope.isUnconfirmed = function(tx) { - return !tx.time && (!tx.confirmations || tx.confirmations === 0); + return !tx.confirmations || tx.confirmations === 0; }; $scope.showMore = function() { diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 048680023..6576549bf 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -48,30 +48,19 @@
-
-
- Confirming -
-
- - + – (possible double spend) - {{tx.amountStr}} + – {{tx.amountStr}}
- -
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5e2967e58..6dfe8d9de 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -104,7 +104,7 @@
-
+
Total Locked Balance: {{status.lockedBalanceStr}} {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} @@ -241,11 +241,6 @@
- -
From 4277ed8427f96712bba29145e92e92abbc679dab Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 15:48:51 -0500 Subject: [PATCH 21/80] fix tx details padding bottom on ios --- src/sass/views/confirm.scss | 4 +++- www/views/modals/tx-details.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 172f82173..6ae3d89d1 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,3 +1,5 @@ #view-confirm { - + .tx-details-content > .scroll { + padding-bottom: .25rem; + } } diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index a01d744bf..26171a78c 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -7,7 +7,7 @@ - +
From 1219f368a73ca4d2bc09268b887ebe0f2696f487 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 17:22:51 -0500 Subject: [PATCH 22/80] show wallet not backed up warning in wallet detail view --- src/js/controllers/walletDetails.js | 13 +++++++++++-- src/sass/views/walletDetails.scss | 11 +++++++++++ www/views/walletDetails.html | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 382c870e0..5addca3b0 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicHistory) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -225,9 +225,18 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; + $scope.backup = function() { + //$state.go('tabs.preferences', {walletId: $scope.walletId}); + //$state.transitionTo('tabs.preferences.backupWarning'); + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.wallet = profileService.getWallet(data.stateParams.walletId); + $scope.walletId = data.stateParams.walletId; + storageService.getBackupFlag($scope.walletId, function(err, flag) { + $scope.isBackedUp = flag ? true : false; + }); + $scope.wallet = profileService.getWallet($scope.walletId); $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; addressbookService.list(function(err, ab) { diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 9939127c6..d424e217e 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -145,3 +145,14 @@ font-size: 20px; color: #fff; } + +.wallet-not-backed-up-warning { + margin-top: -10px; + margin-bottom: 1rem; + background: #E15061; + text-align: center; + color: white; + font-size: 14px; + display: block; + text-decoration: none; +} diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index aeab8a2c6..22ac125d5 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -64,6 +64,9 @@
+ + Wallet not backed up +
From e675de415d870841d90de3373f9a8eac8ed7a8ad Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 17:28:18 -0500 Subject: [PATCH 23/80] reduce tx time font-size and remove red styling from unconfirmed label --- src/sass/views/walletDetails.scss | 2 +- www/views/modals/tx-details.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index d424e217e..08cafe12d 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -14,7 +14,7 @@ } &__tx-time { color: $light-gray; - font-size: 14px; + font-size: 12.5px; } &__tx-title { //padding-top: 10px; diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index e9bce3cc9..bde279c2a 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -67,7 +67,7 @@
Confirmations - + Unconfirmed From 61efeefdd6b208abe3ec0e83f5b06da57234bb81 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 7 Nov 2016 17:39:41 -0500 Subject: [PATCH 24/80] better wallet not backed up warning positioning --- src/sass/views/walletDetails.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 08cafe12d..c4c7900fd 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -147,7 +147,7 @@ } .wallet-not-backed-up-warning { - margin-top: -10px; + margin-top: -15px; margin-bottom: 1rem; background: #E15061; text-align: center; @@ -155,4 +155,6 @@ font-size: 14px; display: block; text-decoration: none; + z-index: 9999; + position: relative; } From 98e88ef3f958cc9597d4c35b11589aa3c3c276ab Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 14:15:24 -0500 Subject: [PATCH 25/80] update tx icons --- src/sass/views/walletDetails.scss | 2 +- www/img/icon-tx-moved-outline.svg | 21 +++++++++++++++++++++ www/img/icon-tx-received-outline.svg | 19 +++++++++++++++++++ www/img/icon-tx-sent-outline.svg | 21 +++++++++++++++++++++ www/views/walletDetails.html | 6 +++--- 5 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 www/img/icon-tx-moved-outline.svg create mode 100644 www/img/icon-tx-received-outline.svg create mode 100644 www/img/icon-tx-sent-outline.svg diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index c4c7900fd..bb23f245d 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -6,7 +6,7 @@ font-weight: bold; } &--received { - color: #30af6c; + color: #09C286; } &--sent { color: $dark-gray; diff --git a/www/img/icon-tx-moved-outline.svg b/www/img/icon-tx-moved-outline.svg new file mode 100644 index 000000000..1f15f2d7e --- /dev/null +++ b/www/img/icon-tx-moved-outline.svg @@ -0,0 +1,21 @@ + + + + Group 2 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/img/icon-tx-received-outline.svg b/www/img/icon-tx-received-outline.svg new file mode 100644 index 000000000..2c095480c --- /dev/null +++ b/www/img/icon-tx-received-outline.svg @@ -0,0 +1,19 @@ + + + + Group 2 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/img/icon-tx-sent-outline.svg b/www/img/icon-tx-sent-outline.svg new file mode 100644 index 000000000..790099585 --- /dev/null +++ b/www/img/icon-tx-sent-outline.svg @@ -0,0 +1,21 @@ + + + + Group 2 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 22ac125d5..cddbe11a7 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -197,9 +197,9 @@
- - - + + +
From a1ae8f2afb206b564e25f1d1034d53294aeb19e7 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 15:00:54 -0500 Subject: [PATCH 26/80] ensure tx row activates on tap --- src/sass/views/walletDetails.scss | 10 ++++++++++ www/views/walletDetails.html | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index bb23f245d..a0ad9dd0e 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -34,10 +34,20 @@ } + .item { + display: flex; + align-items: center; + background: #fff; + padding-left: 1rem; + } + &__item { display: flex; align-items: center; background: #fff; + padding: 0; + margin: 0; + border: 0; padding-left: 1rem; &.proposal { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index cddbe11a7..0f2aa173e 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -194,7 +194,7 @@
-
+ @@ -248,7 +248,7 @@
-
+
From a322ca2168dea4b32118780cd9450aa5148dbdb6 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 15:36:42 -0500 Subject: [PATCH 27/80] use action icons in tx detail view --- www/views/modals/tx-details.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index bde279c2a..817c68d5f 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -11,7 +11,9 @@
- + + + {{btx.action | translate}}
From 43f08be0bace1c6c510ce918e757a0029b7182af Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 15:59:09 -0500 Subject: [PATCH 28/80] display memo and memo label on separate lines in tx detail view --- www/views/modals/tx-details.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 817c68d5f..686249e05 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -53,11 +53,11 @@ {{btx.creatorName}}
- + Memo - +
{{btx.note.body || btx.message}} - +
From 93d16b706788e1fea6a66bbb7bef0d83630019dc Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 16:06:41 -0500 Subject: [PATCH 29/80] ensure ellipsis is applied to all tx labels in wallet master view --- www/views/walletDetails.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 0f2aa173e..8486249b7 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -206,22 +206,22 @@
-
{{btx.note.body}}
-
Received
+
{{btx.note.body}}
+
Received
{{btx.message}}
-
{{btx.note.body}}
-
+
{{btx.note.body}}
+
{{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}}
Sent
-
{{btx.note.body}}
-
Moved
+
{{btx.note.body}}
+
Moved
Invalid
From ee3fe85bd9230a248b027c25d6d789d6957a8e19 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 16:38:31 -0500 Subject: [PATCH 30/80] update home tab proposal styling --- src/sass/views/tab-home.scss | 9 +++++++++ www/views/tab-home.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 2d5368a8d..5ecd6d819 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -52,6 +52,15 @@ } } } + .wallet-details__item.item { + padding-top: 0; + padding-bottom: 0; + + .wallet-details__tx-icon { + background: #fff; + border-radius: 50px; + } + } .next-step.item { padding-top: 27px; padding-bottom: 27px; diff --git a/www/views/tab-home.html b/www/views/tab-home.html index af0679fed..c2815c666 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -42,7 +42,7 @@ -->
-
+
From b05bfc141b6c740f68c44a416f32f8266de06b9c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 16:51:23 -0500 Subject: [PATCH 31/80] fix styling in payment proposals view --- www/views/proposals.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/www/views/proposals.html b/www/views/proposals.html index abeb2ea15..0494e67d3 100644 --- a/www/views/proposals.html +++ b/www/views/proposals.html @@ -16,10 +16,8 @@
-
- - - +
+
From 375eba24ecdd9b2651776fdb55c04a18c23271fd Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 16:55:02 -0500 Subject: [PATCH 32/80] update send confirm and txp details action icon to new --- www/views/confirm.html | 2 +- www/views/modals/txp-details.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/views/confirm.html b/www/views/confirm.html index 6c8dd10ac..94cd36fac 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -11,7 +11,7 @@
- + Sending
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index 769985946..624cbaa16 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -15,7 +15,7 @@
- + Sending
From c3ef4123830f7db8f4276e4fe90cc7df7bfbc220 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 9 Nov 2016 12:34:38 -0500 Subject: [PATCH 33/80] prelim wallet details header collapse transition --- src/js/controllers/walletDetails.js | 18 +++++++++- src/sass/views/walletDetails.scss | 17 +++++++-- www/views/walletDetails.html | 56 ++++++++++++++++++++++++++--- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 5addca3b0..994f741a6 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicHistory) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicHistory, $ionicScrollDelegate, $window) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -230,6 +230,22 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun //$state.transitionTo('tabs.preferences.backupWarning'); }; + $scope.amountHeight = '180px'; + + $scope.getScrollPosition = function(){ + console.log($ionicScrollDelegate.getScrollPosition().top); + var pos = $ionicScrollDelegate.getScrollPosition().top; + var amountHeight = 180 - pos; + if(amountHeight < 80) { + amountHeight = 80; + } + console.log('amountHeight', amountHeight); + $window.requestAnimationFrame(function() { + $scope.amountHeight = amountHeight + 'px'; + $scope.$evalAsync(angular.noop); + }); + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.walletId = data.stateParams.walletId; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index a0ad9dd0e..02ebc4579 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -104,9 +104,16 @@ .nav-bar-block, .bar { background-color: inherit !important; } + ion-content { + margin-top: 180px; + padding-top: 0; + top: 0; + //top: 40px; + } .amount-wrapper { position: relative; overflow: visible; + //margin-top: 40px; .amount-bg { content: ''; @@ -120,10 +127,14 @@ .amount { width: 100%; text-align: center; - padding: 2rem 1rem 1.5rem 1rem; + //padding: 2rem 1rem 1.5rem 1rem; color: #fff; - height: 140px; + height: 180px; margin-bottom: 10px; + padding-top: 40px; + display: flex; + align-items: center; + justify-content: center; &-alternative { line-height: 36px; @@ -157,7 +168,7 @@ } .wallet-not-backed-up-warning { - margin-top: -15px; + //margin-top: -15px; margin-bottom: 1rem; background: #E15061; text-align: center; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 8486249b7..b7d87870f 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -10,14 +10,62 @@ - + +
+
+
+
+ + + +
+ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. + Recreate +
+ +
+ Scan status finished with error +
Tap to retry +
+ + +
+ {{status.totalBalanceStr}} +
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
Available: {{status.totalBalanceStr}}
+
Confirming: {{status.pendingAmountStr}}
+
+
+ +
+ [Balance Hidden] +
+ Tap and hold to show +
+
+
+
+
+ ... +
+
+
+ +
+ +
+
+ -
+ +
-
+
--> Wallet not backed up From e2cd188e39cde86637faf598cf914dc1ea4033a9 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 9 Nov 2016 13:15:42 -0500 Subject: [PATCH 34/80] add scaling and opacity transitions --- src/js/controllers/walletDetails.js | 15 +++++++++++++++ www/views/walletDetails.html | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 994f741a6..ead4a04dc 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -239,9 +239,24 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if(amountHeight < 80) { amountHeight = 80; } + + var amountScale = amountHeight/180; + if(amountScale < 0.5) { + amountScale = 0.5; + } + if(amountScale > 1.1) { + amountScale = 1.1; + } + var s = amountScale; + + $scope.altAmountOpacity = (amountHeight - 100)/80; + console.log('amountHeight', amountHeight); $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; + $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; + console.log('$scope.amountScale', $scope.amountScale); + console.log('$scope.altAmountOpacity', $scope.altAmountOpacity); $scope.$evalAsync(angular.noop); }); }; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index b7d87870f..dc8156d67 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -31,9 +31,21 @@
-
+
{{status.totalBalanceStr}} -
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+ {{status.totalBalanceAlternative}} {{status.alternativeIsoCode}} +
Available: {{status.totalBalanceStr}}
Confirming: {{status.pendingAmountStr}}
@@ -54,7 +66,7 @@
-
+
From 6dbc9057cdc502180332dd35a81f027c639cfa2d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 9 Nov 2016 13:37:14 -0500 Subject: [PATCH 35/80] improve final balance position --- src/js/controllers/walletDetails.js | 5 +++++ www/views/walletDetails.html | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ead4a04dc..449fdaa1e 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -239,6 +239,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if(amountHeight < 80) { amountHeight = 80; } + var contentMargin = amountHeight; + if(contentMargin > 180) { + contentMargin = 180; + } var amountScale = amountHeight/180; if(amountScale < 0.5) { @@ -254,6 +258,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun console.log('amountHeight', amountHeight); $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; + $scope.contentMargin = contentMargin + 'px'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; console.log('$scope.amountScale', $scope.amountScale); console.log('$scope.altAmountOpacity', $scope.altAmountOpacity); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index dc8156d67..f7ab5c1c3 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -36,6 +36,7 @@ ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()" ng-style="{'transform': amountScale}" + style="margin-top: 5px;" > {{status.totalBalanceStr}}
- + Date: Wed, 9 Nov 2016 15:27:39 -0500 Subject: [PATCH 36/80] attempt to fix white line caused by rendering delay --- src/sass/views/walletDetails.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 02ebc4579..e7186d551 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -109,6 +109,9 @@ padding-top: 0; top: 0; //top: 40px; + .scroll { + background: rgb(248, 248, 249); + } } .amount-wrapper { position: relative; @@ -120,7 +123,7 @@ top: -1000px; left: 0; position: absolute; - height: 1000px; + height: 2000px; width: 100%; } } From 421cc349a0b819ea97aad2293b5777aca90f692f Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 11:33:50 -0500 Subject: [PATCH 37/80] better way to prevent white flicker during wallet detail scroll --- src/sass/views/walletDetails.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index e7186d551..058c6d815 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -120,11 +120,12 @@ .amount-bg { content: ''; - top: -1000px; + bottom: 0; left: 0; position: absolute; - height: 2000px; width: 100%; + height: 100px; + transform: translateY(100px); } } .amount { From 523f3e930382f1e5cc2a87c68e45d9db4a105b46 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 14:02:34 -0500 Subject: [PATCH 38/80] ensure solid scroll content bg color --- src/sass/views/walletDetails.scss | 3 ++- www/views/walletDetails.html | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 058c6d815..40a396482 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -111,6 +111,7 @@ //top: 40px; .scroll { background: rgb(248, 248, 249); + min-height: 300px; } } .amount-wrapper { @@ -124,7 +125,7 @@ left: 0; position: absolute; width: 100%; - height: 100px; + height: 200px; transform: translateY(100px); } } diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index f7ab5c1c3..fe61d8e28 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -12,7 +12,10 @@
-
+
From fbc2010f7e6611fd8a69df8a6932393642ca39f2 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 14:26:22 -0500 Subject: [PATCH 39/80] account for status bar --- src/sass/views/walletDetails.scss | 8 ++++++++ www/views/walletDetails.html | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 40a396482..59e8a0839 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -91,6 +91,14 @@ #walletDetails { background: #F8F8F9; + .bp-content { + position: relative; + height: 100%; + + &.status-bar { + margin-top: 20px; + } + } .bar-header { border: 0; background: none; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index fe61d8e28..c0995c0a4 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -1,4 +1,5 @@ + {{wallet.name}} @@ -10,6 +11,7 @@ +
+
From 1153f942acbd812f2f03cbdff68b0855ed8edf03 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 14:31:26 -0500 Subject: [PATCH 40/80] ensure balance displays properly on initial load --- src/js/controllers/walletDetails.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 449fdaa1e..0e40e0239 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -231,6 +231,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.amountHeight = '180px'; + $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; $scope.getScrollPosition = function(){ console.log($ionicScrollDelegate.getScrollPosition().top); From 3babc0c47d5340c692c60734cdbc20333b9f12a8 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 18:12:40 -0500 Subject: [PATCH 41/80] cleanup --- src/js/controllers/walletDetails.js | 9 +-- src/sass/views/walletDetails.scss | 5 -- www/views/includes/txp.html | 99 +++++++++++------------------ www/views/tab-home.html | 4 -- www/views/walletDetails.html | 95 --------------------------- 5 files changed, 38 insertions(+), 174 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 0e40e0239..77e43fd66 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -53,7 +53,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun force: !!force, }, function(err, status) { $scope.updatingStatus = false; - console.log('status', status); if (err) { if (err === 'WALLET_NOT_REGISTERED') { $scope.walletNotRegistered = true; @@ -150,7 +149,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.txHistory = $scope.completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT); $scope.txHistoryShowMore = $scope.completeTxHistory.length > $scope.txHistory.length; } - console.log('$scope.completeTxHistory', $scope.completeTxHistory); }; $scope.getDate = function(txCreated) { @@ -234,7 +232,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; $scope.getScrollPosition = function(){ - console.log($ionicScrollDelegate.getScrollPosition().top); var pos = $ionicScrollDelegate.getScrollPosition().top; var amountHeight = 180 - pos; if(amountHeight < 80) { @@ -245,24 +242,22 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun contentMargin = 180; } - var amountScale = amountHeight/180; + var amountScale = (amountHeight/180); if(amountScale < 0.5) { amountScale = 0.5; } if(amountScale > 1.1) { amountScale = 1.1; } + var s = amountScale; $scope.altAmountOpacity = (amountHeight - 100)/80; - console.log('amountHeight', amountHeight); $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; $scope.contentMargin = contentMargin + 'px'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; - console.log('$scope.amountScale', $scope.amountScale); - console.log('$scope.altAmountOpacity', $scope.altAmountOpacity); $scope.$evalAsync(angular.noop); }); }; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 59e8a0839..42286d2e2 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -17,7 +17,6 @@ font-size: 12.5px; } &__tx-title { - //padding-top: 10px; flex-grow: 1; color: $dark-gray; overflow: hidden; @@ -116,7 +115,6 @@ margin-top: 180px; padding-top: 0; top: 0; - //top: 40px; .scroll { background: rgb(248, 248, 249); min-height: 300px; @@ -125,7 +123,6 @@ .amount-wrapper { position: relative; overflow: visible; - //margin-top: 40px; .amount-bg { content: ''; @@ -140,7 +137,6 @@ .amount { width: 100%; text-align: center; - //padding: 2rem 1rem 1.5rem 1rem; color: #fff; height: 180px; margin-bottom: 10px; @@ -181,7 +177,6 @@ } .wallet-not-backed-up-warning { - //margin-top: -15px; margin-bottom: 1rem; background: #E15061; text-align: center; diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 6576549bf..779869454 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -1,66 +1,39 @@ - -
- - -
- -
- - - {{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}} - - - {{tx.message}} - - - Sending - - - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - -
- - - - – - - (possible double spend) - - - – {{tx.amountStr}} - - -
- - -
- -
+
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index c2815c666..1c972afd6 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -37,10 +37,6 @@ {{txpsN}} - -
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index c0995c0a4..ddce60732 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -83,53 +83,7 @@ spinner="ios-small" on-refresh="onRefresh()"> - Wallet not backed up @@ -200,55 +154,6 @@
- -
From 698c4c85ed5feb39d411a07c5846554c7b3e280b Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 18:30:49 -0500 Subject: [PATCH 42/80] make wallet not backed up warning orange --- src/sass/views/walletDetails.scss | 3 +-- www/views/walletDetails.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 42286d2e2..cd76be493 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -177,8 +177,7 @@ } .wallet-not-backed-up-warning { - margin-bottom: 1rem; - background: #E15061; + background: orange; text-align: center; color: white; font-size: 14px; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index ddce60732..9567b17bf 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -88,7 +88,7 @@ Wallet not backed up -
+
From e82c7663bf2bbd77298b75252ff609f025e4f64a Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 10 Nov 2016 18:34:27 -0500 Subject: [PATCH 43/80] update icons in history view to match tx list view --- www/views/modals/search.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/views/modals/search.html b/www/views/modals/search.html index ed507f76f..02abbc9b0 100644 --- a/www/views/modals/search.html +++ b/www/views/modals/search.html @@ -40,9 +40,9 @@

- sync - sync - sync + sync + sync + sync

From 3c38ae5d4d9e8d6401ad84a3c0c47ca03d3c3a8e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 11 Nov 2016 11:50:50 -0500 Subject: [PATCH 44/80] cleaner tx received icon --- src/sass/views/includes/txp-details.scss | 2 ++ www/img/icon-tx-received-outline.svg | 34 +++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 8c5e7c723..9ebb8ad67 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -23,6 +23,8 @@ img { margin-right: 1rem; + height: 35px; + width: 35px; } span { diff --git a/www/img/icon-tx-received-outline.svg b/www/img/icon-tx-received-outline.svg index 2c095480c..fe902fab0 100644 --- a/www/img/icon-tx-received-outline.svg +++ b/www/img/icon-tx-received-outline.svg @@ -1,19 +1,15 @@ - - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + From f80f2b87754d690209fc5eb232ba0eb6e235cfe6 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 11 Nov 2016 16:52:41 -0500 Subject: [PATCH 45/80] better balance collapse animation performance on android --- src/js/controllers/walletDetails.js | 32 +++++++++++++++++++++++++---- www/views/walletDetails.html | 4 ++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index c5d66cd4b..d10a0767f 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.openTxpModal = txpModalService.open; $scope.isCordova = platformInfo.isCordova; $scope.isAndroid = platformInfo.isAndroid; + $scope.isIOS = platformInfo.isIOS; $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); @@ -239,8 +240,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.amountHeight = '180px'; $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; + var prevPos; $scope.getScrollPosition = function(){ var pos = $ionicScrollDelegate.getScrollPosition().top; + if(pos === prevPos) { + return; + } + prevPos = pos; var amountHeight = 180 - pos; if(amountHeight < 80) { amountHeight = 80; @@ -262,16 +268,30 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.altAmountOpacity = (amountHeight - 100)/80; - $window.requestAnimationFrame(function() { + //$window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; $scope.contentMargin = contentMargin + 'px'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; - $scope.$evalAsync(angular.noop); - }); + //$scope.$evalAsync(angular.noop); + //}); }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { + // $scope.getScrollPosition(); + // $timeout(function() { + // + // }, 300); + + var scrollInterval; + + $scope.$on("$ionicView.enter", function(event, data) { + scrollInterval = $interval(function(){ + $scope.getScrollPosition(); + }, 10); + }); + + + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.walletId = data.stateParams.walletId; storageService.getBackupFlag($scope.walletId, function(err, flag) { $scope.isBackedUp = flag ? true : false; @@ -298,6 +318,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun ]; }); + $scope.$on("$ionicView.beforeLeave", function(event, data) { + $interval.cancel(scrollInterval); + }); + $scope.$on("$ionicView.leave", function(event, data) { lodash.each(listeners, function(x) { x(); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 9567b17bf..bb44b0379 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -11,7 +11,7 @@ -
+
- + Date: Fri, 11 Nov 2016 17:24:01 -0500 Subject: [PATCH 46/80] use requestAnimationFrame rather than interval --- src/js/controllers/walletDetails.js | 34 +++++++++++++---------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index d10a0767f..b6fcb6849 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -241,9 +241,12 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; var prevPos; - $scope.getScrollPosition = function(){ + function getScrollPosition(){ var pos = $ionicScrollDelegate.getScrollPosition().top; if(pos === prevPos) { + $window.requestAnimationFrame(function() { + getScrollPosition(); + }); return; } prevPos = pos; @@ -267,30 +270,23 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var s = amountScale; $scope.altAmountOpacity = (amountHeight - 100)/80; - - //$window.requestAnimationFrame(function() { + $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; $scope.contentMargin = contentMargin + 'px'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; - //$scope.$evalAsync(angular.noop); - //}); - }; - - // $scope.getScrollPosition(); - - // $timeout(function() { - // - // }, 300); + $scope.$digest(); + getScrollPosition(); + }); + } var scrollInterval; $scope.$on("$ionicView.enter", function(event, data) { - scrollInterval = $interval(function(){ - $scope.getScrollPosition(); - }, 10); + $timeout(function() { + getScrollPosition(); + }, 100); }); - $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.walletId = data.stateParams.walletId; storageService.getBackupFlag($scope.walletId, function(err, flag) { @@ -318,9 +314,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun ]; }); - $scope.$on("$ionicView.beforeLeave", function(event, data) { - $interval.cancel(scrollInterval); - }); + // $scope.$on("$ionicView.beforeLeave", function(event, data) { + // $interval.cancel(scrollInterval); + // }); $scope.$on("$ionicView.leave", function(event, data) { lodash.each(listeners, function(x) { From c92d6ae0a1dedbe4cc633a8534e330e0cf8428d8 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 11 Nov 2016 18:49:23 -0500 Subject: [PATCH 47/80] make pull to refresh icon white --- src/sass/views/walletDetails.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index cd76be493..9669378ef 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -90,6 +90,16 @@ #walletDetails { background: #F8F8F9; + + .ionic-refresher-content { + color: white !important; + } + + .spinner svg { + stroke: white; + fill: white; + } + .bp-content { position: relative; height: 100%; From c78bc746cf501f472474770b0bf1cd2fbb11ecd9 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 11 Nov 2016 18:51:43 -0500 Subject: [PATCH 48/80] only initialize scroll watcher once --- src/js/controllers/walletDetails.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index b6fcb6849..d4ca2f1c3 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -279,9 +279,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); } - var scrollInterval; + var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { + if(scrollWatcherInitialized) { + return; + } + scrollWatcherInitialized = true; $timeout(function() { getScrollPosition(); }, 100); From 993fb5d8adf48b07470ee6944d8126a0cef3a233 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 14 Nov 2016 14:42:04 -0500 Subject: [PATCH 49/80] move styles to classes --- src/sass/views/walletDetails.scss | 5 +++++ www/views/walletDetails.html | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 9669378ef..e839d4422 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -155,6 +155,11 @@ align-items: center; justify-content: center; + &__balance { + transform: scale3d(1, 1, 1); + margin-top: 5px; + } + &-alternative { line-height: 36px; } diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index bb44b0379..106016c25 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -35,13 +35,12 @@
Tap to retry
-
{{status.totalBalanceStr}}
Date: Mon, 14 Nov 2016 15:34:47 -0500 Subject: [PATCH 50/80] ensure 3 dots display during balance update --- www/views/walletDetails.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 106016c25..5827b0df5 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -17,7 +17,7 @@
+ >
@@ -64,7 +64,7 @@
-
+
...
From 911ba7e8bc0a9a37d5393f7e02e2667b947f63ec Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 14 Nov 2016 16:18:26 -0500 Subject: [PATCH 51/80] remove style initializers --- src/js/controllers/walletDetails.js | 3 --- src/sass/views/walletDetails.scss | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index d4ca2f1c3..33eed46f2 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -237,9 +237,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun //$state.transitionTo('tabs.preferences.backupWarning'); }; - $scope.amountHeight = '180px'; - $scope.amountScale = 'scale3d(' + 1 + ',' + 1 + ',' + 1+ ')'; - var prevPos; function getScrollPosition(){ var pos = $ionicScrollDelegate.getScrollPosition().top; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index e839d4422..e1e93486d 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -160,6 +160,11 @@ margin-top: 5px; } + &__updating { + z-index: 999; + margin-top: -2.1rem; + } + &-alternative { line-height: 36px; } From 7b97d573110d17b29088ac7025d810405f65f6ca Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 14 Nov 2016 17:01:46 -0500 Subject: [PATCH 52/80] add explicit bg color to group label element --- src/sass/views/walletDetails.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index e1e93486d..dd1a3cf60 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -85,6 +85,7 @@ font-weight: 300; color: #727272; padding: 2px 1rem; + background: #f8f8f9; } } From d3d15ea88798342b4de41914fbf4c9c5133213b0 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 14 Nov 2016 18:26:45 -0500 Subject: [PATCH 53/80] disable amount collapsibility on android --- src/js/controllers/walletDetails.js | 4 +- src/sass/views/walletDetails.scss | 11 +++++- www/views/walletDetails.html | 61 ++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 33eed46f2..019267dfe 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -12,6 +12,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.isAndroid = platformInfo.isAndroid; $scope.isIOS = platformInfo.isIOS; + $scope.amountIsCollapsible = !$scope.isAndroid; + $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); }; @@ -279,7 +281,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { - if(scrollWatcherInitialized) { + if(scrollWatcherInitialized || !$scope.amountIsCollapsible) { return; } scrollWatcherInitialized = true; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index dd1a3cf60..78e89e360 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -123,7 +123,11 @@ background-color: inherit !important; } ion-content { - margin-top: 180px; + + &.collapsible { + margin-top: 180px; + } + padding-top: 0; top: 0; .scroll { @@ -150,12 +154,15 @@ text-align: center; color: #fff; height: 180px; - margin-bottom: 10px; padding-top: 40px; display: flex; align-items: center; justify-content: center; + &.collapsible { + margin-bottom: 10px; + } + &__balance { transform: scale3d(1, 1, 1); margin-top: 5px; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5827b0df5..a8f2ecb43 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -13,12 +13,16 @@
-
+
-
+
@@ -69,13 +73,14 @@ ...
-
+
-
- +
+ + +
+
+
+ +
+ {{updateStatusError}} + Tap to retry +
+ +
+ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. + Recreate +
+ +
+ {{status.totalBalanceStr}} +
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
Available: {{status.totalBalanceStr}}
+
Confirming: {{status.pendingAmountStr}}
+
+
+ +
+ [Balance Hidden] +
+ Tap and hold to show +
+
+
+
+
+ ... +
+
+
+ +
+ +
+
+ Wallet not backed up From 26814461f18bf66d3c0942fd1b0d76dace1b557c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 14 Nov 2016 19:13:14 -0500 Subject: [PATCH 54/80] ensure header background is pullable when collapsing is disabled --- src/sass/views/walletDetails.scss | 16 +++++++++++++--- www/views/walletDetails.html | 7 ++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 78e89e360..d128d60a9 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -141,12 +141,22 @@ .amount-bg { content: ''; - bottom: 0; + top: 0; left: 0; position: absolute; width: 100%; - height: 200px; - transform: translateY(100px); + height: 500px; + transform: translateY(-499px); + + &.collapsible { + top: initial; + bottom: 0; + left: 0; + position: absolute; + width: 100%; + height: 200px; + transform: translateY(100px); + } } } .amount { diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index a8f2ecb43..b61d77d35 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -17,6 +17,7 @@
-
+
+
Date: Tue, 15 Nov 2016 11:03:45 -0300 Subject: [PATCH 55/80] navigate to backup flow --- src/js/controllers/walletDetails.js | 30 +++++++++++++---------------- src/js/routes.js | 12 ++++++++++-- www/views/walletDetails.html | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 019267dfe..c2737c64b 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -168,7 +168,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.isFirstInGroup = function(index) { - if(index === 0) { + if (index === 0) { return true; } var curTx = $scope.txHistory[index]; @@ -177,7 +177,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.isLastInGroup = function(index) { - if(index === $scope.txHistory.length - 1) { + if (index === $scope.txHistory.length - 1) { return true; } return $scope.isFirstInGroup(index + 1); @@ -234,15 +234,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; - $scope.backup = function() { - //$state.go('tabs.preferences', {walletId: $scope.walletId}); - //$state.transitionTo('tabs.preferences.backupWarning'); - }; - var prevPos; - function getScrollPosition(){ + + function getScrollPosition() { var pos = $ionicScrollDelegate.getScrollPosition().top; - if(pos === prevPos) { + if (pos === prevPos) { $window.requestAnimationFrame(function() { getScrollPosition(); }); @@ -250,29 +246,29 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun } prevPos = pos; var amountHeight = 180 - pos; - if(amountHeight < 80) { + if (amountHeight < 80) { amountHeight = 80; } var contentMargin = amountHeight; - if(contentMargin > 180) { + if (contentMargin > 180) { contentMargin = 180; } - var amountScale = (amountHeight/180); - if(amountScale < 0.5) { + var amountScale = (amountHeight / 180); + if (amountScale < 0.5) { amountScale = 0.5; } - if(amountScale > 1.1) { + if (amountScale > 1.1) { amountScale = 1.1; } var s = amountScale; - $scope.altAmountOpacity = (amountHeight - 100)/80; + $scope.altAmountOpacity = (amountHeight - 100) / 80; $window.requestAnimationFrame(function() { $scope.amountHeight = amountHeight + 'px'; $scope.contentMargin = contentMargin + 'px'; - $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; + $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s + ')'; $scope.$digest(); getScrollPosition(); }); @@ -281,7 +277,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { - if(scrollWatcherInitialized || !$scope.amountIsCollapsible) { + if (scrollWatcherInitialized || !$scope.amountIsCollapsible) { return; } scrollWatcherInitialized = true; diff --git a/src/js/routes.js b/src/js/routes.js index ee65083d3..a0921a390 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -151,7 +151,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('tabs.wallet', { - url: '/wallet/{walletId}/{fromOnboarding}', + url: '/wallet/:walletId/:fromOnboarding', views: { 'tab-home@tabs': { controller: 'walletDetailsController', @@ -186,6 +186,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.wallet.backupWarning', { + url: '/backupWarning/:from/:walletId', + views: { + 'tab-home@tabs': { + templateUrl: 'views/backupWarning.html' + } + } + }) /* * @@ -601,7 +609,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr /* * - * Back flow from receive + * Init backup flow * */ diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index b61d77d35..299d9679b 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -139,7 +139,7 @@
- + Wallet not backed up From f4bd7ea5708268c3ae059013db5e98695eeac855 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 10:51:00 -0500 Subject: [PATCH 56/80] check to make sure scrollPosition is defined --- src/js/controllers/walletDetails.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index c2737c64b..34e78b751 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -237,7 +237,14 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var prevPos; function getScrollPosition() { - var pos = $ionicScrollDelegate.getScrollPosition().top; + var scrollPosition = $ionicScrollDelegate.getScrollPosition(); + if (!scrollPosition) { + $window.requestAnimationFrame(function() { + getScrollPosition(); + }); + return; + } + var pos = scrollPosition.top; if (pos === prevPos) { $window.requestAnimationFrame(function() { getScrollPosition(); From 7a2ee02899a1a57dd49cf6725425f0f400744a0d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 11:27:14 -0500 Subject: [PATCH 57/80] prevent ugly flashes on iOS --- src/js/controllers/walletDetails.js | 7 ++++++- www/views/walletDetails.html | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 17a725e39..a6553612e 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -234,10 +234,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; var prevPos; + var screenInactive = true; function getScrollPosition() { var scrollPosition = $ionicScrollDelegate.getScrollPosition(); - if (!scrollPosition) { + if (!scrollPosition || screenInactive) { $window.requestAnimationFrame(function() { getScrollPosition(); }); @@ -283,6 +284,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { + $timeout(function() { + screenInactive = false; + }, 200); if (scrollWatcherInitialized || !$scope.amountIsCollapsible) { return; } @@ -324,6 +328,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun // }); $scope.$on("$ionicView.leave", function(event, data) { + screenInactive = true; lodash.each(listeners, function(x) { x(); }); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 7e7e69d92..91cf7b66b 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -89,7 +89,7 @@ on-refresh="onRefresh()"> -
+
- + Wallet not backed up -
+
From 9a34b190b1e8822a85762e9c6e2931310cd1393c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 11:42:34 -0500 Subject: [PATCH 58/80] ensure proposal items in wallet detail view activate on tap --- src/sass/views/walletDetails.scss | 4 ++++ www/views/walletDetails.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index d128d60a9..0a48b5da5 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -224,3 +224,7 @@ z-index: 9999; position: relative; } + +a.item { + cursor: pointer; +} diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 91cf7b66b..fd6a4a576 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -162,7 +162,7 @@ Unsent transactions
-
+
Total Locked Balance: From 8120374357232771e70c26e3426663346347e6cd Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 15 Nov 2016 14:19:00 -0300 Subject: [PATCH 59/80] fix route --- src/js/routes.js | 9 +++++++++ www/views/walletDetails.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/js/routes.js b/src/js/routes.js index 912d57c66..04303b272 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -194,6 +194,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.wallet.backup', { + url: '/backup/:walletId', + views: { + 'tab-home@tabs': { + templateUrl: 'views/backup.html', + controller: 'backupController' + } + } + }) /* * diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index fd6a4a576..36d637ab3 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -139,7 +139,7 @@
- + Wallet not backed up From 9018ccd39ad17fc3e8696e328592652562c0fd02 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 13:21:33 -0500 Subject: [PATCH 60/80] more descriptive label for confirming txs --- www/views/tx-details.html | 3 ++- www/views/walletDetails.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/views/tx-details.html b/www/views/tx-details.html index 0008b66e2..88a065e8c 100644 --- a/www/views/tx-details.html +++ b/www/views/tx-details.html @@ -18,7 +18,8 @@
- Confirming + Sending + Receiving
{{displayAmount}} {{displayUnit}}
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 36d637ab3..f6c96487c 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -235,7 +235,8 @@
- Confirming + Sending + Receiving
From 4235b86f52e8a8af11e2fa183f278e022d0c71d9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 15 Nov 2016 16:14:07 -0300 Subject: [PATCH 61/80] Use needsBackup variable inside the wallet instead check storage --- src/js/controllers/walletDetails.js | 3 --- www/views/walletDetails.html | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a6553612e..c00e5bdd2 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -298,9 +298,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.walletId = data.stateParams.walletId; - storageService.getBackupFlag($scope.walletId, function(err, flag) { - $scope.isBackedUp = flag ? true : false; - }); $scope.wallet = profileService.getWallet($scope.walletId); $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index f6c96487c..e56b4b30d 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -139,7 +139,7 @@
- + Wallet not backed up From f178eb9b503a6673d39de075649aadbf325d1b2e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 14:26:19 -0500 Subject: [PATCH 62/80] ensure pull to refresh icon is visible on android and remove comments --- src/js/controllers/walletDetails.js | 4 ---- src/sass/views/walletDetails.scss | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a6553612e..4abb2e51b 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -323,10 +323,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun ]; }); - // $scope.$on("$ionicView.beforeLeave", function(event, data) { - // $interval.cancel(scrollInterval); - // }); - $scope.$on("$ionicView.leave", function(event, data) { screenInactive = true; lodash.each(listeners, function(x) { diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 0a48b5da5..87fcefcaf 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -92,6 +92,11 @@ #walletDetails { background: #F8F8F9; + .scroll-refresher { + z-index: 1; + margin-top: 3.5rem; + } + .ionic-refresher-content { color: white !important; } From 51c4ebfc647d3aa380496ad34efca8a60b16ebc5 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 14:43:38 -0500 Subject: [PATCH 63/80] ensure infinite loading spinner is visible --- src/sass/views/walletDetails.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 87fcefcaf..f6220c524 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -99,11 +99,11 @@ .ionic-refresher-content { color: white !important; - } - .spinner svg { - stroke: white; - fill: white; + .spinner svg { + stroke: white; + fill: white; + } } .bp-content { From 2e3d9359f913b17412167585b105928729f860f1 Mon Sep 17 00:00:00 2001 From: Michael Trollan Date: Tue, 15 Nov 2016 14:48:03 -0500 Subject: [PATCH 64/80] Fix typos. --- backupRecovery.md | 2 +- www/views/includes/confirmBackupPopup.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backupRecovery.md b/backupRecovery.md index 3865b66f2..db8f19989 100644 --- a/backupRecovery.md +++ b/backupRecovery.md @@ -19,7 +19,7 @@ Copay is a Multisig HD Wallet. Copay app holds the extended private keys for the ### Wallet Recovery Scope * Basic Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive payments. - * Full Recovery: All the features of Partial Recovery + wallet name, copayer names are recovered, past payment proposal metadata (who signed, and notes) are recoved. + * Full Recovery: All the features of Partial Recovery + wallet name, copayer names are recovered, past payment proposal metadata (who signed, and notes) are recovered. ## Wallet Restore Scenarios diff --git a/www/views/includes/confirmBackupPopup.html b/www/views/includes/confirmBackupPopup.html index c6a416600..d1a1885b4 100644 --- a/www/views/includes/confirmBackupPopup.html +++ b/www/views/includes/confirmBackupPopup.html @@ -4,7 +4,7 @@
Your bitcoin wallet is backed up!
-
Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recoved without it.
+
Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it.
From 511730ecd33f60c1cea64d58c2f23b29d69e7417 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 15 Nov 2016 15:09:08 -0500 Subject: [PATCH 65/80] feat(feedback): improve design of feedback flow --- src/js/controllers/feedback/rateCard.js | 4 +- src/js/controllers/feedback/send.js | 14 +++---- src/sass/views/feedback/complete.scss | 1 + src/sass/views/feedback/rateCard.scss | 6 ++- src/sass/views/feedback/send.scss | 10 ++++- www/img/ico-star.svg | 2 +- www/views/feedback/rateCard.html | 22 +++++----- www/views/feedback/send.html | 56 +++++++++---------------- www/views/tab-home.html | 4 +- 9 files changed, 56 insertions(+), 63 deletions(-) diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js index 4c858b3ed..6def46bdd 100644 --- a/src/js/controllers/feedback/rateCard.js +++ b/src/js/controllers/feedback/rateCard.js @@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('rateCardController', function $scope.score = score; switch ($scope.score) { case 1: - $scope.button_title = gettextCatalog.getString("I think this app is terrible"); + $scope.button_title = gettextCatalog.getString("I think this app is terrible."); break; case 2: $scope.button_title = gettextCatalog.getString("I don't like it"); @@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('rateCardController', function $scope.button_title = gettextCatalog.getString("I like the app"); break; case 5: - $scope.button_title = gettextCatalog.getString("This app is fantastic"); + $scope.button_title = gettextCatalog.getString("This app is fantastic!"); break; } $timeout(function() { diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js index fc8fa410c..0fb06753b 100644 --- a/src/js/controllers/feedback/send.js +++ b/src/js/controllers/feedback/send.js @@ -5,23 +5,23 @@ angular.module('copayApp.controllers').controller('sendController', function($sc switch ($scope.score) { case 1: $scope.reaction = gettextCatalog.getString("Ouch!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); break; case 2: $scope.reaction = gettextCatalog.getString("Oh no!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); break; case 3: - $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); + $scope.reaction = gettextCatalog.getString("Hmm..."); + $scope.comment = gettextCatalog.getString("We'd love to do better.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); break; case 4: $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you."); + $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?"); break; case 5: - $scope.reaction = gettextCatalog.getString("Feedback!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); + $scope.reaction = gettextCatalog.getString("Thank you!"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); break; } diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index f5e0052b9..05cfde3fa 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -19,6 +19,7 @@ } .subtitle { padding: 10px 30px 20px 40px; + text-align: center; } .icon-svg > img { height: 16rem; diff --git a/src/sass/views/feedback/rateCard.scss b/src/sass/views/feedback/rateCard.scss index d141ca633..e2c96c447 100644 --- a/src/sass/views/feedback/rateCard.scss +++ b/src/sass/views/feedback/rateCard.scss @@ -9,6 +9,10 @@ margin: 0; } .feedback-flow-button { - padding: 20px; + margin-bottom: 20px; + } + .icon-svg > img { + height: 1.8rem; + margin-bottom: 5px; } } diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 2a0f9a210..3179642d3 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -9,11 +9,15 @@ text-decoration: none; } .title { - padding: 20px; + padding-left: 10px; font-size: 20px; font-weight: bold; color: $dark-gray; } + .rating { + text-align: right; + padding-right: 15px; + } .comment { padding: 20px; font-size: 1rem; @@ -27,4 +31,8 @@ padding: 20px; width: 100%; } + .send-feedback-star { + height: 1rem; + margin-left: 5px; + } } diff --git a/www/img/ico-star.svg b/www/img/ico-star.svg index bab3db3e5..864f2b2ba 100644 --- a/www/img/ico-star.svg +++ b/www/img/ico-star.svg @@ -2,7 +2,7 @@ +
How do you like BitPay Wallet?
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+ diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html index c0c323aa0..4064eede8 100644 --- a/www/views/feedback/send.html +++ b/www/views/feedback/send.html @@ -1,51 +1,33 @@ -
- {{reaction}} -
-
- - - - +
+
+ {{reaction}} +
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - +
+ + + + + + + + + +
{{comment}}
- -
-
- +
+ diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 736b57d42..075da616d 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -13,9 +13,7 @@
An update to this app is available
-
- -
+
From e46b5b25c35bad5c27476b369942f42f394caab8 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 08:45:26 -0500 Subject: [PATCH 66/80] iphone5 and desktop fixes for receive tab --- src/sass/views/tab-receive.scss | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 99bc97ea5..6e11911ad 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -99,7 +99,7 @@ padding-top: 5px; padding-bottom: 5px; display: inline-block; - font-size: .7rem; + font-size: .8rem; } } .qr { @@ -236,6 +236,7 @@ .wallets{ position: relative; height: calc(100vh - 83vh); + z-index: 5; .slides { .swiper-container{ position: absolute; @@ -244,6 +245,9 @@ -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); max-width: 450px; + .swiper-wrapper{ + @media(max-height: 600px){padding-top:.2rem} + } .swiper-slide{ text-align: center; .card{ @@ -302,12 +306,15 @@ display: flex; flex-direction: column; overflow: visible; + @media(max-height: 600px){ + padding-top:.55rem; + } #sidebar-wallet{display: block;} .list{height: 100%;overflow: visible;} #wallet-list{ position: absolute; - width: 100%; - overflow-y: scroll; + width: 110%; + overflow-y: auto; height: 100%; left: -6%; } @@ -331,7 +338,7 @@ } .card { max-width: 350px; - box-shadow:$subtle-box-shadow; + box-shadow: 0 1px 36px rgba(0, 0, 0, 0.07); padding:0; border-radius: 6px; padding:2px; From e94484b1f3835c76c232eebd3283a5dd7efac082 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 09:48:39 -0500 Subject: [PATCH 67/80] final fixes for in between viewport sizes --- src/sass/views/tab-receive.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 6e11911ad..ffdb13be9 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -72,7 +72,7 @@ font-size: .8rem; // left:10%; position: absolute; - transition: all .4s ease; + transition: all .15s ease; width:100%; height: 100%; z-index: 0; @@ -255,8 +255,10 @@ display: inline-block; width:80%; } - &-next{left:-25%;} - &-prev{left:25%;} + @media(max-width: 500px){ + &-next{left:-25%;} + &-prev{left:25%;} + } } @media (max-height: 600px){ &{ From 6719983ef7a2fd1b70683f3715b71b28a4a7ff41 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 10:47:31 -0500 Subject: [PATCH 68/80] update to handle difference between iPhone 5 and browser window when viewed at same size --- src/sass/views/tab-receive.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index ffdb13be9..ce142b3e5 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -20,6 +20,9 @@ position: relative; flex-flow: column; @media(max-height: 600px){ + height: calc(100vh - 32vh); + } + @media(max-height: 600px) and (-webkit-device-pixel-ratio: 2){ height: calc(100vh - 36vh); } &-info{ From 33fcfddf1aa16f37dcaade5fb460fee36a3cce90 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 15:15:40 -0500 Subject: [PATCH 69/80] tweaks for mobile and desktop --- src/sass/views/includes/wallets.scss | 12 +++--- src/sass/views/tab-receive.scss | 61 +++++++++++++++++++++------- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index 7bb22c807..5c73d70c7 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -18,16 +18,18 @@ } } .item{ - padding: calc(100vh - 99vh) calc(100vw - 93vw) calc(100vh - 97vh) calc(100vw - 95vw); - i{left:auto;} + padding: 3vh 3vw 3vh 3vw; span{ clear:both; width: 100%; display: inline-block; &.wallet-name{ - margin-top:10px; - margin-bottom:5px; - font-size:13px; + font-size:16px; + width: 70%; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + font-weight: 600; } &.wallet-number{ visibility: hidden; diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index ce142b3e5..3e3320211 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -13,17 +13,17 @@ .scroll{height:100%;} #address { background: #fff; - height: calc(100vh - 34vh); + height: 66vh; display: flex; align-items: center; justify-content: center; position: relative; flex-flow: column; @media(max-height: 600px){ - height: calc(100vh - 32vh); + height: 68vh; } @media(max-height: 600px) and (-webkit-device-pixel-ratio: 2){ - height: calc(100vh - 36vh); + height: 64vh; } &-info{ height: 100%; @@ -67,6 +67,7 @@ .item { border: none; font-size: .8rem; + z-index: 0; i { font-size: 1.3rem; } @@ -103,16 +104,18 @@ padding-bottom: 5px; display: inline-block; font-size: .8rem; + color:$mid-gray; } } .qr { - padding: calc(100vh - 85vh) 0 calc(100vh - 96vh); + padding: 15vh 0 4vh; align-self: center; margin-top: auto; height: 220px; position: relative; justify-content: center; flex: 1; + z-index: 1; div{ transition: all .4s ease; &.current, &.prev, &.next{ @@ -134,7 +137,7 @@ } } @media(max-height: 700px){ - padding: calc(100vh - 90vh) 0 calc(100vh - 96vh); + padding: 10vh 0 4vh; } div{ display: flex; @@ -238,7 +241,7 @@ } .wallets{ position: relative; - height: calc(100vh - 83vh); + height: calc(27vh - 62px); z-index: 5; .slides { .swiper-container{ @@ -249,7 +252,11 @@ transform: translate(-50%, -50%); max-width: 450px; .swiper-wrapper{ + height: auto; + top: 10%; + position:relative; @media(max-height: 600px){padding-top:.2rem} + @media(min-height: 900px){top:30%;} } .swiper-slide{ text-align: center; @@ -257,6 +264,9 @@ margin-top:2vh; display: inline-block; width:80%; + @media(min-height: 1000px) and (max-width: 699px){ + padding: 2vh 3vw 2vh 3vw; + } } @media(max-width: 500px){ &-next{left:-25%;} @@ -276,8 +286,11 @@ .wallets{display: none;} #address{ float:left; - height:90vh; - width:65%; + height:100%; + width:calc(100% - 410px); + @media(max-width: 1000px){ + width:65%; + } &-info{ height: 100%; } @@ -301,7 +314,13 @@ .backup, #bit-address{left:0;} #bit-address{ height: 10%; - padding: calc(100vh - 99vh); + padding: 1vh; + .bit-address{ + .item{ + top: 40%; + transform: translateY(-40%); + } + } } } #wallets{ @@ -311,9 +330,13 @@ display: flex; flex-direction: column; overflow: visible; + max-width: 410px; @media(max-height: 600px){ padding-top:.55rem; } + @media(max-width: 1000px){ + max-width: none; + } #sidebar-wallet{display: block;} .list{height: 100%;overflow: visible;} #wallet-list{ @@ -324,8 +347,12 @@ left: -6%; } .wallet{ - position: relative; &.current{ + position: relative; + .card{ + opacity: 1; + transform: scale(1); + } &:before { right: 93%; top: 50%; @@ -350,17 +377,23 @@ width: 80%; position: relative; margin: 1.5rem auto 0; + position: relative; + opacity: .5; + transform:scale(.85); + transition:transform .2s ease; .item{ padding: 6% 10% 6% 8%; - i{left:auto;} span{ clear:both; width: 100%; display: inline-block; &.wallet-name{ - margin-top:10px; - margin-bottom:5px; - font-size:13px; + font-size:16px; + width: 70%; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + font-weight: 600; } &.wallet-number{ visibility: hidden; From 116bc7fde65d3ce7b888ec4ae1812e2e2dc090a4 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 15:20:59 -0500 Subject: [PATCH 70/80] fix declaration on card to item --- src/sass/views/tab-receive.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 3e3320211..82a15e3c8 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -265,7 +265,9 @@ display: inline-block; width:80%; @media(min-height: 1000px) and (max-width: 699px){ - padding: 2vh 3vw 2vh 3vw; + .item{ + padding: 2vh 3vw 2vh 3vw; + } } } @media(max-width: 500px){ From 58c9a054d9d22309dca5e5bf2670ff682603151e Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 15 Nov 2016 15:37:40 -0500 Subject: [PATCH 71/80] updating font size by viewport for next address and share, and current bit address --- src/sass/views/tab-receive.scss | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 82a15e3c8..6743b1363 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -72,6 +72,17 @@ font-size: 1.3rem; } } + #qr-options{ + .item{ + font-size:.7rem; + @media(min-width:350px){ + font-size:.9rem; + } + @media(min-width:450px){ + font-size:1rem; + } + } + } .bit-address { font-size: .8rem; // left:10%; @@ -103,8 +114,14 @@ padding-top: 5px; padding-bottom: 5px; display: inline-block; - font-size: .8rem; - color:$mid-gray; + font-size: .7rem; + @media(min-width:350px){ + font-size:.9rem; + } + @media(min-width:450px){ + font-size:1rem; + } + color:$light-gray; } } .qr { @@ -296,6 +313,9 @@ &-info{ height: 100%; } + #qr-options{ + .item{font-size:1rem;} + } .qr{ height: 70%; div{ @@ -321,6 +341,7 @@ .item{ top: 40%; transform: translateY(-40%); + font-size:1rem; } } } From 8e7e950eb29d0ac438129a96c15a6433dbf20e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 15 Nov 2016 17:38:48 -0300 Subject: [PATCH 72/80] delete popup rate card from settings --- src/js/controllers/feedback/rateCard.js | 27 ++++------ src/js/controllers/feedback/send.js | 67 ++++++++++++++++--------- src/js/controllers/modals/search.js | 2 +- src/js/controllers/tab-settings.js | 11 ---- src/js/routes.js | 33 +++++++++--- src/sass/views/feedback/rateCard.scss | 6 +-- src/sass/views/feedback/send.scss | 3 +- www/views/feedback/rateCard.html | 2 +- www/views/feedback/send.html | 8 ++- www/views/tab-settings.html | 2 +- 10 files changed, 92 insertions(+), 69 deletions(-) diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js index 6def46bdd..6bc661d4d 100644 --- a/src/js/controllers/feedback/rateCard.js +++ b/src/js/controllers/feedback/rateCard.js @@ -6,10 +6,6 @@ angular.module('copayApp.controllers').controller('rateCardController', function $scope.score = 0; $scope.goFeedbackFlow = function() { - if ($scope.isModal) { - $scope.rateModal.hide(); - $scope.rateModal.remove(); - } if ($scope.isCordova && $scope.score == 5) { $state.go('feedback.rateApp', { score: $scope.score @@ -46,21 +42,16 @@ angular.module('copayApp.controllers').controller('rateCardController', function }; $scope.hideCard = function() { - if ($scope.isModal) { - $scope.rateModal.hide(); - $scope.rateModal.remove(); - } else { - storageService.getFeedbackInfo(function(error, info) { - var feedbackInfo = JSON.parse(info); - feedbackInfo.sent = true; - storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() { - $scope.showRateCard.value = false; - }); + storageService.getFeedbackInfo(function(error, info) { + var feedbackInfo = JSON.parse(info); + feedbackInfo.sent = true; + storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() { + $scope.showRateCard.value = false; + $timeout(function() { + $scope.$apply(); + }, 100); }); - } - $timeout(function() { - $scope.$apply(); - }, 100); + }); } }); diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js index 0fb06753b..a849d97e9 100644 --- a/src/js/controllers/feedback/send.js +++ b/src/js/controllers/feedback/send.js @@ -1,29 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $stateParams, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) { - $scope.score = parseInt($stateParams.score); - switch ($scope.score) { - case 1: - $scope.reaction = gettextCatalog.getString("Ouch!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); - break; - case 2: - $scope.reaction = gettextCatalog.getString("Oh no!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); - break; - case 3: - $scope.reaction = gettextCatalog.getString("Hmm..."); - $scope.comment = gettextCatalog.getString("We'd love to do better.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); - break; - case 4: - $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?"); - break; - case 5: - $scope.reaction = gettextCatalog.getString("Thank you!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); - break; - } +angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) { $scope.sendFeedback = function(feedback, skip) { @@ -32,7 +9,7 @@ angular.module('copayApp.controllers').controller('sendController', function($sc var dataSrc = { "Email": lodash.values(config.emailFor)[0] || ' ', "Feedback": skip ? ' ' : feedback, - "Score": $stateParams.score + "Score": $stateParams.score || ' ' }; ongoingProcess.set('sendingFeedback', true); @@ -42,6 +19,14 @@ angular.module('copayApp.controllers').controller('sendController', function($sc popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not send feedback')); return; } + if (!$stateParams.score) { + popupService.showAlert(gettextCatalog.getString('Thank you!'), gettextCatalog.getString('A member of the team will review your feedback as soon as possible.')); + $scope.feedback.value = ''; + $timeout(function() { + $scope.$apply(); + }); + return; + } $state.go('feedback.complete', { score: $stateParams.score, skipped: skip @@ -49,4 +34,36 @@ angular.module('copayApp.controllers').controller('sendController', function($sc }); }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.score = parseInt($stateParams.score); + $scope.feedback = {}; + + switch ($scope.score) { + case 1: + $scope.reaction = gettextCatalog.getString("Ouch!"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); + break; + case 2: + $scope.reaction = gettextCatalog.getString("Oh no!"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); + break; + case 3: + $scope.reaction = gettextCatalog.getString("Hmm..."); + $scope.comment = gettextCatalog.getString("We'd love to do better.") + ' ' + gettextCatalog.getString("How could we improve your experience?"); + break; + case 4: + $scope.reaction = gettextCatalog.getString("Thanks!"); + $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?"); + break; + case 5: + $scope.reaction = gettextCatalog.getString("Thank you!"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); + break; + default: + $scope.reaction = gettextCatalog.getString("Feedback!"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. How could we improve your experience?"); + break; + } + }); + }); diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js index ed1861074..963e89e18 100644 --- a/src/js/controllers/modals/search.js +++ b/src/js/controllers/modals/search.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('searchController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) { +angular.module('copayApp.controllers').controller('searchController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 13d482102..4387685c3 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -32,15 +32,4 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct updateConfig(); }); - $scope.openRateModal = function() { - $scope.isModal = true; - $ionicModal.fromTemplateUrl('views/feedback/rateCard.html', { - scope: $scope, - backdropClickToClose: false, - hardwareBackButtonClose: false - }).then(function(modal) { - $scope.rateModal = modal; - $scope.rateModal.show(); - }); - } }); diff --git a/src/js/routes.js b/src/js/routes.js index a80c3e791..8b6a3d5ac 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -722,7 +722,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr /* * - * Feedback + * Feedback from home * */ @@ -758,11 +758,32 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - /* - * - * Buy or Sell Bitcoin - * - */ + + /* + * + * Feedback from settings + * + */ + .state('tabs.settings.feedback', { + url: '/feedback', + abstract: true, + template: '' + }) + .state('tabs.settings.feedback.send', { + url: '/send', + views: { + 'tab-settings@tabs': { + controller: 'sendController', + templateUrl: 'views/feedback/send.html' + } + } + }) + + /* + * + * Buy or Sell Bitcoin + * + */ .state('tabs.buyandsell', { url: '/buyandsell', diff --git a/src/sass/views/feedback/rateCard.scss b/src/sass/views/feedback/rateCard.scss index e2c96c447..9d57643d6 100644 --- a/src/sass/views/feedback/rateCard.scss +++ b/src/sass/views/feedback/rateCard.scss @@ -1,10 +1,10 @@ #rate-card { + .item-heading { + font-weight: 700; + } .row { border: none; } - .row.row-margin{ - margin: 20px 0px 20px 0px; - } .item-icon-right { margin: 0; } diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 3179642d3..284975501 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -1,10 +1,11 @@ #send-feedback { background-color: #ffffff; .row { + padding: 20px; border: none; } .skip { - margin: 20px 20px 10px; + margin: 8px 20px 10px; color: #667; text-decoration: none; } diff --git a/www/views/feedback/rateCard.html b/www/views/feedback/rateCard.html index 1ac2b0935..4772f5587 100644 --- a/www/views/feedback/rateCard.html +++ b/www/views/feedback/rateCard.html @@ -1,4 +1,4 @@ -
+
How do you like BitPay Wallet? diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html index 4064eede8..fba13c725 100644 --- a/www/views/feedback/send.html +++ b/www/views/feedback/send.html @@ -1,4 +1,8 @@ + + + +
@@ -24,9 +28,9 @@ {{comment}}
- +
- diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 735a125e8..585a780b0 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -29,7 +29,7 @@ - + From 6d9706fa19433cf6270f96ef8fe85cec6e03815f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 15 Nov 2016 18:28:14 -0300 Subject: [PATCH 73/80] fix stores url --- src/js/controllers/feedback/rateApp.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 764b79faa..dcbaa7397 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -36,10 +36,11 @@ angular.module('copayApp.controllers').controller('rateAppController', function( }; $scope.goAppStore = function() { + var defaults = configService.getDefaults(); var url; - if (isAndroid) url = config.rateApp.android; - if (isIOS) url = config.rateApp.ios; - // if (isWP) url = config.rateApp.ios; TODO + if (isAndroid) url = defaults.rateApp.android; + if (isIOS) url = defaults.rateApp.ios; + // if (isWP) url = defaults.rateApp.ios; TODO var title = gettextCatalog.getString('Rate the app'); var message = gettextCatalog.getString('You must go to the official website of the app to rate it'); var okText = gettextCatalog.getString('Go'); From dfcd60e1ef5bc1f889850deca0cc9997a603c526 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 15 Nov 2016 16:35:30 -0500 Subject: [PATCH 74/80] fix(feedback): improve design on iOS --- src/js/controllers/feedback/complete.js | 10 ++++++++++ src/js/controllers/feedback/send.js | 4 ++-- src/sass/views/feedback/complete.scss | 1 + src/sass/views/feedback/rateApp.scss | 3 ++- src/sass/views/feedback/send.scss | 14 +++++++------- www/views/feedback/complete.html | 2 +- www/views/feedback/rateApp.html | 4 ++-- www/views/feedback/rateCard.html | 2 +- www/views/feedback/send.html | 16 +++++++++------- 9 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index c337e14f9..ad2ee0e40 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -31,6 +31,10 @@ angular.module('copayApp.controllers').controller('completeController', function }; $scope.$on("$ionicView.beforeEnter", function(event, data) { + if(window.StatusBar){ + StatusBar.show(); + } + storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = JSON.parse(info); feedbackInfo.sent = true; @@ -78,4 +82,10 @@ angular.module('copayApp.controllers').controller('completeController', function } }, 100); }); + + $scope.$on("$ionicView.afterLeave", function(event, data) { + if(window.StatusBar){ + StatusBar.show(); + } + }); }); diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js index a849d97e9..cf87afa90 100644 --- a/src/js/controllers/feedback/send.js +++ b/src/js/controllers/feedback/send.js @@ -57,11 +57,11 @@ angular.module('copayApp.controllers').controller('sendController', function($sc break; case 5: $scope.reaction = gettextCatalog.getString("Thank you!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); break; default: $scope.reaction = gettextCatalog.getString("Feedback!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. How could we improve your experience?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay. How could we improve your experience?"); break; } }); diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index 05cfde3fa..9416dfd50 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -20,6 +20,7 @@ .subtitle { padding: 10px 30px 20px 40px; text-align: center; + color: $mid-gray; } .icon-svg > img { height: 16rem; diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss index 9f44f5920..7b4e399ee 100644 --- a/src/sass/views/feedback/rateApp.scss +++ b/src/sass/views/feedback/rateApp.scss @@ -1,7 +1,7 @@ #rate-app { background-color: #ffffff; .skip { - margin: 10px; + margin-top: 15px; color: #667; } .icon-svg > img { @@ -18,6 +18,7 @@ } .subtitle { padding: 10px 30px 20px 40px; + color: #667; } .buttons { bottom: 0; diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 284975501..32ef17a1a 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -1,13 +1,13 @@ #send-feedback { background-color: #ffffff; .row { - padding: 20px; border: none; } .skip { - margin: 8px 20px 10px; - color: #667; - text-decoration: none; + color: rgba(255, 255, 255, 0.3); + } + .feedback-heading { + padding-top: 20px } .title { padding-left: 10px; @@ -20,17 +20,17 @@ padding-right: 15px; } .comment { - padding: 20px; + padding: 0 20px 20px; font-size: 1rem; line-height: 1.5em; font-weight: 300; color: $dark-gray; } - textarea { - padding: 20px; + .user-feedback { border-top: 1px solid $subtle-gray; padding: 20px; width: 100%; + height: 6rem; } .send-feedback-star { height: 1rem; diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html index 07f6730a8..081602781 100644 --- a/www/views/feedback/complete.html +++ b/www/views/feedback/complete.html @@ -5,7 +5,7 @@
-
Invite friends to BitPay Wallet!
+
Invite friends to BitPay!
diff --git a/www/views/feedback/rateApp.html b/www/views/feedback/rateApp.html index 476646919..2d289c19a 100644 --- a/www/views/feedback/rateApp.html +++ b/www/views/feedback/rateApp.html @@ -10,10 +10,10 @@
- 5-star ratings help us get BitPay Wallet into more hands, and more users means more resoucers can be committed to the app! + 5-star ratings help us get BitPay into more hands, and more users means more resoucers can be committed to the app!
- Would you be willing to rate BitPay Wallet in the app store? + Would you be willing to rate BitPay in the app store?
+ - -
+