Merge pull request #4981 from Giveth/solana-connection-issue

Giveth · Jan 29, 2025 · 7ddf900 · 7ddf900
2 parents a736774 + dab8b04
commit 7ddf900
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/components/modals/SwitchNetwork.tsx b/src/components/modals/SwitchNetwork.tsx
@@ -60,13 +60,17 @@ const SwitchNetwork: FC<ISwitchNetworkModal> = ({
 			};
 		}) || defaultNetworks;
 
-	const handleNetworkItemClick = (networkId: number) => {
+	const handleNetworkItemClick = (networkId: number, chainType: string) => {
 		if (walletChainType === ChainType.SOLANA) {
 			setPendingNetworkId(networkId);
 			handleSingOutAndSignInWithEVM();
 			closeModal(); // Close the modal since we cannot control the wallet modal
 		} else {
-			switchChain?.({ chainId: networkId });
+			if (chainType === ChainType.SOLANA) {
+				handleSignOutAndSignInWithSolana();
+			} else {
+				switchChain?.({ chainId: networkId });
+			}
 			closeModal();
 		}
 	};
@@ -83,7 +87,9 @@ const SwitchNetwork: FC<ISwitchNetworkModal> = ({
 				{desc && <P>{desc}</P>}
 				{networks?.map(({ networkId, chainType }) => (
 					<NetworkItem
-						onClick={() => handleNetworkItemClick(networkId)}
+						onClick={() =>
+							handleNetworkItemClick(networkId, chainType)
+						}
 						$isSelected={networkId === chainId}
 						key={networkId}
 						$baseTheme={theme}