diff --git a/packages/server/lib/new-admin/services/transactions.js b/packages/server/lib/new-admin/services/transactions.js index 46e43d9f..c2b76315 100644 --- a/packages/server/lib/new-admin/services/transactions.js +++ b/packages/server/lib/new-admin/services/transactions.js @@ -87,6 +87,7 @@ function advancedBatch(data) { 'notified', 'redeem', 'phone', + 'email', 'error', 'fixedFee', 'created', @@ -120,7 +121,6 @@ function advancedBatch(data) { 'txVersion', 'publishedAt', 'termsAccepted', - 'layer2Address', 'commissionPercentage', 'rawTickerPrice', 'receivedCryptoAtoms', @@ -131,7 +131,6 @@ function advancedBatch(data) { 'customerIdCardDataNumber', 'customerIdCardDataExpiration', 'customerIdCardData', - 'customerName', 'sendTime', 'customerFrontCameraPath', 'customerIdCardPhotoPath', diff --git a/packages/typesafe-db/src/db.ts b/packages/typesafe-db/src/db.ts index 658f0da0..76577b69 100644 --- a/packages/typesafe-db/src/db.ts +++ b/packages/typesafe-db/src/db.ts @@ -19,5 +19,5 @@ const dialect = new PostgresDialect({ export default new Kysely({ dialect, - plugins: [new CamelCasePlugin()], + plugins: [new CamelCasePlugin({ underscoreBeforeDigits: true })], }) diff --git a/packages/typesafe-db/src/transactions.ts b/packages/typesafe-db/src/transactions.ts index b7cb7742..03a2ad1b 100644 --- a/packages/typesafe-db/src/transactions.ts +++ b/packages/typesafe-db/src/transactions.ts @@ -156,6 +156,33 @@ function getCashOutTransactionList() { // cash-out only 'txOut.dispense', 'txOut.swept', + 'txOut.denominationRecycler1', + 'txOut.denominationRecycler2', + 'txOut.denominationRecycler3', + 'txOut.denominationRecycler4', + 'txOut.denominationRecycler5', + 'txOut.denominationRecycler6', + 'txOut.denomination1', + 'txOut.denomination2', + 'txOut.denomination3', + 'txOut.denomination4', + 'txOut.provisioned1', + 'txOut.provisioned2', + 'txOut.provisioned3', + 'txOut.provisioned4', + 'txOut.provisionedRecycler1', + 'txOut.provisionedRecycler2', + 'txOut.provisionedRecycler3', + 'txOut.provisionedRecycler4', + 'txOut.provisionedRecycler5', + 'txOut.provisionedRecycler6', + 'txOut.dispenseConfirmed', + 'txOut.publishedAt', + 'txOut.hdIndex', + 'txOut.notified', + 'txOut.receivedCryptoAtoms', + 'txOut.redeem', + 'txOut.confirmedAt', ]) } @@ -216,6 +243,33 @@ function getCashInTransactionList() { // cash-out only val(false).as('dispense'), val(false).as('swept'), + eb.val(null).as('denominationRecycler1'), + eb.val(null).as('denominationRecycler2'), + eb.val(null).as('denominationRecycler3'), + eb.val(null).as('denominationRecycler4'), + eb.val(null).as('denominationRecycler5'), + eb.val(null).as('denominationRecycler6'), + eb.val(null).as('denomination1'), + eb.val(null).as('denomination2'), + eb.val(null).as('denomination3'), + eb.val(null).as('denomination4'), + eb.val(null).as('provisioned1'), + eb.val(null).as('provisioned2'), + eb.val(null).as('provisioned3'), + eb.val(null).as('provisioned4'), + eb.val(null).as('provisionedRecycler1'), + eb.val(null).as('provisionedRecycler2'), + eb.val(null).as('provisionedRecycler3'), + eb.val(null).as('provisionedRecycler4'), + eb.val(null).as('provisionedRecycler5'), + eb.val(null).as('provisionedRecycler6'), + eb.val(null).as('dispenseConfirmed'), + eb.val(null).as('publishedAt'), + eb.val(null).as('hdIndex'), + eb.val(false).as('notified'), + eb.val(null).as('receivedCryptoAtoms'), + eb.val(false).as('redeem'), + eb.val(null).as('confirmedAt'), ]) }