BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #513 from gabrielbazan7/fix/history 

better messages in advanced transaction history options
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-17 17:13:23 -03:00 committed by GitHub
parent c02eaa6110 42289004c6
commit 3ac30e8472
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/controllers/preferencesHistory.js
View File

@ -28,8 +28,14 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
$log.debug('Generating CSV from History');
getHistory(function(err, txs) {
if (err || lodash.isEmpty(txs)) {
if (err) $log.warn('Failed to generate CSV:', err);
else $log.warn('Failed to generate CSV: no transactions');
if (err) {
$log.warn('Failed to generate CSV:', err);
$scope.err = err;
}
else {
$log.warn('Failed to generate CSV: no transactions');
$scope.err = 'no transactions';
}
if (cb) return cb(err);
return;
}

21
www/views/preferencesHistory.html
View File

@ -1,4 +1,4 @@
<ion-view>
<ion-view class="settings">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Transaction History' | translate}}</ion-nav-title>
<ion-nav-back-button>
@ -6,17 +6,20 @@
</ion-nav-bar>
<ion-content>
<div class="item item-divider"></div>
<div class="item" ng-show="csvReady && !isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{wallet.name}}.csv">
<a class="item ng-hide" href ng-show="csvReady && !isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{wallet.name}}.csv">
<span translate>Export to file</span>
</div>
<div class="item" ng-show="!csvReady && !isCordova">
</a>
<a class="item ng-hide" href ng-show="!csvReady && !isCordova">
<span translate>Export to file</span>
<span class="item-note" translate>
<span class="item-note ng-hide" ng-show="!err" translate>
preparing...
</span>
</div>
<div class="item assertive" ng-click="clearTransactionHistory()">
<span translate>Clear cache</span>
</div>
<span class="item-note ng-hide" ng-show="err">
{{err | translate}}
</span>
</a>
<a class="item" ng-click="clearTransactionHistory()">
<span class="assertive" translate>Clear cache</span>
</a>
</ion-content>
</ion-view>