Merge remote-tracking branch 'upstream/release-8.0' into merge-release-8.0-into-dev-220906

lib/new-admin/services/transactions.js

@@ -47,7 +47,7 @@ function batch (
   toAddress = null,
   status = null,
   excludeTestingCustomers = false,
-  simplified = false
+  simplified
 ) {
   const packager = _.flow(_.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addProfits, addNames)
 
@@ -120,13 +120,40 @@ function batch (
     .then(packager)
     .then(res => {
       if (simplified) return simplifiedBatch(res)
-      else return res
+      // GQL transactions and transactionsCsv both use this function and
+      // if we don't check for the correct simplified value, the Transactions page polling
+      // will continuously build a csv in the background
+      else if (simplified === false) return advancedBatch(res)
+      return res
     })
 }
 
+function advancedBatch (data) {
+  const fields = ['txClass', 'id', 'deviceId', 'toAddress', 'cryptoAtoms',
+  'cryptoCode', 'fiat', 'fiatCode', 'fee', 'status', 'fiatProfit', 'cryptoAmount',
+  'dispense', 'notified', 'redeem', 'phone', 'error',
+  'created', 'confirmedAt', 'hdIndex', 'swept', 'timedout',
+  'dispenseConfirmed', 'provisioned1', 'provisioned2',
+  'denomination1', 'denomination2', 'errorCode', 'customerId',
+  'txVersion', 'publishedAt', 'termsAccepted', 'layer2Address',
+  'commissionPercentage', 'rawTickerPrice', 'receivedCryptoAtoms',
+  'discount', 'txHash', 'customerPhone', 'customerIdCardDataNumber',
+  'customerIdCardDataExpiration', 'customerIdCardData', 'customerName',
+  'customerFrontCameraPath', 'customerIdCardPhotoPath', 'expired', 'machineName', 'walletScore']
+
+  const addAdvancedFields = _.map(it => ({
+    ...it,
+    status: getStatus(it),
+    fiatProfit: getProfit(it).toString(),
+    cryptoAmount: getCryptoAmount(it).toString()
+  }))
+
+  return _.compose(_.map(_.pick(fields)), addAdvancedFields)(data)
+}
+
 function simplifiedBatch (data) {
   const fields = ['txClass', 'id', 'created', 'machineName',
-    'cryptoCode', 'fiat', 'fiatCode', 'phone', 'toAddress',
+    'cryptoCode', 'cryptoAtoms', 'fiat', 'fiatCode', 'phone', 'toAddress',
     'txHash', 'dispense', 'error', 'status', 'fiatProfit', 'cryptoAmount']
 
   const addSimplifiedFields = _.map(it => ({