diff --git a/src/components/ListComponent.vue b/src/components/ListComponent.vue index b528239..aaef92e 100644 --- a/src/components/ListComponent.vue +++ b/src/components/ListComponent.vue @@ -72,7 +72,7 @@ const props = defineProps({

{{blockchain.formatBigNumber(deposit?.args.amount)}} BRZ

-

{{deposit?.event == 'DepositAdded' ? 'Depósito' : 'Compra'}}

+

{{deposit?.event == 'DepositAdded' ? 'Depósito' : deposit?.event == 'LockAdded' ? 'Reserva' : 'Compra'}}

Etherscan

Redirect image diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts index 2acd74d..8fda2d2 100644 --- a/src/utils/blockchain.ts +++ b/src/utils/blockchain.ts @@ -55,10 +55,13 @@ const listTransactionByWalletAddress = async (walletAddress: string): Promise { + return [...eventsDeposits, ...eventsAddedLocks, ...eventsReleasedLocks].sort((a, b) => { return b.blockNumber - a.blockNumber }) } @@ -232,7 +235,7 @@ const mapLocks = async (lockId: string) => { }; // Releases lock by specific ID and other additional data -const releaseLock = async (pixKey: string, amount: Number, e2eId: Number, lockId: string) => { +const releaseLock = async (pixKey: string, amount: string, e2eId: Number, lockId: string) => { const provider = getProvider(); if (!provider) return; @@ -246,7 +249,7 @@ const releaseLock = async (pixKey: string, amount: Number, e2eId: Number, lockId ], [ pixKey, - amount, + formatEther(amount), e2eId ] ) diff --git a/src/views/MockView.vue b/src/views/MockView.vue index 028cede..2d8f55d 100644 --- a/src/views/MockView.vue +++ b/src/views/MockView.vue @@ -44,11 +44,6 @@ const mapDeposit = (depositId: BigNumber) => { }; // Lock methods -// (TO DO) Releases lock by specific ID and other additional data -const releaseLock = () => { - blockchain.releaseLock(); -}; - // Get specific lock data by its ID const mapLock = (lockId: string) => { blockchain.mapLocks(lockId); @@ -81,10 +76,6 @@ const mapLock = (lockId: string) => { - -