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

Fixes if last focused wallet is undefined

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-10-21 10:54:19 -03:00 • committed by Matias Alejo Garcia
commit 19f6118f7f
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/models/Profile.js
View file

@ -148,10 +148,18 @@ Profile.prototype.setLastFocusedTs = function(walletId, cb) {
Profile.prototype.getLastFocusedWallet = function() {
var self = this;
var last;
var maxTs = _.max(_.pluck(self.walletInfos, 'lastFocusedTs'));
var last = _.findWhere(_.values(self.walletInfos), {
var wallets = _.values(self.walletInfos);
last = _.findWhere(wallets, {
lastFocusedTs: maxTs
});
if (!last) {
last = _.last(wallets);
}
return last ? last.id : null;
};

2
views/includes/sidebar.html
View file

@ -1,5 +1,5 @@
<div ng-controller="SidebarController">
<header ng-click="toggleWalletSelection()">
<header ng-click="toggleWalletSelection()" ng-show="$root.wallet">
<!-- <div ng&#45;show="$root.wallet.isShared()" ng&#45;include="'views/includes/peer&#45;list.html'"></div> -->
<div class="col1 avatar-wallet m10r">
<span>P</span>