Skip to content

Commit

Permalink
Add missing statuses to transaction details (#340)
Browse files Browse the repository at this point in the history
* add missing statuses for transactions

* add EXPIRED status

* fix failing linter

* remove off chain from unknown timestamp

* show all possible transactions

* change multiple if statements to switch

* fix react warning

* refactor

* handle withdraw type of sent transaction

* revert ForcedTradeOfferTransaction to Record

* remove todos

* extract getting path to function

* add correct requirement for EXPIRED status

* change submissionExpirationTime type to Timestamp

* fix after merge issues

* fix failing test

* fix failing tests

* extract functions for building tx history to separate file

* remove resolved comment

* fix linter issues

* add migration for submission_expiration_time

* refactor

* do not use fromHours if extracting from database

* fix failing tests

* update migration

* add comments

* remove using unnecessary Timestamp.fromHours

* handle WithdrawWithTokenId
  • Loading branch information
torztomasz committed Mar 27, 2023
1 parent 787c137 commit 4c88a37
Show file tree
Hide file tree
Showing 34 changed files with 920 additions and 286 deletions.
2 changes: 2 additions & 0 deletions packages/backend/src/Application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,10 @@ export class Application {
const transactionController = new TransactionController(
userService,
sentTransactionRepository,
forcedTradeOfferRepository,
userTransactionRepository,
userRegistrationEventRepository,
assetRepository,
collateralAsset
)
const merkleProofController = new MerkleProofController(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class ForcedTransactionController {
}

const [offer, finalize] = await Promise.all([
this.offersRepository.findByHash(transactionHash),
this.offersRepository.findByTransactionHash(transactionHash),
this.findFinalizeTransaction(transaction),
])
const offerHistory = offer ? toForcedTradeOfferHistory(offer) : []
Expand Down
Loading

0 comments on commit 4c88a37

Please sign in to comment.