From 42289004c6de695de59aa9239e4e27ca4b6777a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 17 Oct 2016 16:22:29 -0300 Subject: [PATCH] better messages in advance transaction history options --- src/js/controllers/preferencesHistory.js | 10 ++++++++-- www/views/preferencesHistory.html | 21 ++++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js index 9fb6f3c7e..68366fd15 100644 --- a/src/js/controllers/preferencesHistory.js +++ b/src/js/controllers/preferencesHistory.js @@ -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; } diff --git a/www/views/preferencesHistory.html b/www/views/preferencesHistory.html index cf68aace7..0b7603c04 100644 --- a/www/views/preferencesHistory.html +++ b/www/views/preferencesHistory.html @@ -1,4 +1,4 @@ - + {{'Transaction History' | translate}} @@ -6,17 +6,20 @@
- - -
- Clear cache -
+ + {{err | translate}} + +
+ + Clear cache +