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? - - - Allow notifications - Not now + + + + + + Allow notifications + Not now + 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";
Would you like to receive push notifications about payments? - - - Allow notifications - Not now +