fixes
This commit is contained in:
parent
fd06a330c9
commit
8f40484a71
4 changed files with 10 additions and 13 deletions
|
|
@ -4,11 +4,6 @@
|
|||
<ion-nav-back-button>
|
||||
</ion-nav-back-button>
|
||||
<ion-nav-title>{{wallet.name}}</ion-nav-title>
|
||||
<ion-nav-buttons side="secondary">
|
||||
<button class="button back-button" ng-click="goHome()" ng-if="fromAddShared">
|
||||
{{'Close' | translate}}
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
</ion-nav-bar>
|
||||
|
||||
<ion-content>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
angular.module('copayApp.controllers').controller('copayersController',
|
||||
function($scope, $log, $ionicNavBarDelegate, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
|
||||
|
||||
$scope.$on("$ionicView.enter", function(event, data) {
|
||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||
init();
|
||||
});
|
||||
|
||||
var init = function() {
|
||||
$scope.fromAddShared = $stateParams.fromAddShared;
|
||||
$scope.isCordova = platformInfo.isCordova;
|
||||
$scope.wallet = profileService.getWallet($stateParams.walletId);
|
||||
updateWallet();
|
||||
|
|
|
|||
|
|
@ -178,12 +178,15 @@ angular.module('copayApp.controllers').controller('createController',
|
|||
|
||||
if (!client.isComplete()) {
|
||||
$ionicHistory.nextViewOptions({
|
||||
disableBack: true
|
||||
});
|
||||
$state.go('tabs.copayers', {
|
||||
walletId: client.credentials.walletId,
|
||||
fromAddShared: true
|
||||
disableAnimate: true
|
||||
});
|
||||
$ionicHistory.removeBackView();
|
||||
$state.go('tabs.home');
|
||||
$timeout(function() {
|
||||
$state.transitionTo('tabs.copayers', {
|
||||
walletId: client.credentials.walletId
|
||||
});
|
||||
}, 100);
|
||||
}
|
||||
else $state.go('tabs.home')
|
||||
});
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
*/
|
||||
|
||||
.state('tabs.copayers', {
|
||||
url: '/copayers/:walletId/:fromAddShared',
|
||||
url: '/copayers/:walletId',
|
||||
views: {
|
||||
'tab-home': {
|
||||
templateUrl: 'views/copayers.html',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue