Skip to content

Commit 2d8e8a9

Browse files
committed
fix: multiple values line
1 parent 631e496 commit 2d8e8a9

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

constants/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,9 @@ export const PAYBUTTON_TRANSACTIONS_FILE_HEADERS = {
248248
}
249249

250250
export const DEFAULT_PAYBUTTON_CSV_FILE_DELIMITER = ','
251-
export const DEFAULT_MULTI_VALUES_FILE_DELIMITER = ' & '
252-
253251
export const MAX_RECORDS_PER_FILE = 10000
254252
export const DEFAULT_CSV_COLLAPSE_THRESHOLD = 1
253+
export const DEFAULT_MULTI_VALUES_LINE_LABEL = 'Multiple'
255254

256255
export const DECIMALS: Record<string, number> = {
257256
BCH: 8,

utils/files.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Prisma } from '@prisma/client'
22
import {
33
DECIMALS,
44
DEFAULT_CSV_COLLAPSE_THRESHOLD,
5-
DEFAULT_MULTI_VALUES_FILE_DELIMITER,
5+
DEFAULT_MULTI_VALUES_LINE_LABEL,
66
DEFAULT_PAYBUTTON_CSV_FILE_DELIMITER,
77
MAX_RECORDS_PER_FILE,
88
NETWORK_TICKERS,
@@ -148,10 +148,10 @@ export const collapseSmallPayments = (
148148
amount: totalAmount,
149149
value: totalValue,
150150
date: moment.tz(tempGroup[0].timestamp * 1000, timezone),
151-
transactionId: 'Multiple',
151+
transactionId: DEFAULT_MULTI_VALUES_LINE_LABEL,
152152
rate,
153153
currency,
154-
address: Array.from(new Set(tempGroup.map(p => p.address.address))).join(DEFAULT_MULTI_VALUES_FILE_DELIMITER),
154+
address: DEFAULT_MULTI_VALUES_LINE_LABEL,
155155
notes
156156
} as TransactionFileData)
157157

@@ -184,10 +184,10 @@ export const collapseSmallPayments = (
184184
amount: totalAmount,
185185
value: totalValue,
186186
date: moment.tz(tempGroup[0].timestamp * 1000, timezone),
187-
transactionId: tempGroup.map(p => p.hash).join(DEFAULT_MULTI_VALUES_FILE_DELIMITER),
187+
transactionId: DEFAULT_MULTI_VALUES_LINE_LABEL,
188188
rate,
189189
currency,
190-
address: Array.from(new Set(tempGroup.map(p => p.address.address))).join(DEFAULT_MULTI_VALUES_FILE_DELIMITER),
190+
address: DEFAULT_MULTI_VALUES_LINE_LABEL,
191191
notes
192192
} as TransactionFileData)
193193

0 commit comments

Comments
 (0)