mirror of https://github.com/BTCPrivate/copay.git
fix onboarding backup confirm and routes
This commit is contained in:
parent
e286e7ea56
commit
3a933959c1
|
@ -136,7 +136,7 @@ angular.module('copayApp.controllers').controller('backupController',
|
|||
}
|
||||
}
|
||||
|
||||
profileService.setBackupFlag(walletClient.credentials.walletId);
|
||||
profileService.setBackupFlag(wallet.credentials.walletId);
|
||||
return cb();
|
||||
}, 1);
|
||||
};
|
||||
|
|
|
@ -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
|
||||
})
|
||||
};
|
||||
|
|
|
@ -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': {
|
||||
|
|
Loading…
Reference in New Issue