From 1dd5bc791d43857fb3ca9de0c41dbf2ee35ec117 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 14 Jun 2016 15:11:56 -0300
Subject: [PATCH] rebase

---
 public/views/paperWallet.html                |  2 +-
 public/views/preferencesHistory.html         | 14 ++++++++------
 src/js/controllers/backup.js                 |  3 +--
 src/js/controllers/preferencesBwsUrl.js      |  4 ++--
 src/js/controllers/preferencesDeleteWords.js |  2 +-
 src/js/controllers/preferencesEmail.js       |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html
index c89a06dfe..630f9a066 100644
--- a/public/views/paperWallet.html
+++ b/public/views/paperWallet.html
@@ -7,7 +7,7 @@
 <div class="content preferences" ng-controller="paperWalletController as paperWallet">
   <h4 ng-show="!paperWallet.error"></h4>
   <div class="box-notification m20b" ng-show="paperWallet.error">
-    <span classs="text-warning">{{paperWallet.error|translate}}</span>
+    <span class="text-warning">{{paperWallet.error|translate}}</span>
   </div>
   <form ng-show="!paperWallet.balance" class="oh">
     <div class="row">
diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html
index c482def3a..afda46c85 100644
--- a/public/views/preferencesHistory.html
+++ b/public/views/preferencesHistory.html
@@ -5,13 +5,15 @@
 </div>
 <div class="content preferences" ng-controller="preferencesHistory">
   <h4></h4>
-  
-  <ul class="no-bullet m0" ng-if="!index.isCordova" ng-init="index.updatingTxHistory ? null : csvHistory()">
-    <li ng-if="csvReady">
-      <a ng-csv="csvContent" csv-header="csvHeader" ng-style="{'color':index.backgroundColor}"
-        filename="Copay-{{index.alias || index.walletName}}.csv" translate>Export to file</a>
+
+  <ul class="no-bullet m0">
+    <li ng-if="csvReady && !index.isCordova" ng-init="index.updatingTxHistory ? null : csvHistory()"
+      ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv">
+      <span ng-style="{'color':index.backgroundColor}" translate>
+        Export to file
+      </span>
     </li>
-    <li ng-if="!csvReady">
+    <li ng-if="!csvReady && !index.isCordova">
       <span translate>Export to file [preparing...]</span>
     </li>
     <li ng-click="clearTransactionHistory()" ng-style="{'color':index.backgroundColor}" translate>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index c1c22fe8e..12356e9cf 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('backupController',
-  function($rootScope, $scope, $timeout, $log, lodash, profileService, gettext, bwcService, bwsError, walletService, ongoingProcess) {
+  function($rootScope, $scope, $timeout, $log, go, lodash, profileService, gettext, bwcService, bwsError, walletService, ongoingProcess) {
 
     var fc = profileService.focusedClient;
     $scope.customWords = [];
@@ -41,7 +41,6 @@ angular.module('copayApp.controllers').controller('backupController',
     };
 
     $scope.backTo = function(state) {
-      console.log(state);
       if (state == 'walletHome')
         go.walletHome();
       else
diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js
index 515ba365a..e4af513c0 100644
--- a/src/js/controllers/preferencesBwsUrl.js
+++ b/src/js/controllers/preferencesBwsUrl.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
-  function($scope, $log, configService, go, applicationService, profileService, storageService) {
+  function($scope, $log, configService, applicationService, profileService, storageService) {
     $scope.error = null;
     $scope.success = null;
 
@@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
       opts.bwsFor[walletId] = $scope.bwsurl;
 
       configService.set(opts, function(err) {
-        if (err) console.log(err);
+        if (err) $log.debug(err);
         storageService.setCleanAndScanAddresses(walletId, function() {
           applicationService.restart();
         });
diff --git a/src/js/controllers/preferencesDeleteWords.js b/src/js/controllers/preferencesDeleteWords.js
index 7355e4bcc..2906cea2c 100644
--- a/src/js/controllers/preferencesDeleteWords.js
+++ b/src/js/controllers/preferencesDeleteWords.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('preferencesDeleteWordsController', function(confirmDialog, lodash, notification, profileService, go, gettext) {
+angular.module('copayApp.controllers').controller('preferencesDeleteWordsController', function($scope, confirmDialog, lodash, notification, profileService, go, gettext) {
   var fc = profileService.focusedClient;
   var msg = gettext('Are you sure you want to delete the recovery phrase?');
   var successMsg = gettext('Recovery phrase deleted');
diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js
index 84f8cf2d3..9baa87599 100644
--- a/src/js/controllers/preferencesEmail.js
+++ b/src/js/controllers/preferencesEmail.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, go, profileService, walletService) {
+angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, $scope, go, profileService, walletService) {
   $scope.save = function(form) {
     $scope.error = null;
     $scope.saving = true;