From 390a7deecffaf1853694cabe714311a8967a7209 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 13 Sep 2016 15:45:56 -0400 Subject: [PATCH 01/16] finish adding styles for push notifications view(initial testing for iPhone5 size devices only) --- public/img/onboarding-push-notifications.svg | 37 +++++++++++++++++++ public/views/onboarding/notifications.html | 25 ++++++++----- src/js/controllers/onboarding/collectEmail.js | 2 +- .../onboard-push-notifications.scss | 37 +++++++++++++++++++ src/sass/views/onboarding/onboarding.scss | 6 +++ 5 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 public/img/onboarding-push-notifications.svg create mode 100644 src/sass/views/onboarding/onboard-push-notifications.scss diff --git a/public/img/onboarding-push-notifications.svg b/public/img/onboarding-push-notifications.svg new file mode 100644 index 000000000..4c6899861 --- /dev/null +++ b/public/img/onboarding-push-notifications.svg @@ -0,0 +1,37 @@ + + + + Group 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/onboarding/notifications.html b/public/views/onboarding/notifications.html index d086b1355..b60984f48 100644 --- a/public/views/onboarding/notifications.html +++ b/public/views/onboarding/notifications.html @@ -1,16 +1,21 @@ - + -
-

+
+

Push Notifications -

- - +

+
+
+

Would you like to receive push notifications about payments? - - - - +

+
+
+
+
+ + +
diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 6479e0ea8..14ec1e52a 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; - var usePushNotifications = isCordova && !isWP; + var usePushNotifications = true; var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss new file mode 100644 index 000000000..3183291a0 --- /dev/null +++ b/src/sass/views/onboarding/onboard-push-notifications.scss @@ -0,0 +1,37 @@ +#onboarding-push-notifications{ + h2{ + margin-top:2rem; + } + #cta{ + background-image: url('../img/onboarding-push-notifications.svg'); + height: 15rem; + margin-top: .75rem; + } + .cta-buttons{ + float:none; + bottom:0; + position: absolute; + width:100%; + button{ + max-width: 400px; + } + } +} + +@media (max-width: 400px){ + #onboarding-push-notifications{ + .cta-buttons{ + float:none; + bottom:0; + position: absolute; + } + } +} +@media (max-height: 540px){ + #onboarding-push-notifications{ + .cta-buttons{ + float:left; + position: relative; + } + } +} \ No newline at end of file diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index c84b0e3df..04fa87401 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -48,6 +48,7 @@ } } button { + color:#fff; &.next-slide { background: rgba(215, 215, 215, 0.10); } @@ -67,8 +68,12 @@ .button-transparent{ background: none !important; } + .button-translucent{ + background: rgba(215, 215, 215, 0.1) + } .button-primary{ background: rgb(100, 124, 232) !important; + color:#fff; } .light-blue{ color:rgb(100, 124, 232); @@ -98,3 +103,4 @@ @import "onboard-backup-request"; @import "onboard-backup-warning"; @import "onboard-disclaimer"; +@import "onboard-push-notifications"; From 4a1ea6d3eadd0d11dc8db237156d3ae6e46294a6 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 13 Sep 2016 15:55:08 -0400 Subject: [PATCH 02/16] updating on boarding button classes on tour page --- public/views/onboarding/tour.html | 4 ++-- src/sass/views/onboarding/onboarding.scss | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/public/views/onboarding/tour.html b/public/views/onboarding/tour.html index d4be4de4a..474a203aa 100644 --- a/public/views/onboarding/tour.html +++ b/public/views/onboarding/tour.html @@ -31,7 +31,7 @@

-
@@ -55,7 +55,7 @@

-
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index 04fa87401..4ca9842a2 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -49,9 +49,6 @@ } button { color:#fff; - &.next-slide { - background: rgba(215, 215, 215, 0.10); - } } } .col { From a8f212474a4aedfdca1165b722a4942b6a6e4016 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 14 Sep 2016 12:39:27 -0300 Subject: [PATCH 03/16] Amazon: not allow to buy gift card for amounts with more than 2 decimal places. Adds a confirmation before to purchase --- public/views/buyAmazon.html | 10 +++++----- public/views/includes/wallets.html | 4 ++-- src/js/controllers/buyAmazon.js | 8 ++++++++ src/sass/main.scss | 2 +- src/sass/views/includes/wallets.scss | 6 +----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index 92bdbdf46..cd5adc9c1 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -33,7 +33,7 @@
@@ -46,17 +46,17 @@ min="0.01" max="500" ng-model="fiat" + ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/" autocomplete="off" ignore-mouse-wheel required> USD - -
+ +
diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html index 3fa2178ff..9a1e6649f 100644 --- a/public/views/includes/wallets.html +++ b/public/views/includes/wallets.html @@ -4,8 +4,8 @@
- {{wallet.name || wallet.id}} - + {{wallet.name || wallet.id}} + {{wallet.m}}-of-{{wallet.n}} diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index b0b2d948d..0a57242e5 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -27,6 +27,14 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }; + this.confirm = function() { + var title = gettextCatalog.getString('Confirm Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat}); + var ok = gettextCatalog.getString('Buy'); + popupService.showConfirm(title, null, ok, null, function(res) { + if (res) self.createTx(); + }); + }; + this.createTx = function() { self.errorInfo = null; diff --git a/src/sass/main.scss b/src/sass/main.scss index ca2086550..4b06bd3a4 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -889,7 +889,7 @@ input[type=file] { } .wallets { - height: 90px; + height: 110px; } .bar .button.back-button { diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index 4f73f3ce6..4bd619f48 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -21,13 +21,9 @@ &.swiper-slide-next{ left:4%; } - span{ - float:right; - clear:both; - } } } .swiper-pagination{ visibility: hidden; } -} \ No newline at end of file +} From df30370e6705013d91d446b88cc0be4d6192fcea Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 14 Sep 2016 11:40:04 -0400 Subject: [PATCH 04/16] removed cat margin bottom at certain height --- src/sass/views/onboarding/onboard-push-notifications.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss index 3183291a0..1132317e7 100644 --- a/src/sass/views/onboarding/onboard-push-notifications.scss +++ b/src/sass/views/onboarding/onboard-push-notifications.scss @@ -29,6 +29,9 @@ } @media (max-height: 540px){ #onboarding-push-notifications{ + #cta{ + margin-bottom: 0; + } .cta-buttons{ float:left; position: relative; From c3e471a525be441763159923c31a37c2eda1203f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 14 Sep 2016 14:12:34 -0300 Subject: [PATCH 05/16] fix back routes on backup view when resume --- public/views/backup.html | 16 +++++++++------- public/views/onboarding/backupWarning.html | 2 +- src/js/controllers/backup.js | 10 ++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 92c835615..d176a5e68 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,11 +1,13 @@ - - - + + + -
+

Wallet recovery phrase not available.

@@ -18,7 +20,7 @@ -
+
{{word}}　
@@ -42,7 +44,7 @@ -
+
@@ -63,7 +65,7 @@ -
+
Enter your password