revert using SolanaProvider

packages/widget/src/hooks/useCreateSolanaWallets.tsx

@@ -11,7 +11,7 @@ import { useCallback } from "react";
 import { ChainType } from "@skip-go/client";
 import { callbacksAtom } from "@/state/callbacks";
 import { walletConnectLogo } from "@/constants/wagmi";
-import { useWallet } from "@solana/wallet-adapter-react";
+import { solanaWallets } from "@/constants/solana";
 
 export const useCreateSolanaWallets = () => {
   const { data: chains } = useAtomValue(skipChainsAtom);
@@ -20,13 +20,11 @@ export const useCreateSolanaWallets = () => {
   const [svmWallet, setSvmWallet] = useAtom(svmWalletAtom);
   const callbacks = useAtomValue(callbacksAtom);
   const setWCDeepLinkByChainType = useSetAtom(setWalletConnectDeepLinkByChainTypeAtom);
-  const { wallets: solanaWallets } = useWallet();
 
   const createSolanaWallets = useCallback(() => {
     const wallets: MinimalWallet[] = [];
 
-    for (const solWallet of solanaWallets) {
-      const wallet = solWallet.adapter;
+    for (const wallet of solanaWallets) {
       const isWalletConnect = wallet.name === "WalletConnect";
 
       const connectWallet = async () => {
@@ -116,7 +114,6 @@ export const useCreateSolanaWallets = () => {
     }
     return wallets;
   }, [
-    solanaWallets,
     chains,
     assets,
     sourceAsset,

packages/widget/src/hooks/useGetAccount.ts

@@ -7,7 +7,7 @@ import { useCallback } from "react";
 import { useAccount as useEvmAccount, useConnectors } from "wagmi";
 import { ChainType } from "@skip-go/client";
 import { walletConnectLogo } from "@/constants/wagmi";
-import { useWallet } from "@solana/wallet-adapter-react";
+import { solanaWallets } from "@/constants/solana";
 
 export const useGetAccount = () => {
   const wallet = useAtomValue(walletsAtom);
@@ -20,9 +20,7 @@ export const useGetAccount = () => {
     multiChain: true,
   });
 
-  const { wallets: solanaWallets } = useWallet();
-
-  const solanaWallet = solanaWallets.find((wallet) => wallet.adapter.connected === true)?.adapter;
+  const solanaWallet = solanaWallets.find((wallet) => wallet.connected === true);
 
   const evmAccount = useEvmAccount();
   const connectors = useConnectors();

packages/widget/src/hooks/useKeepWalletStateSynced.ts

@@ -4,8 +4,8 @@ import { useAtom, useSetAtom } from "jotai";
 import { useCallback, useEffect } from "react";
 import { useAccount as useEvmAccount } from "wagmi";
 import { ChainType } from "@skip-go/client";
-import { useWallet } from "@solana/wallet-adapter-react";
 import { solanaWalletsAtom } from "@/state/skipClient";
+import { solanaWallets } from "@/constants/solana";
 
 export const useKeepWalletStateSynced = () => {
   const [evmWallet, setEvmWallet] = useAtom(evmWalletAtom);
@@ -21,9 +21,7 @@ export const useKeepWalletStateSynced = () => {
     ? cosmosAccounts[Object.keys(cosmosAccounts)[0]]?.bech32Address
     : "";
 
-  const { wallets: solanaWallets } = useWallet();
-
-  const solanaWallet = solanaWallets.find((wallet) => wallet.adapter.connected === true)?.adapter;
+  const solanaWallet = solanaWallets.find((wallet) => wallet.connected === true);
 
   const evmAccount = useEvmAccount();
 
@@ -66,10 +64,6 @@ export const useKeepWalletStateSynced = () => {
     }
   }, [setSvmWallet, solanaWallet]);
 
-  useEffect(() => {
-    setSolanaWallets(solanaWallets);
-  }, [setSolanaWallets, solanaWallets]);
-
   useEffect(() => {
     const currentEvmId = evmAccount.address;
     const currentSolanaId = solanaWallet?.publicKey?.toBase58();
@@ -99,7 +93,6 @@ export const useKeepWalletStateSynced = () => {
     evmAccount.address,
     updateCosmosWallet,
     currentCosmosId,
-    solanaWallets,
     setSolanaWallets,
   ]);
 };

packages/widget/src/providers/WalletProviders.tsx

@@ -1,14 +1,11 @@
 import { ReactNode } from "react";
 import { CosmosProvider } from "./CosmosProvider";
 import { EVMProvider } from "./EVMProvider";
-import { SolanaProvider } from "./SolanaProvider";
 
 export const WalletProviders = ({ children }: { children: ReactNode }) => {
   return (
     <CosmosProvider>
-      <SolanaProvider>
-        <EVMProvider>{children}</EVMProvider>
-      </SolanaProvider>
+      <EVMProvider>{children}</EVMProvider>
     </CosmosProvider>
   );
 };

packages/widget/src/state/skipClient.ts

@@ -9,7 +9,7 @@ import { getWalletClient } from "@wagmi/core";
 import { config } from "@/constants/wagmi";
 import { WalletClient } from "viem";
 import { defaultTheme, Theme } from "@/widget/theme";
-import { Wallet } from "@solana/wallet-adapter-react";
+import { solanaWallets } from "@/constants/solana";
 
 type ArgumentTypes<F extends Function> = F extends (...args: infer A) => unknown ? A : never;
 
@@ -25,15 +25,11 @@ export const skipClientConfigAtom = atom<SkipClientOptions>({
 
 export const themeAtom = atom<Theme>(defaultTheme);
 
-export const solanaWalletsAtom = atom<Wallet[]>();
-
 export const skipClient = atom((get) => {
   const options = get(skipClientConfigAtom);
   const wallets = get(walletsAtom);
   const getSigners = get(getConnectedSignersAtom);
 
-  const solanaWallets = get(solanaWalletsAtom);
-
   return new SkipClient({
     ...options,
     getCosmosSigner: async (chainID) => {
@@ -69,7 +65,7 @@ export const skipClient = atom((get) => {
       }
       const walletName = wallets.svm?.walletName;
       if (!walletName) throw new Error("getSVMSigner error: no svm wallet");
-      const solanaWallet = solanaWallets?.find((w) => w.adapter.name === walletName)?.adapter;
+      const solanaWallet = solanaWallets.find((w) => w.name === walletName);
       if (!solanaWallet) throw new Error("getSVMSigner error: wallet not found");
       return solanaWallet as ArgumentTypes<typeof SkipClient>["getSVMSigner"];
     },