From 3a933959c1683e3d0ab51d6f5cfffbd14d883b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 2 Sep 2016 11:09:51 -0300
Subject: [PATCH] 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: '<ion-nav-view name="onboarding"></ion-nav-view>'
       })
@@ -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': {