Merge pull request #55 from JDonadio/fix/empty-object

Fix empty object - navigate to home
This commit is contained in:
Matias Alejo Garcia 2016-09-02 16:43:23 -03:00 committed by GitHub
commit 88b1ca2ffb
2 changed files with 2 additions and 2 deletions

View file

@ -101,7 +101,7 @@
<div translate> <div translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time. Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div> </div>
<button class="button button-block button-positive" href ui-sref="walletHome" ng-click="scan()" translate> <button class="button button-block button-positive" ng-click="scan()" translate>
Scan addresses for funds Scan addresses for funds
</button> </button>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate> <button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate>

View file

@ -22,7 +22,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
} }
allTxs.push(txsFromLocal); allTxs.push(txsFromLocal);
return cb(null, lodash.flatten(allTxs)); return cb(null, lodash.compact(lodash.flatten(allTxs)));
}); });
}; };