From 63d4e2d7997b5b43c8a069ff735eb2a752da101e Mon Sep 17 00:00:00 2001
From: Felipe Mendes <zo.fmendes@gmail.com>
Date: Wed, 2 Oct 2024 09:25:52 -0300
Subject: [PATCH] fix: v5 connectors not appearing on solana (#2979)

---
 .../base/adapters/solana/web3js/client.ts     |  6 ++++-
 .../src/controllers/ConnectorController.ts    | 24 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/base/adapters/solana/web3js/client.ts b/packages/base/adapters/solana/web3js/client.ts
index e579b4fff3..fa577dfc51 100644
--- a/packages/base/adapters/solana/web3js/client.ts
+++ b/packages/base/adapters/solana/web3js/client.ts
@@ -715,7 +715,11 @@ export class SolanaWeb3JsClient implements ChainAdapter<SolStoreUtilState, CaipN
       type: provider.type,
       imageUrl: provider.icon,
       name: provider.name,
-      provider,
+      /**
+       * When the provider is different from 'AUTH', we don't need to pass it to the connector.
+       * This avoids issues with the valtio proxy and non-serializable state and follows same logic from other clients.
+       */
+      provider: provider.type === 'AUTH' ? provider : undefined,
       chain: CommonConstantsUtil.CHAIN.SOLANA,
       ...provider.auth
     }))
diff --git a/packages/core/src/controllers/ConnectorController.ts b/packages/core/src/controllers/ConnectorController.ts
index 5bbf9ec550..b30cbba60b 100644
--- a/packages/core/src/controllers/ConnectorController.ts
+++ b/packages/core/src/controllers/ConnectorController.ts
@@ -32,7 +32,29 @@ export const ConnectorController = {
 
   setConnectors(connectors: ConnectorControllerState['connectors']) {
     connectors.forEach(this.syncIfAuthConnector)
-    state.unMergedConnectors = [...state.unMergedConnectors, ...connectors]
+    state.unMergedConnectors = [...state.unMergedConnectors, ...connectors].filter(connector => {
+      /**
+       * This is a fix for non-serializable objects that may prevent all the connectors in the list from being displayed
+       * Check more about this issue on https://valtio.dev/docs/api/basic/proxy#Gotchas
+       */
+      try {
+        const canProxyConnector = Boolean(proxy(connector))
+
+        if (!canProxyConnector) {
+          throw new Error('Connector is not available')
+        }
+
+        return true
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('ConnectorController.setConnectors: Not possible to add connector', {
+          connector,
+          error
+        })
+
+        return false
+      }
+    })
     state.connectors = this.mergeMultiChainConnectors(state.unMergedConnectors)
   },