mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #57 from gabrielbazan7/fix/routes
fix activity and proposals transitions
This commit is contained in:
commit
42594fb390
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="list card" ng-hide="!txps[0]">
|
<div class="list card" ng-hide="!txps[0]">
|
||||||
<a class="item item-icon-right item-heading" ui-sref="proposals" translate>
|
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
|
||||||
Payment Proposals
|
Payment Proposals
|
||||||
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
|
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card">
|
<div class="list card">
|
||||||
<a class="item item-icon-right item-heading" ui-sref="activity" translate>
|
<a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
|
||||||
Recent Activity
|
Recent Activity
|
||||||
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
|
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -143,14 +143,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
url: '/uri-coinbase/:url',
|
url: '/uri-coinbase/:url',
|
||||||
templateUrl: 'views/coinbaseUri.html'
|
templateUrl: 'views/coinbaseUri.html'
|
||||||
})
|
})
|
||||||
.state('activity', {
|
|
||||||
url: '/activity',
|
|
||||||
templateUrl: 'views/activity.html'
|
|
||||||
})
|
|
||||||
.state('proposals', {
|
|
||||||
url: '/proposals',
|
|
||||||
templateUrl: 'views/proposals.html'
|
|
||||||
})
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
@ -159,17 +151,33 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.details', {
|
.state('tabs.details', {
|
||||||
url: '/details/{walletId}/{fromOnboarding}',
|
url: '/details/{walletId}/{fromOnboarding}',
|
||||||
views: {
|
views: {
|
||||||
'tab-home': {
|
'tab-home': {
|
||||||
templateUrl: 'views/walletDetails.html'
|
templateUrl: 'views/walletDetails.html'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
txid: null,
|
||||||
|
txpId: null,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.state('tabs.activity', {
|
||||||
|
url: '/activity',
|
||||||
|
views: {
|
||||||
|
'tab-home': {
|
||||||
|
templateUrl: 'views/activity.html',
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
})
|
||||||
params: {
|
.state('tabs.proposals', {
|
||||||
txid: null,
|
url: '/proposals',
|
||||||
txpId: null,
|
views: {
|
||||||
},
|
'tab-home': {
|
||||||
})
|
templateUrl: 'views/proposals.html',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
@ -812,21 +820,21 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
|
|
||||||
$ionicPlatform.registerBackButtonAction(function(e) {
|
$ionicPlatform.registerBackButtonAction(function(e) {
|
||||||
|
|
||||||
var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : '';
|
var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : '';
|
||||||
var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : '';
|
var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : '';
|
||||||
|
|
||||||
if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) {
|
if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) {
|
||||||
ionic.Platform.exitApp();
|
ionic.Platform.exitApp();
|
||||||
} else if ($ionicHistory.backView() && !fromTabs) {
|
} else if ($ionicHistory.backView() && !fromTabs) {
|
||||||
$ionicHistory.goBack();
|
$ionicHistory.goBack();
|
||||||
} else {
|
} else {
|
||||||
$rootScope.backButtonPressedOnceToExit = true;
|
$rootScope.backButtonPressedOnceToExit = true;
|
||||||
window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit'));
|
window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit'));
|
||||||
setInterval(function() {
|
setInterval(function() {
|
||||||
$rootScope.backButtonPressedOnceToExit = false;
|
$rootScope.backButtonPressedOnceToExit = false;
|
||||||
}, 5000);
|
}, 5000);
|
||||||
}
|
}
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
}, 101);
|
}, 101);
|
||||||
|
|
||||||
$ionicPlatform.on('pause', function() {
|
$ionicPlatform.on('pause', function() {
|
||||||
|
|
Loading…
Reference in New Issue