diff --git a/public/views/includes/confirmBackupPopup.html b/public/views/includes/confirmBackupPopup.html index 5dc2d2eeb..c77308c05 100644 --- a/public/views/includes/confirmBackupPopup.html +++ b/public/views/includes/confirmBackupPopup.html @@ -1,19 +1,9 @@ -
+
Your bitcoin wallet is backed up!

Be sure to store your recovery phrase in a secure place. If this app is deelted, you money coont be recovered with out it.

-
-
uh oh...
-

It's importante that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money - Please review your backup and try again

- -
diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html index 5629d5c8c..a63f2c652 100644 --- a/public/views/onboarding/collectEmail.html +++ b/public/views/onboarding/collectEmail.html @@ -1,11 +1,4 @@ - - - - -
@@ -14,16 +7,42 @@

Wallet Created

-
-

Where would you like to receive email notifications about payments?

+
+
+

Where would you like to receive email notifications about payments?

+
+
+ +
+
+
+
+

Is this email address correct?

+
+
+

{{email}}

+
+
+
+ +
+
+ +
+
+
+
+
+
-
- -
-
-
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index de6f258a9..681ffd081 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($rootScope, $scope, $timeout, $log, $state, $stateParams, $ionicPopup, $ionicNavBarDelegate, uxLanguage, lodash, fingerprintService, platformInfo, configService, profileService, bwcService, walletService, ongoingProcess, storageService) { + function($rootScope, $scope, $timeout, $log, $state, $stateParams, $ionicPopup, $ionicNavBarDelegate, uxLanguage, lodash, fingerprintService, platformInfo, configService, profileService, bwcService, walletService, ongoingProcess, storageService, popupService, gettextCatalog) { var wallet = profileService.getWallet($stateParams.walletId); $ionicNavBarDelegate.title(wallet.credentials.walletName); $scope.n = wallet.n; @@ -87,24 +87,29 @@ angular.module('copayApp.controllers').controller('backupController', }; var openPopup = function() { - var confirmBackupPopup = $ionicPopup.show({ - templateUrl: "views/includes/confirmBackupPopup.html", - scope: $scope, - }); - $scope.closePopup = function(val) { - if (val) { + if ($scope.backupError) { + var title = gettextCatalog.getString('uh oh...'); + var message = gettextCatalog.getString("It's importante that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money Please review your backup and try again"); + popupService.showAlert(title, message, function() { + $scope.goToStep(1); + }) + } + else { + var confirmBackupPopup = $ionicPopup.show({ + templateUrl: "views/includes/confirmBackupPopup.html", + scope: $scope, + }); + + $scope.closePopup = function() { confirmBackupPopup.close(); if ($stateParams.fromOnboarding) $state.go('onboarding.disclaimer'); else { $ionicHistory.clearHistory(); - $state.go('tabs.home'); + $state.go('tabs.home') } - } else { - confirmBackupPopup.close(); - $scope.goToStep(1); - } - }; + }; + } } var confirm = function(cb) { diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index 8284baafb..01fcfcfcd 100644 --- a/src/js/controllers/onboarding/backupRequest.js +++ b/src/js/controllers/onboarding/backupRequest.js @@ -1,22 +1,28 @@ 'use strict'; -angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup) { +angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup, popupService, gettextCatalog) { $scope.walletId = $stateParams.walletId; + $scope.openPopup = function() { - var backupLaterPopup = $ionicPopup.show({ - templateUrl: "views/includes/backupLaterPopup.html", - scope: $scope, + + var title = gettextCatalog.getString('Without a backup, you could lose money'); + var message = gettextCatalog.getString('If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can recover your funds'); + var okText = gettextCatalog.getString('I understand'); + var cancelText = gettextCatalog.getString('Go back'); + popupService.showConfirm(title, message, okText, cancelText, function(val) { + if (val) { + var title = gettextCatalog.getString('Are you sure you want to skip the backup?'); + var message = gettextCatalog.getString('You can create a backup later from your wallet settings'); + var okText = gettextCatalog.getString('Yes, skip backup'); + var cancelText = gettextCatalog.getString('Go back'); + popupService.showConfirm(title, message, okText, cancelText, function(val) { + if (val) { + $state.go('onboarding.disclaimer'); + } + }); + } }); - - $scope.goBack = function() { - backupLaterPopup.close(); - }; - - $scope.continue = function() { - backupLaterPopup.close(); - $state.go('onboarding.disclaimer'); - }; } }); diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 8fcda40f5..6479e0ea8 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, configService, walletService, platformInfo) { +angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, profileService, configService, walletService, platformInfo) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; @@ -9,11 +9,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; - var config = configService.getSync(); - config.emailFor = config.emailFor || {}; - $scope.email = config.emailFor && config.emailFor[walletId]; - - $scope.save = function(form) { + $scope.save = function() { var opts = { emailFor: {} }; @@ -25,13 +21,32 @@ angular.module('copayApp.controllers').controller('collectEmailController', func if (err) $log.warn(err); configService.set(opts, function(err) { if (err) $log.warn(err); - if (!usePushNotifications) $state.go('onboarding.backupRequest', {walletId: walletId}); - else $state.go('onboarding.notifications', {walletId: walletId}); + if (!usePushNotifications) $state.go('onboarding.backupRequest', { + walletId: walletId + }); + else $state.go('onboarding.notifications', { + walletId: walletId + }); }); }); }; + $scope.confirm = function(emailForm) { + if (emailForm.$invalid) return; + $scope.confirmation = true; + $scope.email = emailForm.email.$modelValue; + }; + + $scope.cancel = function() { + $scope.confirmation = false; + $timeout(function() { + $scope.$digest(); + }, 1); + }; + $scope.onboardingMailSkip = function() { - $state.go('onboarding.backupRequest', {walletId: walletId}); + $state.go('onboarding.backupRequest', { + walletId: walletId + }); }; }); diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index c94e6df6a..a510ca153 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -10,14 +10,19 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni if (!cb) cb = function() {}; $ionicPopup.alert({ title: title, - template: message + template: message, + okType: 'button-clear button-positive' }).then(cb); }; - var _ionicConfirm = function(title, message, cb) { + var _ionicConfirm = function(title, message, okText, cancelText, cb) { $ionicPopup.confirm({ title: title, - template: message + template: message, + cancelText: cancelText, + cancelType: 'button-clear button-positive', + okText: okText, + okType: 'button-clear button-positive' }).then(function(res) { return cb(res); }); @@ -42,16 +47,16 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni navigator.notification.alert(message, cb, title); }; - var _cordovaConfirm = function(title, message, cb) { - var onConfirm = function (buttonIndex) { + var _cordovaConfirm = function(title, message, okText, cancelText, cb) { + var onConfirm = function(buttonIndex) { if (buttonIndex == 1) return cb(true); else return cb(false); } - navigator.notification.confirm(message, onConfirm, title); + navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]); }; var _cordovaPrompt = function(title, message, cb) { - var onPrompt = function (results) { + var onPrompt = function(results) { if (results.buttonIndex == 1) return cb(results.input1); else return cb(); } @@ -81,17 +86,19 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni * * @param {String} Title * @param {String} Message + * @param {String} okText + * @param {String} cancelText * @param {Callback} Function * @returns {Callback} OK: true, Cancel: false */ - this.showConfirm = function(title, message, cb) { + this.showConfirm = function(title, message, okText, cancelText, cb) { $log.warn(title + ": " + message); if (isCordova) - _cordovaConfirm(title, message, cb); + _cordovaConfirm(title, message, okText, cancelText, cb); else - _ionicConfirm(title, message, cb); + _ionicConfirm(title, message, okText, cancelText, cb); }; /** diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss index 3cc60ce01..ad0be19fb 100644 --- a/src/sass/views/onboarding/onboard-collect-email.scss +++ b/src/sass/views/onboarding/onboard-collect-email.scss @@ -14,25 +14,22 @@ margin-top: 1rem; margin-bottom: 1rem; } - .collect-overlay, .bar-overlay { - animation-name: opacity; - animation-iteration-count: 1; - animation-timing-function: ease-in; - animation-duration: .2s; - animation-delay: .8s; - animation-fill-mode: forwards; - opacity: 0; - } - .collect-overlay{ - top:-1px; - } - .bar-overlay{ - background: rgba(0, 0, 0, 0.23); - .button-clear{ - color:#fff; - min-width: 100%; - } - } + .collect-overlay { + animation-name: opacity; + animation-iteration-count: 1; + animation-timing-function: ease-in; + animation-duration: .2s; + animation-delay: .8s; + animation-fill-mode: forwards; + opacity: 0; + button { + position: absolute; + right: 11px; + } + } + .collect-overlay{ + top:-1px; + } #collect-email { opacity: 1; background: #fff; @@ -52,10 +49,7 @@ label { background: rgba(200, 200, 200, 0.20); height: 3rem; - margin-top: 0; - input { - position: absolute; - } + margin-top:0; i { position: absolute; right: 3%;