Skip to content
Merged
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 50 additions & 2 deletions pages/admin/pro/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ const dateFormatters = {
// Format: MM/DD/YY HH:MM
const { mm, dd, yyyy, hh, min } = timePieces(timestamp)
return `${mm}/${dd}/${yyyy} ${hh}:${min}`
},
CryptoTax: (timestamp) => {
// Format: YYYY-MM-DD HH:mm:ss
const { yyyy, mm, dd, hh, min, ss } = timePieces(timestamp)
return `${yyyy}-${mm}-${dd} ${hh}:${min}:${ss}`
}
}

Expand Down Expand Up @@ -133,6 +138,28 @@ const processDataForExport = (activities, platform) => {
processedActivity.type = sending ? 'Sell' : 'Buy'
} else if (platform === 'TokenTax') {
processedActivity.type = sending ? 'Withdrawal' : 'Deposit'
} else if (platform === 'CryptoTax') {
processedActivity.type = !sending
? 'buy'
: Math.abs(activity.amountNumber) <= activity.txFeeNumber
? 'fee'
: 'sell'

processedActivity.cryptoTaxFeeCurrencyCode = processedActivity.txFeeCurrencyCode
processedActivity.cryptoTaxFeeNumber = processedActivity.txFeeNumber

if (processedActivity.type === 'buy') {
processedActivity.baseCurrency = processedActivity.receivedCurrency
processedActivity.baseAmount = processedActivity.receivedAmount
} else {
processedActivity.baseCurrency = processedActivity.sentCurrency
processedActivity.baseAmount = processedActivity.sentAmount
// don't include this fee amount in the fee column for type 'fee'
if (processedActivity.type === 'fee') {
processedActivity.cryptoTaxFeeCurrencyCode = ''
processedActivity.cryptoTaxFeeNumber = ''
}
}
}

return processedActivity
Expand Down Expand Up @@ -258,6 +285,26 @@ export default function History({ queryAddress, selectedCurrency, setSelectedCur
{ label: 'Comment', key: 'memo' },
{ label: 'Date', key: 'timestampExport' }
]
},
{
platform: 'CryptoTax',
headers: [
{ label: 'Timestamp (UTC)', key: 'timestampExport' },
{ label: 'Type', key: 'type' },
{ label: 'Base Currency', key: 'baseCurrency' },
{ label: 'Base Amount', key: 'baseAmount' },
{ label: 'Quote Currency (Optional)', key: '' },
{ label: 'Quote Amount (Optional)', key: '' },
{ label: 'Fee Currency (Optional)', key: 'cryptoTaxFeeCurrencyCode' },
{ label: 'Fee Amount (Optional)', key: 'cryptoTaxFeeNumber' },
{ label: 'From (Optional)', key: 'counterparty' },
{ label: 'To (Optional)', key: 'address' },
{ label: 'Blockchain (Optional)', key: '' },
{ label: 'ID (Optional)', key: 'hash' },
{ label: 'Description (Optional)', key: 'memo' },
{ label: 'Reference Price Per Unit (Optional)', key: '' },
{ label: 'Reference Price Currency (Optional)', key: '' }
]
}
],
[selectedCurrency]
Expand Down Expand Up @@ -624,7 +671,8 @@ export default function History({ queryAddress, selectedCurrency, setSelectedCur
{ value: 'CoinLedger', label: 'CoinLedger' },
{ value: 'CoinTracking', label: 'CoinTracking' },
{ value: 'TaxBit', label: 'TaxBit' },
{ value: 'TokenTax', label: 'TokenTax' }
{ value: 'TokenTax', label: 'TokenTax' },
{ value: 'CryptoTax', label: 'CryptoTax' }
]}
/>
<button className="dropdown-btn" onClick={() => setSortMenuOpen(!sortMenuOpen)}>
Expand Down Expand Up @@ -780,4 +828,4 @@ export default function History({ queryAddress, selectedCurrency, setSelectedCur
</div>
</>
)
}
}