From 845bf1063f222d031060aeaf13c282e8693eb5d9 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 29 Sep 2016 15:21:43 -0400 Subject: [PATCH] added wallet id to disclaimer route params --- src/js/controllers/backup.js | 2 +- src/js/controllers/onboarding/backupRequest.js | 2 +- src/js/controllers/onboarding/disclaimer.js | 2 +- src/js/routes.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 0a6ffd5d1..b8d21bc90 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -91,7 +91,7 @@ angular.module('copayApp.controllers').controller('backupController', $ionicHistory.removeBackView(); $state.go('tabs.home'); } - else $state.go('onboarding.disclaimer', {backedUp: false}); + else $state.go('onboarding.disclaimer', {walletId: $stateParams.walletId, backedUp: true}); }); }; diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index 41d868045..e2290e62c 100644 --- a/src/js/controllers/onboarding/backupRequest.js +++ b/src/js/controllers/onboarding/backupRequest.js @@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun var cancelText = gettextCatalog.getString('Go back'); popupService.showConfirm(title, message, okText, cancelText, function(val) { if (val) { - $state.go('onboarding.disclaimer', {backedUp: false}); + $state.go('onboarding.disclaimer', {walletId: $scope.walletId, backedUp: false}); } }); } diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js index 08515d690..6298cac08 100644 --- a/src/js/controllers/onboarding/disclaimer.js +++ b/src/js/controllers/onboarding/disclaimer.js @@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi }; $scope.goBack = function(){ - $state.go('onboarding.backupRequest'); + $state.go('onboarding.backupRequest', {walletId: $stateParams.walletId}); } diff --git a/src/js/routes.js b/src/js/routes.js index 23f9c8264..87393f20c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -685,7 +685,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('onboarding.disclaimer', { - url: '/disclaimer/:backedUp', + url: '/disclaimer/:walletId/:backedUp', views: { 'onboarding': { templateUrl: 'views/onboarding/disclaimer.html'