From d3c951a28c33ab78ee7e4eaf1baed592d719ca30 Mon Sep 17 00:00:00 2001 From: Andy Date: Mon, 29 Aug 2016 10:11:08 +0100 Subject: [PATCH 001/354] 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 002/354] 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 003/354] 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 004/354] 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 005/354] 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 006/354] 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 007/354] 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 1a12ef181a5ae592a3a71b7a9ba382d0e04d0cf0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Nov 2016 13:39:03 -0300 Subject: [PATCH 008/354] Fix error if backView does not exist --- src/js/controllers/copayers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js index d5ae4c41e..cc4a97c69 100644 --- a/src/js/controllers/copayers.js +++ b/src/js/controllers/copayers.js @@ -79,8 +79,8 @@ angular.module('copayApp.controllers').controller('copayersController', }; $scope.goHome = function() { - $ionicHistory.removeBackView(); $state.go('tabs.home'); + $ionicHistory.clearHistory(); }; }); From 691600e1161a59dfc034d6a41d7d0dad5c6c2f25 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Nov 2016 13:40:45 -0300 Subject: [PATCH 009/354] Updates info when a copayer accept/reject --- src/js/controllers/modals/txpDetails.js | 172 +++++++++++++----------- 1 file changed, 90 insertions(+), 82 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index d67c2f7a4..7d8918e18 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -1,13 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, walletService, popupService, $state, $ionicHistory) { - var self = $scope.self; - var tx = $scope.tx; - var copayers = $scope.copayers; +angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, bwcError, gettextCatalog, lodash, walletService, popupService, $ionicHistory) { var isGlidera = $scope.isGlidera; var GLIDERA_LOCK_TIME = 6 * 60 * 60; var now = Math.floor(Date.now() / 1000); var countDown; + var listeners = []; $scope.init = function() { $scope.loading = null; @@ -18,8 +16,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.color = $scope.wallet.color; $scope.data = {}; $scope.hasClick = platformInfo.hasClick; - $scope.displayAmount = getDisplayAmount(tx.amountStr); - $scope.displayUnit = getDisplayUnit(tx.amountStr); + $scope.displayAmount = getDisplayAmount($scope.tx.amountStr); + $scope.displayUnit = getDisplayUnit($scope.tx.amountStr); initActionList(); checkPaypro(); } @@ -46,12 +44,12 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.actionList.push({ type: 'created', - time: tx.createdOn, + time: $scope.tx.createdOn, description: actionDescriptions['created'], - by: tx.creatorName + by: $scope.tx.creatorName }); - lodash.each(tx.actions, function(action) { + lodash.each($scope.tx.actions, function(action) { $scope.actionList.push({ type: action.type, time: action.createdOn, @@ -61,38 +59,70 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }); }; + function checkPaypro() { + if ($scope.tx.payProUrl && !platformInfo.isChromeApp) { + $scope.wallet.fetchPayPro({ + payProUrl: $scope.tx.payProUrl, + }, function(err, paypro) { + if (err) return; + $scope.tx.paypro = paypro; + paymentTimeControl($scope.tx.paypro.expires); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); + }); + } + }; + + function paymentTimeControl(expirationTime) { + $scope.paymentExpired = false; + setExpirationTime(); + + countDown = $interval(function() { + setExpirationTime(); + }, 1000); + + function setExpirationTime() { + var now = Math.floor(Date.now() / 1000); + if (now > expirationTime) { + $scope.paymentExpired = true; + if (countDown) $interval.cancel(countDown); + return; + } + var totalSecs = expirationTime - now; + var m = Math.floor(totalSecs / 60); + var s = totalSecs % 60; + $scope.expires = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); + }; + }; + $scope.$on('accepted', function(event) { $scope.sign(); }); // ToDo: use tx.customData instead of tx.message - if (tx.message === 'Glidera transaction' && isGlidera) { - tx.isGlidera = true; - if (tx.canBeRemoved) { - tx.canBeRemoved = (Date.now() / 1000 - (tx.ts || tx.createdOn)) > GLIDERA_LOCK_TIME; + if ($scope.tx.message === 'Glidera transaction' && isGlidera) { + $scope.tx.isGlidera = true; + if ($scope.tx.canBeRemoved) { + $scope.tx.canBeRemoved = (Date.now() / 1000 - ($scope.tx.ts || $scope.tx.createdOn)) > GLIDERA_LOCK_TIME; } } - var setSendError = function(msg) { + var setError = function (err, prefix) { $scope.sendStatus = ''; - var error = msg || gettextCatalog.getString('Could not send payment'); - popupService.showAlert(gettextCatalog.getString('Error'), error); - } + $scope.loading = false; + popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err, prefix)); + }; $scope.sign = function(onSendStatusChange) { $scope.loading = true; walletService.publishAndSign($scope.wallet, $scope.tx, function(err, txp) { $scope.$emit('UpdateTx'); - if (err) return setSendError(err); + if (err) return setError(err, gettextCatalog.getString('Could not send payment')); success(); }, onSendStatusChange); }; - function setError(err, prefix) { - $scope.loading = false; - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err, prefix)); - }; - $scope.reject = function(txp) { var title = gettextCatalog.getString('Warning!'); var msg = gettextCatalog.getString('Are you sure you want to reject this transaction?'); @@ -150,69 +180,46 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi return $scope.wallet.credentials.networkName.substring(0, 4); }; - function checkPaypro() { - if (tx.payProUrl && !platformInfo.isChromeApp) { - $scope.wallet.fetchPayPro({ - payProUrl: tx.payProUrl, - }, function(err, paypro) { - if (err) return; - tx.paypro = paypro; - paymentTimeControl(tx.paypro.expires); - $timeout(function() { - $ionicScrollDelegate.resize(); - }, 10); - }); - } - }; - - function paymentTimeControl(expirationTime) { - $scope.paymentExpired = false; - setExpirationTime(); - - countDown = $interval(function() { - setExpirationTime(); - }, 1000); - - function setExpirationTime() { - var now = Math.floor(Date.now() / 1000); - if (now > expirationTime) { - $scope.paymentExpired = true; - if (countDown) $interval.cancel(countDown); + var updateTxInfo = function(eventName) { + $scope.wallet.getTx($scope.tx.id, function(err, tx) { + if (err) { + if (err.message && err.message == 'TX_NOT_FOUND' && + (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { + $scope.tx.removed = true; + $scope.tx.canBeRemoved = false; + $scope.tx.pendingForUs = false; + $scope.$apply(); + } return; } - var totalSecs = expirationTime - now; - var m = Math.floor(totalSecs / 60); - var s = totalSecs % 60; - $scope.expires = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2); - }; + + var action = lodash.find(tx.actions, { + copayerId: $scope.wallet.credentials.copayerId + }); + + $scope.tx = txFormatService.processTx(tx); + + if (!action && tx.status == 'pending') + $scope.tx.pendingForUs = true; + + $scope.updateCopayerList(); + initActionList(); + $scope.$apply(); + }); }; - lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx', 'UpdateTx'], function(eventName) { - $rootScope.$on(eventName, function() { - $scope.wallet.getTx($scope.tx.id, function(err, tx) { - if (err) { - if (err.message && err.message == 'TX_NOT_FOUND' && - (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { - $scope.tx.removed = true; - $scope.tx.canBeRemoved = false; - $scope.tx.pendingForUs = false; - $scope.$apply(); - } - return; - } - - var action = lodash.find(tx.actions, { - copayerId: $scope.wallet.credentials.copayerId - }); - - $scope.tx = txFormatService.processTx(tx); - - if (!action && tx.status == 'pending') - $scope.tx.pendingForUs = true; - - $scope.updateCopayerList(); - $scope.$apply(); - }); + var bwsEvent = $rootScope.$on('bwsEvent', function(e, walletId, type, n) { + lodash.each([ + 'TxProposalRejectedBy', + 'TxProposalAcceptedBy', + 'transactionProposalRemoved', + 'TxProposalRemoved', + 'NewOutgoingTx', + 'UpdateTx' + ], function(eventName) { + if (walletId == $scope.wallet.id && type == eventName) { + updateTxInfo(eventName); + } }); }); @@ -252,6 +259,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }; $scope.close = function() { + bwsEvent(); $scope.loading = null; $scope.txpDetailsModal.hide(); }; From cc88ddf295a908ca3119704ac5688acddc744d3e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Nov 2016 13:49:37 -0300 Subject: [PATCH 010/354] Adds confirmation before delete transaction. Fix delete transaction --- src/js/controllers/modals/txpDetails.js | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 7d8918e18..975132f42 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -141,22 +141,24 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }; $scope.remove = function() { - $scope.loading = true; + var title = gettextCatalog.getString('Warning!'); + var msg = gettextCatalog.getString('Are you sure you want to remove this transaction?'); + popupService.showConfirm(title, msg, null, null, function(res) { + if (res) { + ongoingProcess.set('removeTx', true); + walletService.removeTx($scope.wallet, $scope.tx, function(err) { + ongoingProcess.set('removeTx', false); - $timeout(function() { - ongoingProcess.set('removeTx', true); - walletService.removeTx($scope.wallet, $scope.tx, function(err) { - ongoingProcess.set('removeTx', false); + // Hacky: request tries to parse an empty response + if (err && !(err.message && err.message.match(/Unexpected/))) { + $scope.$emit('UpdateTx'); + return setError(err, gettextCatalog.getString('Could not delete payment proposal')); + } - // Hacky: request tries to parse an empty response - if (err && !(err.message && err.message.match(/Unexpected/))) { - $scope.$emit('UpdateTx'); - return setError(err, gettextCatalog.getString('Could not delete payment proposal')); - } - - $scope.close(); - }); - }, 10); + $scope.close(); + }); + } + }); }; $scope.broadcast = function(txp) { @@ -183,7 +185,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi var updateTxInfo = function(eventName) { $scope.wallet.getTx($scope.tx.id, function(err, tx) { if (err) { - if (err.message && err.message == 'TX_NOT_FOUND' && + if (err.message && err.message == 'Transaction proposal not found' && (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { $scope.tx.removed = true; $scope.tx.canBeRemoved = false; From ff4041b5e5801c11a8e3b6777b7f8a43afb20d1a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 3 Nov 2016 16:02:47 -0300 Subject: [PATCH 011/354] Removes unused variable --- src/js/controllers/modals/txpDetails.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 975132f42..eb88b5d02 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -5,7 +5,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi var GLIDERA_LOCK_TIME = 6 * 60 * 60; var now = Math.floor(Date.now() / 1000); var countDown; - var listeners = []; $scope.init = function() { $scope.loading = null; From 82e3a4af7c7adc427a6c76a4c6eaef066d60212e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Thu, 3 Nov 2016 15:11:06 -0400 Subject: [PATCH 012/354] 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 013/354] 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 014/354] 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 015/354] 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 016/354] 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 017/354] 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 018/354] 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 019/354] 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 020/354] 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 021/354] 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 022/354] 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 91f8dccc1b0a1e5a3ce7304c422b912961886eac Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 4 Nov 2016 17:03:20 -0300 Subject: [PATCH 023/354] Updates tx-detail --- .../{modals/txDetails.js => tx-details.js} | 54 ++++++------------- src/js/routes.js | 2 +- www/views/{modals => }/tx-details.html | 4 +- 3 files changed, 18 insertions(+), 42 deletions(-) rename src/js/controllers/{modals/txDetails.js => tx-details.js} (67%) rename www/views/{modals => }/tx-details.html (96%) diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/tx-details.js similarity index 67% rename from src/js/controllers/modals/txDetails.js rename to src/js/controllers/tx-details.js index ea2cb431a..680e83af2 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/tx-details.js @@ -1,27 +1,21 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($log, $timeout, $ionicHistory, $scope, $filter, $stateParams, ongoingProcess, walletService, lodash, gettextCatalog, profileService, configService, txFormatService, externalLinkService, popupService) { - var config = configService.getSync(); - var configWallet = config.wallet; - var walletSettings = configWallet.settings; - var wallet = profileService.getWallet($stateParams.walletId); +angular.module('copayApp.controllers').controller('txDetailsController', function($log, $timeout, $ionicHistory, $scope, $stateParams, walletService, lodash, gettextCatalog, profileService, configService, externalLinkService, popupService) { - $scope.wallet = wallet; - $scope.title = gettextCatalog.getString('Transaction'); + $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.title = gettextCatalog.getString('Transaction'); + $scope.wallet = profileService.getWallet(data.stateParams.walletId); + $scope.color = $scope.wallet.color; + $scope.copayerId = $scope.wallet.credentials.copayerId; + $scope.isShared = $scope.wallet.credentials.n > 1; - $scope.init = function() { - $scope.alternativeIsoCode = walletSettings.alternativeIsoCode; - $scope.color = wallet.color; - $scope.copayerId = wallet.credentials.copayerId; - $scope.isShared = wallet.credentials.n > 1; - walletService.getTx(wallet, $stateParams.txid, function(err, tx) { + walletService.getTx($scope.wallet, $stateParams.txid, function(err, tx) { if (err) { $log.warn('Could not get tx'); $ionicHistory.goBack(); return; } $scope.btx = tx; - $scope.btx.feeLevel = walletSettings.feeLevel; if ($scope.btx.action != 'invalid') { if ($scope.btx.action == 'sent') $scope.title = gettextCatalog.getString('Sent Funds'); if ($scope.btx.action == 'received') $scope.title = gettextCatalog.getString('Received Funds'); @@ -34,7 +28,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio updateMemo(); initActionList(); }); - }; + }); function getDisplayAmount(amountStr) { return amountStr.split(' ')[0]; @@ -45,7 +39,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio } function updateMemo() { - walletService.getTxNote(wallet, $scope.btx.txid, function(err, note) { + walletService.getTxNote($scope.wallet, $scope.btx.txid, function(err, note) { if (err) { $log.warn('Could not fetch transaction note: ' + err); return; @@ -53,18 +47,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio if (!note) return; $scope.btx.note = note; - - walletService.getTx(wallet, $scope.btx.txid, function(err, tx) { - if (err) { - $log.error(err); - return; - } - - tx.note = note; - $timeout(function() { - $scope.$apply(); - }); - }); + $scope.$apply(); }); } @@ -109,9 +92,10 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio } if ($scope.btx.note && $scope.btx.note.body) opts.defaultText = $scope.btx.note.body; - popupService.showPrompt(wallet.name, gettextCatalog.getString('Memo'), opts, function(text) { + popupService.showPrompt($scope.wallet.name, gettextCatalog.getString('Memo'), opts, function(text) { if (typeof text == "undefined") return; + $scope.btx.note.body = text; $log.debug('Saving memo'); var args = { @@ -119,17 +103,10 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio body: text }; - walletService.editTxNote(wallet, args, function(err, res) { + walletService.editTxNote($scope.wallet, args, function(err, res) { if (err) { $log.debug('Could not save tx comment ' + err); - return; } - // This is only to refresh the current screen data - updateMemo(); - $scope.btx.searcheableString = null; - $timeout(function() { - $scope.$apply(); - }); }); }); }; @@ -147,7 +124,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio }; $scope.getShortNetworkName = function() { - var n = wallet.credentials.network; + var n = $scope.wallet.credentials.network; return n.substring(0, 4); }; @@ -155,5 +132,4 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.txDetailsModal.hide(); }; - $scope.init(); }); diff --git a/src/js/routes.js b/src/js/routes.js index f9d36f2c9..2b92f5af2 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -182,7 +182,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'txDetailsController', - templateUrl: 'views/modals/tx-details.html' + templateUrl: 'views/tx-details.html' } } }) diff --git a/www/views/modals/tx-details.html b/www/views/tx-details.html similarity index 96% rename from www/views/modals/tx-details.html rename to www/views/tx-details.html index 6297683d2..790a34c50 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/tx-details.html @@ -47,14 +47,14 @@ {{btx.creatorName}}
- + Memo {{btx.note.body || btx.message}} -
+
Fee {{btx.feeStr}} From 5771b22c68467d139cd7e95c1aaeafdff65dc887 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 4 Nov 2016 17:15:18 -0300 Subject: [PATCH 024/354] Fix Search: open tx detail --- src/js/controllers/walletDetails.js | 10 +++++++++- www/views/modals/search.html | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6fd7a8b30..f90361ec2 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, $ionicHistory, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -87,6 +87,14 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.close = function() { $scope.searchModal.hide(); }; + + $scope.openTx = function(tx) { + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $scope.searchModal.hide(); + $scope.openTxModal(tx); + }; }; $scope.openTxModal = function(btx) { diff --git a/www/views/modals/search.html b/www/views/modals/search.html index ec2f0cd82..ed507f76f 100644 --- a/www/views/modals/search.html +++ b/www/views/modals/search.html @@ -18,7 +18,7 @@
-
+
From d7932dc31c2d916fee52b1de6ae277ec7d07712e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 4 Nov 2016 16:58:13 -0400 Subject: [PATCH 025/354] 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 026/354] 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 027/354] 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 028/354] 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 029/354] 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 030/354] 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 b3fdec3d782691f546ca316766eecbae59f65500 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 8 Nov 2016 09:58:48 -0300 Subject: [PATCH 031/354] Fix error for empty notes --- src/js/controllers/tx-details.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index 680e83af2..e41cca9c2 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -95,7 +95,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio popupService.showPrompt($scope.wallet.name, gettextCatalog.getString('Memo'), opts, function(text) { if (typeof text == "undefined") return; - $scope.btx.note.body = text; + $scope.btx.note = { + body: text + }; $log.debug('Saving memo'); var args = { From 98e88ef3f958cc9597d4c35b11589aa3c3c276ab Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 8 Nov 2016 14:15:24 -0500 Subject: [PATCH 032/354] 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 033/354] 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 034/354] 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 035/354] 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 036/354] 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 037/354] 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 038/354] 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 039/354] 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 164c775a79bf31d270b80b30ff2f61422454ec5d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 9 Nov 2016 10:40:18 -0300 Subject: [PATCH 040/354] Adds historic fiat rate to tx-details --- src/js/controllers/tx-details.js | 23 ++++++++++++++++++++++- www/views/tx-details.html | 8 +++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index e41cca9c2..c84304700 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($log, $timeout, $ionicHistory, $scope, $stateParams, walletService, lodash, gettextCatalog, profileService, configService, externalLinkService, popupService) { +angular.module('copayApp.controllers').controller('txDetailsController', function($log, $ionicHistory, $scope, $stateParams, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService) { $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.title = gettextCatalog.getString('Transaction'); @@ -130,6 +130,27 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio return n.substring(0, 4); }; + $scope.getFiatRate = function() { + if ($scope.rateDate) return; + var alternativeIsoCode = $scope.wallet.status.alternativeIsoCode; + $scope.loadingRate = true; + $scope.wallet.getFiatRate({ + code: alternativeIsoCode, + ts: $scope.btx.time * 1000 + }, function(err, res) { + $scope.loadingRate = false; + if (err) { + $log.debug('Could not get historic rate'); + return; + } + if (res && res.rate) { + $scope.rateDate = res.fetchedOn; + $scope.rateStr = res.rate + ' ' + alternativeIsoCode; + $scope.$apply(); + } + }); + }; + $scope.cancel = function() { $scope.txDetailsModal.hide(); }; diff --git a/www/views/tx-details.html b/www/views/tx-details.html index 790a34c50..c855b7180 100644 --- a/www/views/tx-details.html +++ b/www/views/tx-details.html @@ -16,7 +16,13 @@
{{displayAmount}} {{displayUnit}}
-
{{btx.alternativeAmountStr}}
+
+ {{btx.alternativeAmountStr}} + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + ... + +
From 2e19bee5fc0d6dc8a40770bf5d879f70583fbb95 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 9 Nov 2016 12:11:40 -0500 Subject: [PATCH 041/354] chore(scripts): add placeholder start:desktop package script --- app-template/package-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app-template/package-template.json b/app-template/package-template.json index a1d87faf0..a52f16e90 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -87,6 +87,7 @@ "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", "start:android": "npm run build:www && npm run build:android && npm run run:android", + "start:desktop": "npm start", "watch": "grunt watch", "build:www": "grunt", "build:www-release": "grunt prod", From c3ef4123830f7db8f4276e4fe90cc7df7bfbc220 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 9 Nov 2016 12:34:38 -0500 Subject: [PATCH 042/354] 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 043/354] 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 044/354] 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 045/354] 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 046/354] 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 047/354] 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 048/354] 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 049/354] 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 050/354] 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 051/354] 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 052/354] 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 5ead443c2405af41ced8d2bc36617fb26052524b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 10 Nov 2016 13:47:57 -0300 Subject: [PATCH 053/354] Fix recent transactions. Show the latest transactions within 24 hours --- src/js/controllers/activity.js | 36 ++----------- src/js/controllers/tab-home.js | 90 +++++++++---------------------- src/js/controllers/tx-details.js | 8 +-- src/js/services/profileService.js | 41 +++++++------- www/views/activity.html | 6 +-- www/views/tab-home.html | 4 -- 6 files changed, 57 insertions(+), 128 deletions(-) diff --git a/src/js/controllers/activity.js b/src/js/controllers/activity.js index 29721ca3b..9ea9a31e9 100644 --- a/src/js/controllers/activity.js +++ b/src/js/controllers/activity.js @@ -26,7 +26,10 @@ angular.module('copayApp.controllers').controller('activityController', $scope.openNotificationModal = function(n) { if (n.txid) { - openTxModal(n); + $state.transitionTo('tabs.wallet.tx-details', { + txid: n.txid, + walletId: n.walletId + }); } else { var txp = lodash.find($scope.txps, { id: n.txpId @@ -46,35 +49,4 @@ angular.module('copayApp.controllers').controller('activityController', } } }; - - var openTxModal = function(n) { - var wallet = profileService.getWallet(n.walletId); - - ongoingProcess.set('loadingTxInfo', true); - walletService.getTx(wallet, n.txid, function(err, tx) { - ongoingProcess.set('loadingTxInfo', false); - - if (err) { - $log.error(err); - return popupService.showAlert(gettextCatalog.getString('Error'), err); - } - - if (!tx) { - $log.warn('No tx found'); - return popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Transaction not found')); - } - - $scope.wallet = wallet; - $scope.btx = lodash.cloneDeep(tx); - $state.transitionTo('tabs.wallet.tx-details', { - txid: $scope.btx.txid, - walletId: $scope.walletId - }); - - walletService.getTxNote(wallet, n.txid, function(err, note) { - if (err) $log.warn('Could not fetch transaction note: ' + err); - $scope.btx.note = note; - }); - }); - }; }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 656949602..08d136573 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -43,7 +43,10 @@ angular.module('copayApp.controllers').controller('tabHomeController', wallet = profileService.getWallet(n.walletId); if (n.txid) { - openTxModal(n); + $state.transitionTo('tabs.wallet.tx-details', { + txid: n.txid, + walletId: n.walletId + }); } else { var txp = lodash.find($scope.txps, { id: n.txpId @@ -65,37 +68,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', } }; - var openTxModal = function(n) { - wallet = profileService.getWallet(n.walletId); - - ongoingProcess.set('loadingTxInfo', true); - walletService.getTx(wallet, n.txid, function(err, tx) { - ongoingProcess.set('loadingTxInfo', false); - - if (err) { - $log.error(err); - return popupService.showAlert(gettextCatalog.getString('Error'), err); - } - - if (!tx) { - $log.warn('No tx found'); - return popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Transaction not found')); - } - - $scope.wallet = wallet; - $scope.btx = lodash.cloneDeep(tx); - $state.transitionTo('tabs.wallet.tx-details', { - txid: $scope.btx.txid, - walletId: $scope.walletId - }); - - walletService.getTxNote(wallet, n.txid, function(err, note) { - if (err) $log.warn('Could not fetch transaction note: ' + err); - $scope.btx.note = note; - }); - }); - }; - $scope.openWallet = function(wallet) { if (!wallet.isComplete()) { return $state.go('tabs.copayers', { @@ -117,6 +89,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.txpsN = n; $timeout(function() { $ionicScrollDelegate.resize(); + $scope.$apply(); }, 100); }) }; @@ -141,25 +114,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', } }); }); - - if (!$scope.recentTransactionsEnabled) return; - $scope.fetchingNotifications = true; - profileService.getNotifications({ - limit: 3 - }, function(err, n) { - if (err) { - $log.error(err); - return; - } - $scope.fetchingNotifications = false; - $scope.notifications = n; - - $timeout(function() { - $ionicScrollDelegate.resize(); - $scope.$apply(); - }, 100); - - }) }; var updateWallet = function(wallet) { @@ -171,20 +125,22 @@ angular.module('copayApp.controllers').controller('tabHomeController', } wallet.status = status; updateTxps(); + }); + }; - if (!$scope.recentTransactionsEnabled) return; - - $scope.fetchingNotifications = true; - profileService.getNotifications({ - limit: 3 - }, function(err, notifications) { - $scope.fetchingNotifications = false; - if (err) { - $log.error(err); - return; - } - $scope.notifications = notifications; - }); + var getNotifications = function() { + profileService.getNotifications({ + limit: 3 + }, function(err, n) { + if (err) { + $log.error(err); + return; + } + $scope.notifications = n; + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }, 100); }); }; @@ -242,7 +198,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', updateAllWallets(); }; - $scope.$on("$ionicView.enter", function(event, data) { + $scope.$on("$ionicView.beforeEnter", function(event, data) { updateAllWallets(); addressbookService.list(function(err, ab) { @@ -254,11 +210,13 @@ angular.module('copayApp.controllers').controller('tabHomeController', $rootScope.$on('bwsEvent', function(e, walletId, type, n) { var wallet = profileService.getWallet(walletId); updateWallet(wallet); + if ($scope.recentTransactionsEnabled) getNotifications(); }), $rootScope.$on('Local/TxAction', function(e, walletId) { $log.debug('Got action for wallet ' + walletId); var wallet = profileService.getWallet(walletId); updateWallet(wallet); + if ($scope.recentTransactionsEnabled) getNotifications(); }) ]; @@ -279,6 +237,8 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; $scope.recentTransactionsEnabled = config.recentTransactions.enabled; + if ($scope.recentTransactionsEnabled) getNotifications(); + if ($scope.bitpayCardEnabled) bitpayCardCache(); $timeout(function() { $ionicScrollDelegate.resize(); diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index c84304700..1b6beb58b 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($log, $ionicHistory, $scope, $stateParams, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService) { +angular.module('copayApp.controllers').controller('txDetailsController', function($log, $ionicHistory, $scope, walletService, lodash, gettextCatalog, profileService, configService, externalLinkService, popupService, ongoingProcess) { $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.title = gettextCatalog.getString('Transaction'); @@ -9,11 +9,13 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.copayerId = $scope.wallet.credentials.copayerId; $scope.isShared = $scope.wallet.credentials.n > 1; - walletService.getTx($scope.wallet, $stateParams.txid, function(err, tx) { + ongoingProcess.set('loadingTxInfo', true); + walletService.getTx($scope.wallet, data.stateParams.txid, function(err, tx) { + ongoingProcess.set('loadingTxInfo', false); if (err) { $log.warn('Could not get tx'); $ionicHistory.goBack(); - return; + return popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Transaction not found')); } $scope.btx = tx; if ($scope.btx.action != 'invalid') { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4c65a3f48..8d660cb16 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -795,7 +795,7 @@ angular.module('copayApp.services') root.getNotifications = function(opts, cb) { opts = opts || {}; - var TIME_STAMP = 60 * 60 * 24 * 7; + var TIME_STAMP = 60 * 60 * 24; var MAX = 100; var typeFilter = { @@ -861,26 +861,25 @@ angular.module('copayApp.services') var finale = shown; // GROUPING DISABLED! - // var finale = [], - // prev; - // - // - // // Item grouping... DISABLED. - // - // // REMOVE (if we want 1-to-1 notification) ???? - // lodash.each(shown, function(x) { - // if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) { - // prev.types.push(x.type); - // prev.data = lodash.assign(prev.data, x.data); - // prev.txid = prev.txid || x.txid; - // prev.amountStr = prev.amountStr || x.amountStr; - // prev.creatorName = prev.creatorName || x.creatorName; - // } else { - // finale.push(x); - // prev = x; - // } - // }); - // + var finale = [], + prev; + + + // Item grouping... DISABLED. + + // REMOVE (if we want 1-to-1 notification) ???? + lodash.each(shown, function(x) { + if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) { + prev.types.push(x.type); + prev.data = lodash.assign(prev.data, x.data); + prev.txid = prev.txid || x.txid; + prev.amountStr = prev.amountStr || x.amountStr; + prev.creatorName = prev.creatorName || x.creatorName; + } else { + finale.push(x); + prev = x; + } + }); var u = bwcService.getUtils(); lodash.each(finale, function(x) { diff --git a/www/views/activity.html b/www/views/activity.html index fb84142dc..8586e97e9 100644 --- a/www/views/activity.html +++ b/www/views/activity.html @@ -1,7 +1,7 @@ - {{'Recent Activity'|translate}} + {{'Recent Transactions'|translate}} @@ -11,7 +11,7 @@
-
Updating activity. Please stand by
+
Updating... Please stand by
@@ -22,7 +22,7 @@
- No recent activity + No recent transactions

diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 1b4c611f1..41bd57b63 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -47,10 +47,6 @@ Recent Transactions - - -
Updating activity...
- From 171b8001d6d1c06ca7d6f46a6d58662626c9bb18 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 10 Nov 2016 14:49:07 -0300 Subject: [PATCH 054/354] Recent transactions within 6 hours --- src/js/services/profileService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 8d660cb16..78f99a86b 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -795,7 +795,7 @@ angular.module('copayApp.services') root.getNotifications = function(opts, cb) { opts = opts || {}; - var TIME_STAMP = 60 * 60 * 24; + var TIME_STAMP = 60 * 60 * 6; var MAX = 100; var typeFilter = { From b64e80478e2bc0cff55b8eca796ce9a21c70722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 1 Nov 2016 14:21:35 -0300 Subject: [PATCH 055/354] feedback feature --- src/js/controllers/feedback/rateAppStore.js | 22 +++++++++++ src/js/controllers/feedback/sendFeedback.js | 42 ++++++++++++++++++++ src/js/controllers/feedback/thanks.js | 6 +++ src/js/controllers/tab-home.js | 35 +++++++++++++++++ src/js/routes.js | 43 +++++++++++++++++++-- src/sass/views/feedback/rateAppStore.scss | 12 ++++++ src/sass/views/feedback/sendFeedBack.scss | 33 ++++++++++++++++ src/sass/views/feedback/thanks.scss | 12 ++++++ src/sass/views/tab-home.scss | 17 ++++++++ src/sass/views/views.scss | 3 ++ www/views/feedback/rateAppStore.html | 33 ++++++++++++++++ www/views/feedback/sendFeedback.html | 34 ++++++++++++++++ www/views/feedback/thanks.html | 37 ++++++++++++++++++ www/views/tab-home.html | 18 +++++++++ 14 files changed, 344 insertions(+), 3 deletions(-) create mode 100644 src/js/controllers/feedback/rateAppStore.js create mode 100644 src/js/controllers/feedback/sendFeedback.js create mode 100644 src/js/controllers/feedback/thanks.js create mode 100644 src/sass/views/feedback/rateAppStore.scss create mode 100644 src/sass/views/feedback/sendFeedBack.scss create mode 100644 src/sass/views/feedback/thanks.scss create mode 100644 www/views/feedback/rateAppStore.html create mode 100644 www/views/feedback/sendFeedback.html create mode 100644 www/views/feedback/thanks.html diff --git a/src/js/controllers/feedback/rateAppStore.js b/src/js/controllers/feedback/rateAppStore.js new file mode 100644 index 000000000..0d291bc01 --- /dev/null +++ b/src/js/controllers/feedback/rateAppStore.js @@ -0,0 +1,22 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('rateAppStoreController', function($scope, $state, $stateParams) { + $scope.score = parseInt($stateParams.score); + + $scope.skip = function() { + $state.go('feedback.thanks', { + score: $scope.score, + skip: true + }); + }; + + $scope.sendFeedback = function() { + $state.go('feedback.sendFeedback', { + score: $scope.score + }); + }; + + $scope.goAppStore = function() { + + }; +}); diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js new file mode 100644 index 000000000..d53d3cef3 --- /dev/null +++ b/src/js/controllers/feedback/sendFeedback.js @@ -0,0 +1,42 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $timeout, $stateParams, gettextCatalog) { + $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. Is there anything we could do to improve your experience?"); + break; + case 2: + $scope.reaction = gettextCatalog.getString("Oh no!"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong. Is there anything we could do to 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. Is there anything we could do to 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("Feedback!"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. Is there anything we could do to improve your experience?"); + break; + } + + $scope.sendFeedback = function() { + //Feedback entered in feedback flow should be sent to BWS, and BWS should send a plain-text email to feedback@bitpay.com with a reply-to going to the user's email address. (From the onboarding process) + $state.go('feedback.thanks', { + score: $stateParams.score + }); + }; + + $scope.skip = function() { + $state.go('feedback.thanks', { + score: $scope.score, + skip: true + }); + }; + +}); diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js new file mode 100644 index 000000000..babdd0526 --- /dev/null +++ b/src/js/controllers/feedback/thanks.js @@ -0,0 +1,6 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams) { + $scope.score = parseInt($stateParams.score); + $scope.skip = $stateParams.skip && $scope.score == 5; +}); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 08d136573..1d1005e97 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -39,6 +39,41 @@ angular.module('copayApp.controllers').controller('tabHomeController', externalLinkService.open(url, optIn, title, message, okText, cancelText); }; + $scope.setScore = function(score) { + $scope.score = score; + switch ($scope.score) { + case 1: + $scope.button_title = gettextCatalog.getString("I think this app is terrible"); + break; + case 2: + $scope.button_title = gettextCatalog.getString("I don't like it"); + break; + case 3: + $scope.button_title = gettextCatalog.getString("Meh - it's alright"); + break; + case 4: + $scope.button_title = gettextCatalog.getString("I like the app"); + break; + case 5: + $scope.button_title = gettextCatalog.getString("This app is fantastic"); + break; + } + $timeout(function() { + $scope.$apply(); + }); + }; + + $scope.goFeedbackFlow = function() { + if ($scope.score != 5) + $state.go('feedback.sendFeedback', { + score: $scope.score + }); + else + $state.go('feedback.rateAppStore', { + score: $scope.score + }); + }; + $scope.openNotificationModal = function(n) { wallet = profileService.getWallet(n.walletId); diff --git a/src/js/routes.js b/src/js/routes.js index 2b92f5af2..b6ecfb4d4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -720,13 +720,50 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, }) - /* * - * Buy or Sell Bitcoin + * Feedback * */ + .state('feedback', { + url: '/feedback', + abstract: true, + template: '' + }) + .state('feedback.sendFeedback', { + url: '/sendFeedback/:score', + views: { + 'feedback': { + controller: 'sendFeedbackController', + templateUrl: 'views/feedback/sendFeedback.html' + } + } + }) + .state('feedback.thanks', { + url: '/thanks/:score/:skip', + views: { + 'feedback': { + controller: 'thanksController', + templateUrl: 'views/feedback/thanks.html' + } + } + }) + .state('feedback.rateAppStore', { + url: '/rateAppStore/:score', + views: { + 'feedback': { + controller: 'rateAppStoreController', + templateUrl: 'views/feedback/rateAppStore.html' + } + } + }) + /* + * + * Buy or Sell Bitcoin + * + */ + .state('tabs.buyandsell', { url: '/buyandsell', views: { @@ -992,7 +1029,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + // $state.go('tabs.home'); } // After everything have been loaded, initialize handler URL diff --git a/src/sass/views/feedback/rateAppStore.scss b/src/sass/views/feedback/rateAppStore.scss new file mode 100644 index 000000000..a393477bf --- /dev/null +++ b/src/sass/views/feedback/rateAppStore.scss @@ -0,0 +1,12 @@ +#rate-app-store { + .title { + font-size: 20px; + font-weight: bold; + color: $dark-gray; + margin: 20px 10px; + text-align: center; + } + .subtitle { + padding: 10px 30px 20px 40px; + } +} diff --git a/src/sass/views/feedback/sendFeedBack.scss b/src/sass/views/feedback/sendFeedBack.scss new file mode 100644 index 000000000..9c8ea6295 --- /dev/null +++ b/src/sass/views/feedback/sendFeedBack.scss @@ -0,0 +1,33 @@ +#send-feedback { + background-color: #fff; + .title { + font-size: 20px; + font-weight: bold; + color: $dark-gray; + margin: 20px 10px; + } + .star { + margin: 20px 0px; + } + a { + font-size: 25px; + padding: 12px; + .gold { + color: #ffd700 !important; + } + .grey { + color: #667 !important; + } + } + .comment { + padding: 20px; + font-size: 1rem; + line-height: 1.5em; + font-weight: 300; + color: $dark-gray; + } + textarea { + padding: 10px; + width: 100%; + } +} diff --git a/src/sass/views/feedback/thanks.scss b/src/sass/views/feedback/thanks.scss new file mode 100644 index 000000000..3ab9c4ca0 --- /dev/null +++ b/src/sass/views/feedback/thanks.scss @@ -0,0 +1,12 @@ +#thanks-feedback { + .title { + font-size: 20px; + font-weight: bold; + color: $dark-gray; + margin: 20px 10px; + text-align: center; + } + .subtitle { + padding: 10px 30px 20px 40px; + } +} diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 2d5368a8d..0479a2d75 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -116,6 +116,23 @@ font-size: 20px; margin-left: 10px; position: absolute; + } } + .starts { + display: flex; + border-bottom: none; + .button { + background-color: #fff; + width: 100%; + } + .gold { + color: #ffd700 !important; + } + .grey { + color: #667 !important; + } + } + .continue-button { + padding: 20px; } } diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index c449d07db..0e3f21ae9 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -17,6 +17,9 @@ @import "wallet-backup-phrase"; @import "zero-state"; @import "onboarding/onboarding"; +@import "feedback/sendFeedback"; +@import "feedback/thanks"; +@import "feedback/rateAppStore"; @import "includes/actionSheet"; @import "export"; @import "import"; diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateAppStore.html new file mode 100644 index 000000000..eca714e32 --- /dev/null +++ b/www/views/feedback/rateAppStore.html @@ -0,0 +1,33 @@ + + + + + + + +
+ Thank you! +
+ + + +
+
+
+ 5-star ratings help us get BitPay Wallet 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? +
+
+ + +
+ + diff --git a/www/views/feedback/sendFeedback.html b/www/views/feedback/sendFeedback.html new file mode 100644 index 000000000..23a1e2150 --- /dev/null +++ b/www/views/feedback/sendFeedback.html @@ -0,0 +1,34 @@ + + + + + + + +
+
+ {{reaction}} +
+
+ + + + + +
+
+
+ {{comment}} +
+
+ +
+
+ +
+ + diff --git a/www/views/feedback/thanks.html b/www/views/feedback/thanks.html new file mode 100644 index 000000000..3922cedad --- /dev/null +++ b/www/views/feedback/thanks.html @@ -0,0 +1,37 @@ + + + + + + + +
+
+ Thank you! +
+
+ A member of the team will review your feedback as soon as possible. +
+
+ If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab. +
+ + + +
+
+
+
+ Invite friends to BitPay Wallet! +
+ + + +
+
+
+ Share the love by inviting your friends. +
+ + diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 41bd57b63..4ce90293b 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -13,6 +13,24 @@
An update to this app is available
+
+
+ How do you like BitPay Wallet? + +
+
+ + + + + +
+
+ +
+
From a2e20ee75de7abe934c84deb7a58e2e2b60d37e6 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 1 Nov 2016 15:35:52 -0300 Subject: [PATCH 056/354] share wallet --- src/js/controllers/feedback/thanks.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js index babdd0526..97e914e4c 100644 --- a/src/js/controllers/feedback/thanks.js +++ b/src/js/controllers/feedback/thanks.js @@ -1,6 +1,12 @@ 'use strict'; -angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams) { +angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams, platformInfo) { $scope.score = parseInt($stateParams.score); $scope.skip = $stateParams.skip && $scope.score == 5; + + $scope.$on("$ionicView.beforeEnter", function(event, data) { + if (platformInfo.isCordova) { + window.plugins.socialsharing.share('https://bitpay.com/wallet', null, null, null); + } + }); }); From 9e3f627c58d1e55419a188e9e73e2110b4ef322d Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 2 Nov 2016 10:18:10 -0300 Subject: [PATCH 057/354] rate the app --- src/js/controllers/feedback/rateAppStore.js | 17 +++++++++++++++-- src/js/controllers/feedback/thanks.js | 5 +++-- src/js/routes.js | 2 +- src/js/services/configService.js | 10 ++++++++++ www/views/feedback/rateAppStore.html | 4 ++-- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/js/controllers/feedback/rateAppStore.js b/src/js/controllers/feedback/rateAppStore.js index 0d291bc01..58377d0a2 100644 --- a/src/js/controllers/feedback/rateAppStore.js +++ b/src/js/controllers/feedback/rateAppStore.js @@ -1,7 +1,12 @@ 'use strict'; -angular.module('copayApp.controllers').controller('rateAppStoreController', function($scope, $state, $stateParams) { +angular.module('copayApp.controllers').controller('rateAppStoreController', function($scope, $state, $stateParams, externalLinkService, configService, gettextCatalog, platformInfo) { $scope.score = parseInt($stateParams.score); + $scope.isCordova = platformInfo.isCordova; + var isAndroid = platformInfo.isAndroid; + var isIOS = platformInfo.isIOS; + var isWP = platformInfo.isWP; + var config = configService.getSync(); $scope.skip = function() { $state.go('feedback.thanks', { @@ -17,6 +22,14 @@ angular.module('copayApp.controllers').controller('rateAppStoreController', func }; $scope.goAppStore = function() { - + var url; + if (isAndroid) url = config.rateApp.android; + if (isIOS) url = config.rateApp.ios; + // if (isWP) url = config.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'); + var cancelText = gettextCatalog.getString('Cancel'); + externalLinkService.open(url, true, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js index 97e914e4c..31c445468 100644 --- a/src/js/controllers/feedback/thanks.js +++ b/src/js/controllers/feedback/thanks.js @@ -1,12 +1,13 @@ 'use strict'; -angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams, platformInfo) { +angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams, platformInfo, configService) { $scope.score = parseInt($stateParams.score); $scope.skip = $stateParams.skip && $scope.score == 5; $scope.$on("$ionicView.beforeEnter", function(event, data) { if (platformInfo.isCordova) { - window.plugins.socialsharing.share('https://bitpay.com/wallet', null, null, null); + var config = configService.getSync(); + window.plugins.socialsharing.share(config.download.url, null, null, null); } }); }); diff --git a/src/js/routes.js b/src/js/routes.js index b6ecfb4d4..91d4cd6d0 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1029,7 +1029,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - // $state.go('tabs.home'); + $state.go('tabs.home'); } // After everything have been loaded, initialize handler URL diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 618118e35..a51906f82 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -15,6 +15,16 @@ angular.module('copayApp.services').factory('configService', function(storageSer url: 'https://bws.bitpay.com/bws/api', }, + download: { + url: 'https://bitpay.com/wallet', + }, + + rateApp: { + ios: 'https://itunes.apple.com/app/bitpay-secure-bitcoin-wallet/id1149581638', + android: 'https://play.google.com/store/apps/details?id=com.bitpay.wallet', + wp: '' + }, + // wallet default config wallet: { requiredCopayers: 2, diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateAppStore.html index eca714e32..8ca841b05 100644 --- a/www/views/feedback/rateAppStore.html +++ b/www/views/feedback/rateAppStore.html @@ -22,11 +22,11 @@ Would you be willing to rate BitPay Wallet in the app store?
-
From 7b2d3b1df0780a26e70d523e3dbdf3b4cf714f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Nov 2016 10:52:04 -0300 Subject: [PATCH 058/354] add rate card flag --- src/js/controllers/feedback/rateAppStore.js | 1 - src/js/controllers/feedback/sendFeedback.js | 2 +- src/js/controllers/feedback/thanks.js | 9 +- src/js/controllers/tab-home.js | 163 +++++++++++--------- src/js/services/storageService.js | 8 + www/views/feedback/rateAppStore.html | 4 +- www/views/feedback/thanks.html | 2 +- www/views/tab-home.html | 6 +- 8 files changed, 112 insertions(+), 83 deletions(-) diff --git a/src/js/controllers/feedback/rateAppStore.js b/src/js/controllers/feedback/rateAppStore.js index 58377d0a2..3bc49f140 100644 --- a/src/js/controllers/feedback/rateAppStore.js +++ b/src/js/controllers/feedback/rateAppStore.js @@ -2,7 +2,6 @@ angular.module('copayApp.controllers').controller('rateAppStoreController', function($scope, $state, $stateParams, externalLinkService, configService, gettextCatalog, platformInfo) { $scope.score = parseInt($stateParams.score); - $scope.isCordova = platformInfo.isCordova; var isAndroid = platformInfo.isAndroid; var isIOS = platformInfo.isIOS; var isWP = platformInfo.isWP; diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js index d53d3cef3..cce2b9d06 100644 --- a/src/js/controllers/feedback/sendFeedback.js +++ b/src/js/controllers/feedback/sendFeedback.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $timeout, $stateParams, gettextCatalog) { +angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $stateParams, gettextCatalog) { $scope.score = parseInt($stateParams.score); switch ($scope.score) { case 1: diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js index 31c445468..0ccdae254 100644 --- a/src/js/controllers/feedback/thanks.js +++ b/src/js/controllers/feedback/thanks.js @@ -1,13 +1,12 @@ 'use strict'; -angular.module('copayApp.controllers').controller('thanksController', function($scope, $state, $stateParams, platformInfo, configService) { +angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, configService, storageService) { $scope.score = parseInt($stateParams.score); $scope.skip = $stateParams.skip && $scope.score == 5; + storageService.setRateCardFlag('true', function() {}); $scope.$on("$ionicView.beforeEnter", function(event, data) { - if (platformInfo.isCordova) { - var config = configService.getSync(); - window.plugins.socialsharing.share(config.download.url, null, null, null); - } + var config = configService.getSync(); + window.plugins.socialsharing.share(config.download.url, null, null, null); }); }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 1d1005e97..be2c5d8b9 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -18,27 +18,107 @@ angular.module('copayApp.controllers').controller('tabHomeController', startupService.ready(); }); - if (!$scope.homeTip) { - storageService.getHomeTipAccepted(function(error, value) { - $scope.homeTip = (value == 'accepted') ? false : true; - }); - } + $scope.$on("$ionicView.beforeEnter", function(event, data) { + if (!$scope.homeTip) { + storageService.getHomeTipAccepted(function(error, value) { + $scope.homeTip = (value == 'accepted') ? false : true; + }); + } - if ($scope.isNW) { - latestReleaseService.checkLatestRelease(function(err, newRelease) { - if (err) { - $log.warn(err); - return; - } + if ($scope.isNW) { + latestReleaseService.checkLatestRelease(function(err, newRelease) { + if (err) { + $log.warn(err); + return; + } - if (newRelease) $scope.newRelease = true; + if (newRelease) $scope.newRelease = true; + }); + } + + $scope.hideRateCard = $stateParams.fromAppRate || !$scope.isCordova; + if (!$scope.hideRateCard) { + storageService.getRateCardFlag(function(error, value) { + $scope.hideRateCard = (value == 'true') ? true : false; + }); + } + }); + + $scope.$on("$ionicView.enter", function(event, data) { + updateAllWallets(); + + addressbookService.list(function(err, ab) { + if (err) $log.error(err); + $scope.addressbook = ab || {}; }); - } + + listeners = [ + $rootScope.$on('bwsEvent', function(e, walletId, type, n) { + var wallet = profileService.getWallet(walletId); + updateWallet(wallet); + if ($scope.recentTransactionsEnabled) getNotifications(); + }), + $rootScope.$on('Local/TxAction', function(e, walletId) { + $log.debug('Got action for wallet ' + walletId); + var wallet = profileService.getWallet(walletId); + updateWallet(wallet); + if ($scope.recentTransactionsEnabled) getNotifications(); + }) + ]; + + configService.whenAvailable(function() { + nextStep(function() { + var config = configService.getSync(); + var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + + $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; + $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; + $scope.amazonEnabled = config.amazon.enabled; + $scope.bitpayCardEnabled = config.bitpayCard.enabled; + + var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled); + var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled; + var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled; + + $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; + $scope.recentTransactionsEnabled = config.recentTransactions.enabled; + + if ($scope.recentTransactionsEnabled) getNotifications(); + + if ($scope.bitpayCardEnabled) bitpayCardCache(); + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }, 10); + }); + }); + }); + + $scope.$on("$ionicView.leave", function(event, data) { + lodash.each(listeners, function(x) { + x(); + }); + }); + + $scope.$on("$ionicView.leave", function(event, data) { + lodash.each(listeners, function(x) { + x(); + }); + }); $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { externalLinkService.open(url, optIn, title, message, okText, cancelText); }; + $scope.hideCard = function() { + storageService.setRateCardFlag('true', function() { + $scope.hideRateCard = true; + $timeout(function() { + $scope.$apply(); + }) + }); + } + $scope.setScore = function(score) { $scope.score = score; switch ($scope.score) { @@ -232,61 +312,4 @@ angular.module('copayApp.controllers').controller('tabHomeController', }, 300); updateAllWallets(); }; - - $scope.$on("$ionicView.beforeEnter", function(event, data) { - updateAllWallets(); - - addressbookService.list(function(err, ab) { - if (err) $log.error(err); - $scope.addressbook = ab || {}; - }); - - listeners = [ - $rootScope.$on('bwsEvent', function(e, walletId, type, n) { - var wallet = profileService.getWallet(walletId); - updateWallet(wallet); - if ($scope.recentTransactionsEnabled) getNotifications(); - }), - $rootScope.$on('Local/TxAction', function(e, walletId) { - $log.debug('Got action for wallet ' + walletId); - var wallet = profileService.getWallet(walletId); - updateWallet(wallet); - if ($scope.recentTransactionsEnabled) getNotifications(); - }) - ]; - - configService.whenAvailable(function() { - nextStep(function() { - var config = configService.getSync(); - var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; - - $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; - $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; - $scope.amazonEnabled = config.amazon.enabled; - $scope.bitpayCardEnabled = config.bitpayCard.enabled; - - var buyAndSellEnabled = !$scope.externalServices.BuyAndSell && ($scope.glideraEnabled || $scope.coinbaseEnabled); - var amazonEnabled = !$scope.externalServices.AmazonGiftCards && $scope.amazonEnabled; - var bitpayCardEnabled = !$scope.externalServices.BitpayCard && $scope.bitpayCardEnabled; - - $scope.nextStepEnabled = buyAndSellEnabled || amazonEnabled || bitpayCardEnabled; - $scope.recentTransactionsEnabled = config.recentTransactions.enabled; - - if ($scope.recentTransactionsEnabled) getNotifications(); - - if ($scope.bitpayCardEnabled) bitpayCardCache(); - $timeout(function() { - $ionicScrollDelegate.resize(); - $scope.$apply(); - }, 10); - }); - }); - }); - - $scope.$on("$ionicView.leave", function(event, data) { - lodash.each(listeners, function(x) { - x(); - }); - }); - }); diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 4184f8454..e68f28df0 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -203,6 +203,14 @@ angular.module('copayApp.services') storage.set('homeTip', val, cb); }; + root.getRateCardFlag = function(cb) { + storage.get('rateCardFlag', cb); + }; + + root.setRateCardFlag = function(val, cb) { + storage.set('rateCardFlag', val, cb); + }; + root.setHideBalanceFlag = function(walletId, val, cb) { storage.set('hideBalance-' + walletId, val, cb); }; diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateAppStore.html index 8ca841b05..eca714e32 100644 --- a/www/views/feedback/rateAppStore.html +++ b/www/views/feedback/rateAppStore.html @@ -22,11 +22,11 @@ Would you be willing to rate BitPay Wallet in the app store?
-
diff --git a/www/views/feedback/thanks.html b/www/views/feedback/thanks.html index 3922cedad..a76b5afda 100644 --- a/www/views/feedback/thanks.html +++ b/www/views/feedback/thanks.html @@ -1,7 +1,7 @@ - diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 4ce90293b..005d0cb75 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -10,13 +10,13 @@ spinner="ios-small" on-refresh="onRefresh()"> -
+
An update to this app is available
-
+
How do you like BitPay Wallet? - +
From 9668870a07be75ed59f67b5322412fd760940735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Nov 2016 15:30:14 -0300 Subject: [PATCH 059/354] new flow for NW.js --- src/js/controllers/feedback/rateAppStore.js | 2 +- src/js/controllers/feedback/sendFeedback.js | 5 +- src/js/controllers/feedback/thanks.js | 73 +++++++++++++++++++-- src/js/controllers/tab-home.js | 21 +++--- src/js/routes.js | 2 +- src/sass/views/feedback/thanks.scss | 11 ++++ www/views/feedback/thanks.html | 73 +++++++++++++++++---- 7 files changed, 153 insertions(+), 34 deletions(-) diff --git a/src/js/controllers/feedback/rateAppStore.js b/src/js/controllers/feedback/rateAppStore.js index 3bc49f140..b659fa516 100644 --- a/src/js/controllers/feedback/rateAppStore.js +++ b/src/js/controllers/feedback/rateAppStore.js @@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('rateAppStoreController', func $scope.skip = function() { $state.go('feedback.thanks', { score: $scope.score, - skip: true + skipped: true }); }; diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js index cce2b9d06..d26b2e2ff 100644 --- a/src/js/controllers/feedback/sendFeedback.js +++ b/src/js/controllers/feedback/sendFeedback.js @@ -28,14 +28,15 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func $scope.sendFeedback = function() { //Feedback entered in feedback flow should be sent to BWS, and BWS should send a plain-text email to feedback@bitpay.com with a reply-to going to the user's email address. (From the onboarding process) $state.go('feedback.thanks', { - score: $stateParams.score + score: $stateParams.score, + skipped: false }); }; $scope.skip = function() { $state.go('feedback.thanks', { score: $scope.score, - skip: true + skipped: true }); }; diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js index 0ccdae254..80f3f6218 100644 --- a/src/js/controllers/feedback/thanks.js +++ b/src/js/controllers/feedback/thanks.js @@ -1,12 +1,75 @@ 'use strict'; -angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, configService, storageService) { +angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, platformInfo, configService, storageService) { $scope.score = parseInt($stateParams.score); - $scope.skip = $stateParams.skip && $scope.score == 5; - storageService.setRateCardFlag('true', function() {}); + $scope.skipped = $stateParams.skipped == 'false' ? false : true; + $scope.isCordova = platformInfo.isCordova; + var config = configService.getSync(); + + $scope.shareFacebook = function() { + window.plugins.socialsharing.shareViaFacebook(config.download.url, null, null, null); + }; + + $scope.shareTwitter = function() { + window.plugins.socialsharing.shareVia('com.apple.social.twitter', config.download.url, null, null, 'http://www.x-services.nl', null, null); + }; + + $scope.shareGooglePlus = function() { + window.plugins.socialsharing.shareVia('com.google.android.apps.plus', config.download.url, null, null, null); + }; + + $scope.shareEmail = function() { + window.plugins.socialsharing.shareViaEmail(config.download.url, null, null, null); + }; + + $scope.shareWhatsapp = function() { + window.plugins.socialsharing.shareViaWhatsApp(config.download.url, null, null, null); + }; + + $scope.shareMessage = function() { + window.plugins.socialsharing.shareViaSMS(config.download.url, null, null, null); + }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - var config = configService.getSync(); - window.plugins.socialsharing.share(config.download.url, null, null, null); + storageService.setRateCardFlag('true', function() {}); + if (!$scope.isCordova) return; + + window.plugins.socialsharing.available(function(isAvailable) { + // the boolean is only false on iOS < 6 + $scope.socialsharing = isAvailable; + if (isAvailable) { + + window.plugins.socialsharing.canShareVia('com.apple.social.facebook', 'msg', null, null, null, function(e) { + $scope.facebook = true; + }, function(e) { + $scope.facebook = false; + }); + window.plugins.socialsharing.canShareVia('com.apple.social.twitter', 'msg', null, null, null, function(e) { + $scope.twitter = true; + }, function(e) { + $scope.twitter = false; + }); + window.plugins.socialsharing.canShareVia('com.google.android.apps.plus', 'msg', null, null, null, function(e) { + $scope.googleplus = true; + }, function(e) { + $scope.googleplus = false; + }) + window.plugins.socialsharing.canShareViaEmail(function(e) { + $scope.email = true; + }, function(e) { + $scope.email = false; + }) + window.plugins.socialsharing.canShareVia('whatsapp', 'msg', null, null, null, function(e) { + $scope.whatsapp = true; + }, function(e) { + $scope.whatsapp = false; + }) + window.plugins.socialsharing.canShareVia('sms', 'msg', null, null, null, function(e) { + $scope.sms = true; + }, function(e) { + $scope.sms = false; + }) + } + }); }); }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index be2c5d8b9..ca77a1838 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -36,12 +36,10 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); } - $scope.hideRateCard = $stateParams.fromAppRate || !$scope.isCordova; - if (!$scope.hideRateCard) { - storageService.getRateCardFlag(function(error, value) { - $scope.hideRateCard = (value == 'true') ? true : false; - }); - } + storageService.getRateCardFlag(function(error, value) { + $scope.hideRateCard = (value == 'true') ? true : false; + }); + }); $scope.$on("$ionicView.enter", function(event, data) { @@ -144,14 +142,15 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.goFeedbackFlow = function() { - if ($scope.score != 5) - $state.go('feedback.sendFeedback', { - score: $scope.score - }); - else + if ($scope.isCordova && $scope.score == 5) { $state.go('feedback.rateAppStore', { score: $scope.score }); + } else { + $state.go('feedback.sendFeedback', { + score: $scope.score + }); + } }; $scope.openNotificationModal = function(n) { diff --git a/src/js/routes.js b/src/js/routes.js index 91d4cd6d0..ee65083d3 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -741,7 +741,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('feedback.thanks', { - url: '/thanks/:score/:skip', + url: '/thanks/:score/:skipped', views: { 'feedback': { controller: 'thanksController', diff --git a/src/sass/views/feedback/thanks.scss b/src/sass/views/feedback/thanks.scss index 3ab9c4ca0..2a92e173b 100644 --- a/src/sass/views/feedback/thanks.scss +++ b/src/sass/views/feedback/thanks.scss @@ -9,4 +9,15 @@ .subtitle { padding: 10px 30px 20px 40px; } + .row { + margin: 20px 0px 20px; + span { + margin-top: 15px; + display: block; + } + div { + text-align: center; + width: 100%; + } + } } diff --git a/www/views/feedback/thanks.html b/www/views/feedback/thanks.html index a76b5afda..3a82a99d5 100644 --- a/www/views/feedback/thanks.html +++ b/www/views/feedback/thanks.html @@ -1,19 +1,28 @@ - -
-
- Thank you! +
+
Invite friends to BitPay Wallet!
+
+ + +
+
+ Share the love by inviting your friends. +
+
+
+
Thank you!
A member of the team will review your feedback as soon as possible.
-
+
If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.
@@ -21,17 +30,53 @@
-
-
- Invite friends to BitPay Wallet! -
- - - +
+ Share the love by inviting your friends.
-
- Share the love by inviting your friends. +
+
+
+
+ + + + Facebook +
+
+ + + + Twitter +
+
+ + + + Google+ +
+
+
+
+ + + + Email +
+
+ + + + Whatsapp +
+
+ + + + Message +
+
+
From 1727b7c20aa158f0e11a48d2e9e83de889a7c6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 3 Nov 2016 11:43:34 -0300 Subject: [PATCH 060/354] fixes --- src/js/controllers/feedback/thanks.js | 31 ++++++++++++++------------- www/views/feedback/thanks.html | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/thanks.js index 80f3f6218..e85d926c7 100644 --- a/src/js/controllers/feedback/thanks.js +++ b/src/js/controllers/feedback/thanks.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, platformInfo, configService, storageService) { +angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, $timeout, $log, platformInfo, configService, storageService) { $scope.score = parseInt($stateParams.score); $scope.skipped = $stateParams.skipped == 'false' ? false : true; $scope.isCordova = platformInfo.isCordova; @@ -11,11 +11,11 @@ angular.module('copayApp.controllers').controller('thanksController', function($ }; $scope.shareTwitter = function() { - window.plugins.socialsharing.shareVia('com.apple.social.twitter', config.download.url, null, null, 'http://www.x-services.nl', null, null); + window.plugins.socialsharing.shareVia($scope.shareTwitterVia, config.download.url, null, null, null, null, null); }; $scope.shareGooglePlus = function() { - window.plugins.socialsharing.shareVia('com.google.android.apps.plus', config.download.url, null, null, null); + window.plugins.socialsharing.shareVia($scope.shareGooglePlusVia, config.download.url, null, null, null); }; $scope.shareEmail = function() { @@ -31,45 +31,46 @@ angular.module('copayApp.controllers').controller('thanksController', function($ }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - storageService.setRateCardFlag('true', function() {}); if (!$scope.isCordova) return; window.plugins.socialsharing.available(function(isAvailable) { + storageService.setRateCardFlag('true', function() {}); // the boolean is only false on iOS < 6 $scope.socialsharing = isAvailable; if (isAvailable) { - window.plugins.socialsharing.canShareVia('com.apple.social.facebook', 'msg', null, null, null, function(e) { $scope.facebook = true; }, function(e) { + $log.debug('facebook error: ' + e); $scope.facebook = false; }); - window.plugins.socialsharing.canShareVia('com.apple.social.twitter', 'msg', null, null, null, function(e) { + window.plugins.socialsharing.canShareVia('com.twitter.android', 'msg', null, null, null, function(e) { + $scope.shareTwitterVia = 'com.twitter.android'; $scope.twitter = true; }, function(e) { + $log.debug('twitter error: ' + e); $scope.twitter = false; }); window.plugins.socialsharing.canShareVia('com.google.android.apps.plus', 'msg', null, null, null, function(e) { + $scope.shareGooglePlusVia = 'com.google.android.apps.plus'; $scope.googleplus = true; }, function(e) { + $log.debug('googlePlus error: ' + e); $scope.googleplus = false; - }) + }); window.plugins.socialsharing.canShareViaEmail(function(e) { $scope.email = true; }, function(e) { + $log.debug('email error: ' + e); $scope.email = false; - }) + }); window.plugins.socialsharing.canShareVia('whatsapp', 'msg', null, null, null, function(e) { $scope.whatsapp = true; }, function(e) { + $log.debug('whatsapp error: ' + e); $scope.whatsapp = false; - }) - window.plugins.socialsharing.canShareVia('sms', 'msg', null, null, null, function(e) { - $scope.sms = true; - }, function(e) { - $scope.sms = false; - }) + }); } - }); + }, 100); }); }); diff --git a/www/views/feedback/thanks.html b/www/views/feedback/thanks.html index 3a82a99d5..f6a9b9557 100644 --- a/www/views/feedback/thanks.html +++ b/www/views/feedback/thanks.html @@ -69,7 +69,7 @@ Whatsapp
-
+
From 11b4ec1fcc719c848d8ad6e4f92ba01423b524e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 3 Nov 2016 13:39:01 -0300 Subject: [PATCH 061/354] styling --- src/js/controllers/feedback/sendFeedback.js | 10 +++--- src/sass/views/feedback/rateAppStore.scss | 17 +++++++++- src/sass/views/feedback/sendFeedBack.scss | 30 ++++++++++-------- src/sass/views/feedback/thanks.scss | 35 +++++++++++++++------ src/sass/views/tab-home.scss | 15 +++++---- www/views/feedback/rateAppStore.html | 14 +++------ www/views/feedback/sendFeedback.html | 24 ++++++-------- www/views/feedback/thanks.html | 11 +++---- www/views/tab-home.html | 14 ++++----- 9 files changed, 97 insertions(+), 73 deletions(-) diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js index d26b2e2ff..d33c755e9 100644 --- a/src/js/controllers/feedback/sendFeedback.js +++ b/src/js/controllers/feedback/sendFeedback.js @@ -5,23 +5,23 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func switch ($scope.score) { case 1: $scope.reaction = gettextCatalog.getString("Ouch!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); break; case 2: $scope.reaction = gettextCatalog.getString("Oh no!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); break; case 3: $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); 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?"); + $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you"); break; case 5: $scope.reaction = gettextCatalog.getString("Feedback!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); break; } diff --git a/src/sass/views/feedback/rateAppStore.scss b/src/sass/views/feedback/rateAppStore.scss index a393477bf..5003e6b02 100644 --- a/src/sass/views/feedback/rateAppStore.scss +++ b/src/sass/views/feedback/rateAppStore.scss @@ -1,12 +1,27 @@ #rate-app-store { + background-color: #ffffff; + .skip { + margin: 10px; + color: #667; + } .title { font-size: 20px; font-weight: bold; color: $dark-gray; - margin: 20px 10px; + margin: 40px 10px; text-align: center; } .subtitle { padding: 10px 30px 20px 40px; } + .buttons { + bottom: 0; + width: 100%; + position: absolute; + background-color: $subtle-gray; + .button { + margin-top: 40px; + margin-bottom: 30px; + } + } } diff --git a/src/sass/views/feedback/sendFeedBack.scss b/src/sass/views/feedback/sendFeedBack.scss index 9c8ea6295..8e3060984 100644 --- a/src/sass/views/feedback/sendFeedBack.scss +++ b/src/sass/views/feedback/sendFeedBack.scss @@ -1,22 +1,25 @@ #send-feedback { - background-color: #fff; + background-color: #ffffff; + .skip { + margin: 10px; + color: #667; + } .title { font-size: 20px; font-weight: bold; color: $dark-gray; - margin: 20px 10px; + margin-left: 10px; } .star { - margin: 20px 0px; - } - a { - font-size: 25px; - padding: 12px; - .gold { - color: #ffd700 !important; - } - .grey { - color: #667 !important; + a { + font-size: 25px; + padding: 12px; + .gold { + color: #ffd700; + } + .subtle-gray { + color: $subtle-gray; + } } } .comment { @@ -27,7 +30,8 @@ color: $dark-gray; } textarea { - padding: 10px; + border-top: 1px solid $subtle-gray; + padding: 20px; width: 100%; } } diff --git a/src/sass/views/feedback/thanks.scss b/src/sass/views/feedback/thanks.scss index 2a92e173b..bd4d3ccab 100644 --- a/src/sass/views/feedback/thanks.scss +++ b/src/sass/views/feedback/thanks.scss @@ -1,4 +1,15 @@ #thanks-feedback { + background-color: #ffffff; + .item-heading { + border-style: none; + margin-top: 5px; + a { + color: $dark-gray; + } + i { + font-size: 40px; + } + } .title { font-size: 20px; font-weight: bold; @@ -9,15 +20,21 @@ .subtitle { padding: 10px 30px 20px 40px; } - .row { - margin: 20px 0px 20px; - span { - margin-top: 15px; - display: block; - } - div { - text-align: center; - width: 100%; + .share-buttons { + bottom: 0; + width: 100%; + position: absolute; + background-color: $subtle-gray; + .row { + margin: 20px 0px 20px; + span { + margin-top: 15px; + display: block; + } + div { + text-align: center; + width: 100%; + } } } } diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 0479a2d75..6e1314294 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -118,21 +118,24 @@ position: absolute; } } - .starts { + .stars { display: flex; border-bottom: none; .button { background-color: #fff; - width: 100%; + outline: none; + border: none; + height:10px; + width:10px; } .gold { - color: #ffd700 !important; + color: #ffd700; } - .grey { - color: #667 !important; + .subtle-gray { + color: $subtle-gray; } } - .continue-button { + .feedback-flow-button { padding: 20px; } } diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateAppStore.html index eca714e32..3da6ed36b 100644 --- a/www/views/feedback/rateAppStore.html +++ b/www/views/feedback/rateAppStore.html @@ -1,12 +1,6 @@ - - - - - +
Thank you!
@@ -19,13 +13,13 @@ 5-star ratings help us get BitPay Wallet 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 Wallet in the app store?
-
+
-
diff --git a/www/views/feedback/sendFeedback.html b/www/views/feedback/sendFeedback.html index 23a1e2150..e240d50d6 100644 --- a/www/views/feedback/sendFeedback.html +++ b/www/views/feedback/sendFeedback.html @@ -1,29 +1,23 @@ - - - - - +
-
+
{{reaction}}
-
- - - - - +
+ + + + +
{{comment}}
- +
- - +
+ +
Invite friends to BitPay Wallet!
@@ -34,7 +31,7 @@ Share the love by inviting your friends.
-
+