fix: de-dupe wallets in connectorsForWallets (#1910)

* chore: de-dupe wallets * chore: small tweak * chore: format * Update sour-bobcats-dance.md --------- Co-authored-by: Magomed Khamidov <[email protected]> Co-authored-by: Daniel Sinclair <[email protected]>
rainbow-me · Apr 3, 2024 · 4dd1e45 · 4dd1e45
1 parent fc4d7e1
commit 4dd1e45
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/.changeset/sour-bobcats-dance.md b/.changeset/sour-bobcats-dance.md
@@ -0,0 +1,5 @@
+---
+"@rainbow-me/rainbowkit": patch
+---
+
+Fixed an issue that allowed duplicate wallets to be added to the Connect Modal when using `connectorsForWallets`
diff --git a/packages/rainbowkit/src/utils/uniqueBy.ts b/packages/rainbowkit/src/utils/uniqueBy.ts
@@ -0,0 +1,14 @@
+export function uniqueBy<key extends string, item extends Record<key, any>>(
+  items: item[],
+  key: key,
+): item[] {
+  const filtered: item[] = [];
+
+  for (const item of items) {
+    if (!filtered.some((x) => x[key] === item[key])) {
+      filtered.push(item);
+    }
+  }
+
+  return filtered;
+}
diff --git a/packages/rainbowkit/src/wallets/connectorsForWallets.ts b/packages/rainbowkit/src/wallets/connectorsForWallets.ts
@@ -1,6 +1,7 @@
 import type { CreateConnectorFn } from 'wagmi';
 import { isHexString } from '../utils/colors';
 import { omitUndefinedValues } from '../utils/omitUndefinedValues';
+import { uniqueBy } from '../utils/uniqueBy';
 import type {
   RainbowKitWalletConnectParameters,
   Wallet,
@@ -93,12 +94,13 @@ export const connectorsForWallets = (
     });
   });
 
+  // Filtering out duplicated wallets in case there is any.
   // We process the known visible wallets first so that the potentially
   // hidden wallets have access to the complete list of resolved wallets
-  const walletListItems: WalletListItem[] = [
-    ...visibleWallets,
-    ...potentiallyHiddenWallets,
-  ];
+  const walletListItems: WalletListItem[] = uniqueBy(
+    [...visibleWallets, ...potentiallyHiddenWallets],
+    'id',
+  );
 
   for (const {
     createConnector,