Sandbox version. Only for testing purpose
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index e17426e5b..2a92cc6de 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -76,7 +76,7 @@
-
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index fe199d85d..752c91fa7 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -98,23 +98,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
});
};
- this.init = function() {
- $scope.dateRange = 'last30Days';
-
- $scope.network = bitpayCardService.getEnvironment();
- $scope.wallets = profileService.getWallets({
- network: $scope.network,
- onlyComplete: true
- });
-
- self.update();
-
- wallet = $scope.wallets[0];
-
- if (wallet && wallet.credentials.n > 1)
- self.isMultisigWallet = true;
- };
-
this.sendFunds = function() {
if (lodash.isEmpty(wallet)) return;
@@ -258,5 +241,22 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
return tx.description;
};
+ $scope.$on("$ionicView.beforeEnter", function(event, data){
+ $scope.dateRange = 'last30Days';
+
+ $scope.network = bitpayCardService.getEnvironment();
+ $scope.wallets = profileService.getWallets({
+ network: $scope.network,
+ onlyComplete: true
+ });
+
+ self.update();
+
+ wallet = $scope.wallets[0];
+
+ if (wallet && wallet.credentials.n > 1)
+ self.isMultisigWallet = true;
+ });
+
});
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 41444b0d9..ae0f7cb3c 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
});
}
- $state.go('tabs.details', {
+ $state.go('tabs.wallet', {
walletId: wallet.credentials.walletId
});
};
diff --git a/src/js/routes.js b/src/js/routes.js
index ba828213c..e81fa76b2 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -150,10 +150,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*
*/
- .state('tabs.details', {
- url: '/details/{walletId}/{fromOnboarding}',
+ .state('tabs.wallet', {
+ url: '/wallet/{walletId}/{fromOnboarding}',
views: {
- 'tab-home': {
+ 'tab-home@tabs': {
controller: 'walletDetailsController',
templateUrl: 'views/walletDetails.html'
}
@@ -166,7 +166,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.activity', {
url: '/activity',
views: {
- 'tab-home': {
+ 'tab-home@tabs': {
controller: 'activityController',
templateUrl: 'views/activity.html',
}
@@ -175,7 +175,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('tabs.proposals', {
url: '/proposals',
views: {
- 'tab-home': {
+ 'tab-home@tabs': {
controller: 'proposalsController',
templateUrl: 'views/proposals.html',
}
@@ -836,29 +836,26 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
- /*
- *
- * BitPay Card
- *
- */
+ /*
+ *
+ * BitPay Card
+ *
+ */
- .state('bitpayCard', {
- url: '/bitpayCard',
- abstract: true,
- template: ''
- })
- .state('bitpayCard.main', {
- url: '/main',
+ .state('tabs.bitpayCard', {
+ url: '/bitpay-card',
views: {
- 'bitpayCard': {
+ 'tab-home@tabs': {
+ controller: 'bitpayCardController',
+ controllerAs: 'bitpayCard',
templateUrl: 'views/bitpayCard.html'
}
}
})
- .state('bitpayCard.preferences', {
+ .state('tabs.bitpayCard.preferences', {
url: '/preferences',
views: {
- 'bitpayCard': {
+ 'tab-home@tabs': {
templateUrl: 'views/preferencesBitpayCard.html'
}
}
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 0dea73fb0..ace8bbb11 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -833,7 +833,7 @@ angular.module('copayApp.services')
x.action = function() {
// TODO?
- // $state.go('tabs.details', {
+ // $state.go('tabs.wallet', {
// walletId: x.walletId,
// txpId: x.txpId,
// txid: x.txid,