mirror of https://github.com/BTCPrivate/copay.git
Fixes path to allAddresses from walletDetails
This commit is contained in:
parent
dbd137f0a4
commit
1cd1fdafd5
|
@ -141,7 +141,14 @@ angular.module('copayApp.controllers').controller('addressesController', functio
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.viewAllAddresses = function() {
|
$scope.viewAllAddresses = function() {
|
||||||
$state.go('tabs.settings.allAddresses', {
|
var fromView = $ionicHistory.currentStateName();
|
||||||
|
var path;
|
||||||
|
if (fromView.indexOf('settings') !== -1) {
|
||||||
|
path = 'tabs.settings.allAddresses';
|
||||||
|
} else {
|
||||||
|
path = 'tabs.wallet.allAddresses';
|
||||||
|
}
|
||||||
|
$state.go(path, {
|
||||||
walletId: $scope.wallet.id
|
walletId: $scope.wallet.id
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -202,6 +202,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
.state('tabs.wallet.addresses', {
|
||||||
|
url: '/addresses/:walletId/:toAddress',
|
||||||
|
views: {
|
||||||
|
'tab-home@tabs': {
|
||||||
|
controller: 'addressesController',
|
||||||
|
templateUrl: 'views/addresses.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('tabs.wallet.allAddresses', {
|
||||||
|
url: '/allAddresses/:walletId',
|
||||||
|
views: {
|
||||||
|
'tab-home@tabs': {
|
||||||
|
controller: 'addressesController',
|
||||||
|
templateUrl: 'views/allAddresses.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Tabs
|
* Tabs
|
||||||
|
|
|
@ -248,6 +248,7 @@
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
z-index: 9999;
|
z-index: 9999;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
padding: 2px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.item {
|
a.item {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<ion-view id="addresses" class="addr">
|
<ion-view id="addresses" class="addr" hide-tabs>
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
<ion-nav-title>{{'Wallet Addresses' | translate}}</ion-nav-title>
|
<ion-nav-title>{{'Wallet Addresses' | translate}}</ion-nav-title>
|
||||||
<ion-nav-back-button>
|
<ion-nav-back-button>
|
||||||
|
|
|
@ -159,7 +159,7 @@
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
|
||||||
<a class="wallet-not-backed-up-warning" ng-if="lowUtxosWarning" ui-sref="tabs.settings.addresses({walletId:wallet.id,from: 'tabs.wallet'})" translate>
|
<a class="wallet-not-backed-up-warning" ng-if="lowUtxosWarning" ui-sref="tabs.wallet.addresses({walletId:wallet.id,from: 'tabs.wallet'})" translate>
|
||||||
Spending this balance will need significant Bitcoin network fees
|
Spending this balance will need significant Bitcoin network fees
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue