From 0efbf28f1adaaa17afa555b368acfb462c639ca8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 16 Feb 2016 12:33:39 -0500
Subject: [PATCH] Generate CSV using a new plugin

---
 Gruntfile.js                         |  2 ++
 bower.json                           |  4 +--
 public/views/preferencesHistory.html |  6 ++--
 public/views/walletHome.html         |  2 +-
 src/js/app.js                        |  2 ++
 src/js/controllers/index.js          | 46 +++++++++++++++-------------
 6 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 145003bee..f08be00c4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -59,6 +59,8 @@ module.exports = function(grunt) {
           'bower_components/angular-gettext/dist/angular-gettext.js',
           'bower_components/angular-touch/angular-touch.js',
           'bower_components/angular-ui-switch/angular-ui-switch.js',
+          'bower_components/angular-sanitize/angular-sanitize.js',
+          'bower_components/ng-csv/build/ng-csv.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'
         ],
         dest: 'public/lib/angular.js'
diff --git a/bower.json b/bower.json
index 88cd4e206..02e83cbf4 100644
--- a/bower.json
+++ b/bower.json
@@ -22,7 +22,7 @@
     "moment": "2.10.3",
     "ng-lodash": "0.2.3",
     "qrcode-decoder-js": "*",
-    "trezor-connect": "~1.0.1"
+    "trezor-connect": "~1.0.1",
+    "ng-csv": "~0.3.6"
   }
 }
-
diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html
index 5e93b65c9..5708d87f9 100644
--- a/public/views/preferencesHistory.html
+++ b/public/views/preferencesHistory.html
@@ -7,9 +7,9 @@
   <h4></h4>
   <ul class="no-bullet m0">
     <li>
-      <div ng-show="!index.isCordova">
-        <input id="export_file" type="file" nwsaveas="Copay-{{index.alias || index.walletName}}.csv" accept=".csv" style="display:none">
-        <a ng-style="{'color':index.backgroundColor}" ng-click="index.csvHistory();">
+      <div ng-if="!index.isCordova" ng-init="index.csvHistory()">
+
+        <a ng-style="{'color':index.backgroundColor}" ng-csv="index.csvContent" csv-header="index.csvHeader" filename="{{ index.csvFilename }}">
           <span translate>Export to file</span>
         </a>
       </div>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index c75a3e09e..aedf6e901 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -175,7 +175,7 @@
             <div translate>Updating transaction history. Please stand by.</div>
           </div>
         </div>
-      </div>
+      </div> 
 
       <div class="oh pr" ng-show="index.txHistory[0]">
         <h4 class="title m0">
diff --git a/src/js/app.js b/src/js/app.js
index 7468ccbd9..061e38b1c 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -8,6 +8,8 @@ var modules = [
   'gettext',
   'ngLodash',
   'uiSwitch',
+  'ngSanitize', 
+  'ngCsv',
   'bwcModule',
   'copayApp.filters',
   'copayApp.services',
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 0a74e8170..d256afeda 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -768,7 +768,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $log.debug('Generating CSV from History');
     self.setOngoingProcess('generatingCSV', true);
 
-    $timeout(function() {
       getHistory(function(err, txs) {
         self.setOngoingProcess('generatingCSV', false);
         if (err) {
@@ -779,14 +778,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
           self.satToUnit = 1 / self.unitToSatoshi;
           var data = txs;
           var satToBtc = 1 / 100000000;
-          var filename = 'Copay-' + (self.alias || self.walletName) + '.csv';
-          var csvContent = '';
-
-          if (!isNode) csvContent = 'data:text/csv;charset=utf-8,';
-          csvContent += 'Date,Destination,Note,Amount,Currency,Txid,Creator,Copayers\n';
+          self.csvContent = [];
+          self.csvFilename = 'Copay-' + (self.alias || self.walletName) + '.csv';
+          self.csvHeader = ['Date', 'Destination', 'Note', 'Amount', 'Currency', 'Txid', 'Creator', 'Copayers'];
 
           var _amount, _note, _copayers, _creator;
-          var dataString;
           data.forEach(function(it, index) {
             var amount = it.amount;
 
@@ -810,28 +806,34 @@ angular.module('copayApp.controllers').controller('indexController', function($r
             if (it.action == 'moved')
               _note += ' Moved:' + (it.amount * satToBtc).toFixed(8)
 
-            dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + _note + ',' + _amount + ',BTC,' + it.txid + ',' + _creator + ',' + _copayers;
-            csvContent += dataString + "\n";
+            self.csvContent.push({
+              'Date': formatDate(it.time * 1000),
+              'Destination': formatString(it.addressTo),
+              'Note': _note,
+              'Amount': _amount,
+              'Currency': 'BTC',
+              'Txid': it.txid,
+              'Creator': _creator,
+              'Copayers': _copayers
+            });
 
             if (it.fees && (it.action == 'moved' || it.action == 'sent')) {
               var _fee = (it.fees * satToBtc).toFixed(8)
-              csvContent += formatDate(it.time * 1000) + ',Bitcoin Network Fees,, -' + _fee + ',BTC,,,' + "\n";
+              self.csvContent.push({
+                'Date': formatDate(it.time * 1000),
+                'Destination': 'Bitcoin Network Fees',
+                'Note': '',
+                'Amount': '-'+_fee,
+                'Currency': 'BTC',
+                'Txid': '',
+                'Creator': '',
+                'Copayers': ''
+              });
             }
           });
-
-          if (isNode) {
-            saveFile('#export_file', csvContent);
-          } else {
-            var encodedUri = encodeURI(csvContent);
-            var link = document.createElement("a");
-            link.setAttribute("href", encodedUri);
-            link.setAttribute("download", filename);
-            link.click();
-          }
+          return;
         }
-        $rootScope.$apply();
       });
-    });
   };
 
   self.removeSoftConfirmedTx = function(txs) {