From 3a933959c1683e3d0ab51d6f5cfffbd14d883b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 2 Sep 2016 11:09:51 -0300 Subject: [PATCH 1/3] fix onboarding backup confirm and routes --- src/js/controllers/backup.js | 2 +- src/js/controllers/onboarding/backupWarning.js | 3 +-- src/js/routes.js | 17 +++++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index c301a7344..ce0cba754 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -136,7 +136,7 @@ angular.module('copayApp.controllers').controller('backupController', } } - profileService.setBackupFlag(walletClient.credentials.walletId); + profileService.setBackupFlag(wallet.credentials.walletId); return cb(); }, 1); }; diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js index 9067b1bf6..c1f99f516 100644 --- a/src/js/controllers/onboarding/backupWarning.js +++ b/src/js/controllers/onboarding/backupWarning.js @@ -10,8 +10,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun $scope.close = function() { backupWarningPopup.close(); - $state.go('wallet.backup', { - walletId: $stateParams.walletId, + $state.go('onboarding.backup', { fromOnboarding: true }) }; diff --git a/src/js/routes.js b/src/js/routes.js index 40dde5682..d513e287c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -272,16 +272,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.import', { - url: '/import/:fromOnboarding', + url: '/import', // abstract: true, views: { 'tab-home': { templateUrl: 'views/import.html' }, }, - params: { - code: null - }, }) .state('tabs.import.phrase', { url: '/tab-import-phrase', @@ -566,7 +563,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('onboarding', { - url: '/onboarding/:walletId', + url: '/onboarding/:walletId/:fromOnboarding', abstract: true, template: '' }) @@ -618,6 +615,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('onboarding.backup', { + url: '/backup', + views: { + 'onboarding': { + templateUrl: 'views/backup.html' + } + } + }) .state('onboarding.disclaimer', { url: '/disclaimer', views: { @@ -635,7 +640,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('onboarding.import', { - url: '/import/:fromOnboarding', + url: '/import', abstract: true, views: { 'onboarding': { From 314532c62af29d9af11fc171a0289aa3d869de23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 2 Sep 2016 11:15:03 -0300 Subject: [PATCH 2/3] fix email onboarding --- src/js/controllers/onboarding/collectEmail.js | 25 +++++++++++++------ src/js/controllers/preferencesEmail.js | 1 - 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 220c349e5..b5dbfc739 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -1,22 +1,33 @@ 'use strict'; -angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, walletService, platformInfo) { +angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, configService, walletService, platformInfo) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; var usePushNotifications = isCordova && !isWP; + 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) { - var wallet = profileService.getWallet($stateParams.walletId); - var email = $scope.email || ''; + var opts = { + emailFor: {} + }; + opts.emailFor[walletId] = $scope.email; walletService.updateRemotePreferences(wallet, { - email: email, + email: $scope.email, }, function(err) { if (err) $log.warn(err); - if (!usePushNotifications) $state.go('onboarding.backupRequest'); - else $state.go('onboarding.notifications'); + configService.set(opts, function(err) { + if (err) $log.warn(err); + if (!usePushNotifications) $state.go('onboarding.backupRequest'); + else $state.go('onboarding.notifications'); + }); }); }; - }); diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js index c916e6570..9970c1b21 100644 --- a/src/js/controllers/preferencesEmail.js +++ b/src/js/controllers/preferencesEmail.js @@ -11,7 +11,6 @@ angular.module('copayApp.controllers').controller('preferencesEmailController', $scope.email = config.emailFor && config.emailFor[walletId]; $scope.save = function(form) { - var email = $scope.email || ''; var opts = { emailFor: {} }; From 0a5efb4930758957818047ad39a6d31f4bfd8007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 2 Sep 2016 11:20:33 -0300 Subject: [PATCH 3/3] remove params from the url --- src/js/controllers/onboarding/backupWarning.js | 4 +--- src/js/controllers/onboarding/tour.js | 1 + src/js/routes.js | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js index c1f99f516..cb4aa4934 100644 --- a/src/js/controllers/onboarding/backupWarning.js +++ b/src/js/controllers/onboarding/backupWarning.js @@ -10,9 +10,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun $scope.close = function() { backupWarningPopup.close(); - $state.go('onboarding.backup', { - fromOnboarding: true - }) + $state.go('onboarding.backup'); }; } }); diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js index c5b69bde3..2590d8074 100644 --- a/src/js/controllers/onboarding/tour.js +++ b/src/js/controllers/onboarding/tour.js @@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('tourController', ongoingProcess.set('creatingWallet', false); var wallet = walletClient; $state.go('onboarding.collectEmail', { + fromOnboarding: true, walletId: wallet.credentials.walletId }); }); diff --git a/src/js/routes.js b/src/js/routes.js index d513e287c..501d46f26 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -563,9 +563,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('onboarding', { - url: '/onboarding/:walletId/:fromOnboarding', + url: '/onboarding', abstract: true, - template: '' + template: '', + params: { + walletId: null, + fromOnboarding: null, + }, }) .state('onboarding.welcome', { url: '/welcome',