anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #172 from cmgustavo/matias/bug/notif3-layout-pending

Browse source 
Clean pendingForUs when change wallet. Fix root.go
This commit is contained in:
Matias Alejo Garcia 2015-04-24 03:19:36 -03:00
commit dc0e0bb91f
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/index.js
View file

@ -74,6 +74,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.notAuthorized = false;
self.txHistory = [];
self.txHistoryPaging = false;
self.pendingTxProposalsCountForUs = null;
$timeout(function() {
self.hasProfile = true;

4
src/js/controllers/topbar.js
View file

@ -124,4 +124,8 @@ angular.module('copayApp.controllers').controller('topbarController', function($
}
};
this.goHome = function() {
go.walletHome();
};
});

4
src/js/routes.js
View file

@ -192,7 +192,7 @@ angular
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'Preferences';
$scope.closeToState = 'walletHome';
$scope.closeToHome = true;
}
}
}
@ -347,7 +347,7 @@ angular
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'Add wallet';
$scope.goBackToState = 'walletHome';
$scope.closeToHome = true;
}
}
}