From 11499661ea123be4ec2faaeb66c81a888c8cf6dd Mon Sep 17 00:00:00 2001 From: RcleydsonR Date: Tue, 31 Jan 2023 18:33:24 -0300 Subject: [PATCH] Improve return from valid deposits to consider multiple deposit reduced in one for same account and consider changing of network and account to verify liquidity on Search Component Co-authored-by: brunoedcf --- src/blockchain/events.ts | 7 ++++--- src/components/SearchComponent.vue | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts index 8cf3d9f..72ee93d 100644 --- a/src/blockchain/events.ts +++ b/src/blockchain/events.ts @@ -63,8 +63,9 @@ const getValidDeposits = async ( const eventsDeposits = await p2pContract.queryFilter(filterDeposits); if (!contract) p2pContract = getContract(); // get metamask provider contract + const depositList: { [key: string]: ValidDeposit } = {}; - const depositList = await Promise.all( + await Promise.all( eventsDeposits.map(async (deposit) => { // Get liquidity only for the selected token if (deposit.args?.token != token) return null; @@ -91,11 +92,11 @@ const getValidDeposits = async ( }; } - return validDeposit; + if (validDeposit) depositList[deposit.args?.seller + token] = validDeposit; }) ); - return depositList.filter((deposit) => deposit) as ValidDeposit[]; + return Object.values(depositList); }; export { getValidDeposits, getNetworksLiquidity }; diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue index dd328cb..98a22b2 100644 --- a/src/components/SearchComponent.vue +++ b/src/components/SearchComponent.vue @@ -107,8 +107,13 @@ const enableOrDisableConfirmButton = (): void => { }; watch(networkName, (): void => { + verifyLiquidity(); enableOrDisableConfirmButton(); }); + +watch(walletAddress, (): void => { + verifyLiquidity(); +});