fix onboarding backup confirm and routes

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);
     };

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', {
+      $state.go('onboarding.backup', {
-        walletId: $stateParams.walletId,
         fromOnboarding: true
       })
     };

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': {