Merge pull request #727 from chaotixkilla/feat-btc-transaction-batching

BTC transaction batching
2021-11-24 22:56:09 +00:00 · 2021-11-24 22:56:09 +00:00 · cc8c48ff4c
commit cc8c48ff4c
parent 540f1581f5 008dd3e9f6
19 changed files with 331 additions and 28 deletions
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js
@ -110,6 +110,8 @@ const GET_TRANSACTIONS = gql`
      discount
      customerId
      isAnonymous
+      batched
+      batchTime
    }
  }
 `
--- a/new-lamassu-admin/src/pages/Transactions/helper.js
+++ b/new-lamassu-admin/src/pages/Transactions/helper.js
@ -11,6 +11,7 @@ const getCashInStatus = it => {
  if (it.hasError) return 'Error'
  if (it.sendConfirmed) return 'Sent'
  if (it.expired) return 'Expired'
+  if (it.batched) return 'Batched'
  return 'Pending'
 }