From eeaa951f4b6439b6efa57e18f6af3e60bfd56b3e Mon Sep 17 00:00:00 2001 From: Avelous Ujiri <86206128+Avelous@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:59:13 +0100 Subject: [PATCH] Merge Staging to Master (#26) * add styles to header, footer and equalUi components * Fix Linting Errors * Footer - Fix Linting Errors * Sync Staging with Master branch (#21) * Staging to Master (#2) * add styles to header, footer and equalUi components * Fix Linting Errors * Footer - Fix Linting Errors --------- Co-authored-by: electrone901 * feature: Hide network selector until connected (#7) * Removed nav button (#10) * Changed slider and dropdown (#11) * Set the default SplitType to equal and alter the UI to Slider (#13) * Add address list when doing equal splits (#12) * Add address list when doing equal splits * Add the getENSaddress function, debounce for input, and trash icon to delete the address * Remove devounce for input and add remove addresses form Recipient Wallet sections * Refactor the addMultipleAddress function and fixed input bug * Removing import * changed bollean to hide network selector * added code link to frontend * added codelink to frontend * Added code link to frontend and changed boolean to hide the network selector (#17) * changed bollean to hide network selector * added code link to frontend * added codelink to frontend * Disallow the same ENS/address multiple times (#15) * Disallow the same ENS/address multiple times * Removing logs --------- Co-authored-by: Avelous Ujiri <86206128+Avelous@users.noreply.github.com> * Mega PR - Reinitiated UI themes, Added Preloaded options for token splitting ref issue #9, Updated frontend contracts to latest deployments, Added a history page, Updated contract events to emit the token contract, Added an export button component for exporting formatted recipient lists, etc... * deleted redundant hooks --------- Co-authored-by: Zak G Co-authored-by: electrone901 Co-authored-by: Yan Victor SN <98413246+YanVictorSN@users.noreply.github.com> * added a walletFilter to filter out unresolved wallets (#22) * fixed walletFilter for invalid ens addresses (#25) --------- Co-authored-by: electrone901 Co-authored-by: Zak G Co-authored-by: Yan Victor SN <98413246+YanVictorSN@users.noreply.github.com> --- packages/nextjs/components/splitter-ui/EqualUi.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nextjs/components/splitter-ui/EqualUi.tsx b/packages/nextjs/components/splitter-ui/EqualUi.tsx index 9a26798..ca37be6 100644 --- a/packages/nextjs/components/splitter-ui/EqualUi.tsx +++ b/packages/nextjs/components/splitter-ui/EqualUi.tsx @@ -70,10 +70,6 @@ const EqualUi = ({ splitItem, account, splitterContract }: UiJsxProps) => { await Promise.all( addresses.map(async address => { if (address.endsWith(".eth")) { - setWalletsFilter(prevState => { - const newAddresses = [...new Set([...prevState, address])]; - return newAddresses; - }); const resolvedAddress = await resolveEns(address); if (resolvedAddress === "null") { setInvalidAddresses(prevState => { @@ -82,6 +78,10 @@ const EqualUi = ({ splitItem, account, splitterContract }: UiJsxProps) => { }); } resolvedAddresses.push(resolvedAddress); + setWalletsFilter(prevState => { + const newAddresses = [...new Set([...prevState, address])]; + return newAddresses; + }); } else { resolvedAddresses.push(address); }