Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: onramp transaction status group #1942

Merged
merged 5 commits into from
Feb 19, 2024
Merged

fix: onramp transaction status group #1942

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd1898b
chore: add logs and potential activity fix
tomiir Feb 19, 2024
7e0b35f
fix: parenthesis placement
tomiir Feb 19, 2024
644709c
chore: add coinnbase tx to update log
tomiir Feb 19, 2024
025b80e
chore: use tx ids
tomiir Feb 19, 2024
d957a87
chore: improve code by always filtering previously found txs
tomiir Feb 19, 2024
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
16 changes: 4 additions & 12 deletions packages/core/src/controllers/TransactionsController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,27 +93,19 @@ export const TransactionsController = {
transactionsMap: TransactionByYearMap = {},
transactions: Transaction[] = []
) {
const grouped: TransactionByYearMap = transactionsMap

const grouped = transactionsMap
transactions.forEach(transaction => {
const year = new Date(transaction.metadata.minedAt).getFullYear()
const month = new Date(transaction.metadata.minedAt).getMonth()
const yearTransactions = grouped[year] ?? {}
const monthTransactions = yearTransactions[month] ?? []

if (
monthTransactions.find(
t =>
(t.metadata.hash && t.metadata.hash === transaction.metadata.hash) ||
t.metadata.minedAt === transaction.metadata.minedAt
)
) {
return
}
// If there's a transaction with the same id, remove the old one
const newMonthTransactions = monthTransactions.filter(tx => tx.id !== transaction.id)

grouped[year] = {
...yearTransactions,
[month]: [...monthTransactions, transaction].sort(
[month]: [...newMonthTransactions, transaction].sort(
(a, b) => new Date(b.metadata.minedAt).getTime() - new Date(a.metadata.minedAt).getTime()
)
}
Expand Down
Loading