Merge 0fa3f53 into a3e9078

apps/finance/app/package.json

@@ -12,7 +12,7 @@
     "bn.js": "^4.11.8",
     "core-js": "^2.6.5",
     "date-fns": "2.0.0-alpha.22",
-    "downloadjs": "^1.4.7",
+    "file-saver": "^2.0.1",
     "lodash.throttle": "^4.1.1",
     "prop-types": "^15.7.2",
     "qrcode.react": "^0.8.0",

apps/finance/app/src/components/Transfers.js

@@ -16,7 +16,7 @@ import {
   useViewport,
   theme,
 } from '@aragon/ui'
-import download from 'downloadjs'
+import { saveAs } from 'file-saver'
 import * as TransferTypes from '../transfer-types'
 import { addressesEqual, toChecksumAddress } from '../lib/web3-utils'
 import { formatTokenAmount } from '../lib/utils'
@@ -89,19 +89,14 @@ const getDownloadData = async (transfers, tokenDetails, resolveAddress) => {
       }
     )
   )
-  const csvContent = [
-    'data:text/csv;charset=utf-8,Date,Name,Source/Recipient,Reference,Amount',
-  ]
-    .concat(mappedData)
-    .join('\n')
-  return window.encodeURI(csvContent)
+  return ['Date,Name,Source/Recipient,Reference,Amount'].concat(mappedData)
 }
 const getDownloadFilename = (dao, { start, end }) => {
   const today = format(Date.now(), 'yyyy-MM-dd')
   let filename = `finance_${dao}_${today}.csv`
   if (start && end) {
-    const formattedStart = format(selectedDateRange.start, 'yyyy-MM-dd')
-    const formattedEnd = format(selectedDateRange.end, 'yyyy-MM-dd')
+    const formattedStart = format(start, 'yyyy-MM-dd')
+    const formattedEnd = format(end, 'yyyy-MM-dd')
     filename = `finance_${dao}_${formattedStart}_to_${formattedEnd}.csv`
   }
   return filename
@@ -162,7 +157,7 @@ const Transfers = React.memo(({ dao, tokens, transactions }) => {
       resolveAddress
     )
     const filename = getDownloadFilename(dao, selectedDateRange)
-    download(data, filename, 'data:text/csv')
+    saveAs(new Blob([data.join('\n')], {type: "text/csv;charset=utf-8"}), filename)
   }, [filteredTransfers, tokenDetails, resolveAddress])
 
   return (