Merge branch 'main' into lochie/unsupported-chains-fix

family · Feb 6, 2024 · 17da5ce · 17da5ce
2 parents dfe41cc + 98ff303
commit 17da5ce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/packages/connectkit/src/components/Common/ScrollArea/styles.ts b/packages/connectkit/src/components/Common/ScrollArea/styles.ts
@@ -84,7 +84,10 @@ export const ScrollAreaContainer = styled.div<{
             top: 0;
             bottom: 0;
             width: var(--fade-height);
-            background: var(--ck-body-divider);
+            background: var(
+              --ck-body-divider-secondary,
+              var(--ck-body-divider)
+            );
             box-shadow: var(--ck-body-divider-box-shadow);
             transition: opacity 300ms ease;
           }
@@ -123,7 +126,10 @@ export const ScrollAreaContainer = styled.div<{
             left: 0;
             right: 0;
             height: var(--fade-height);
-            background: var(--ck-body-divider);
+            background: var(
+              --ck-body-divider-secondary,
+              var(--ck-body-divider)
+            );
             box-shadow: var(--ck-body-divider-box-shadow);
             transition: opacity 300ms ease;
           }

diff --git a/packages/connectkit/src/styles/themes/base.ts b/packages/connectkit/src/styles/themes/base.ts
@@ -64,6 +64,7 @@ export default {
     '--ck-body-background-tertiary': '#F3F4F7',
     '--ck-body-action-color': '#999999',
     '--ck-body-divider': '#f7f6f8',
+    '--ck-body-divider-secondary': 'rgba(0, 0, 0, 0.06)',
     '--ck-body-color-danger': '#FF4E4E',
     '--ck-body-color-valid': '#32D74B',
     '--ck-siwe-border': '#F0F0F0',

diff --git a/packages/connectkit/src/wallets/useWallets.tsx b/packages/connectkit/src/wallets/useWallets.tsx
@@ -66,6 +66,11 @@ export const useWallets = (): WalletProps[] => {
 
   return (
     wallets
+      // remove duplicate ids
+      .filter(
+        (wallet, index, self) =>
+          self.findIndex((w) => w.id === wallet.id) === index
+      )
       // remove wallet with id coinbaseWalletSDK if wallet with id 'com.coinbase.wallet' exists
       .filter(
         (wallet, index, self) =>