@sodax/wallet-sdk-react 1.3.0-beta → 1.3.1-beta-rc1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sodax/wallet-sdk-react",
   "license": "MIT",
-  "version": "1.3.0-beta",
+  "version": "1.3.1-beta-rc1",
   "description": "Wallet SDK of Sodax",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -23,7 +23,6 @@
     "url": "https://github.com/icon-project/sodax-frontend"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "0.30.1",
     "@creit.tech/stellar-wallets-kit": "^1.7.5",
     "@hot-labs/near-connect": "0.10.0",
     "@injectivelabs/networks": "1.16.10",
@@ -36,7 +35,7 @@
     "@injectivelabs/wallet-strategy": "1.16.10",
     "@mysten/dapp-kit": "0.14.18",
     "@mysten/sui": "1.21.2",
-    "near-api-js": "7.1.1",
+    "near-api-js": "7.2.0",
     "@solana/spl-token": "0.4.9",
     "@solana/wallet-adapter-react": "0.15.35",
     "@solana/wallet-adapter-wallets": "0.19.30",
@@ -48,8 +47,8 @@
     "wagmi": "2.16.9",
     "zustand": "4.5.2",
     "bs58": "6.0.0",
-    "@sodax/types": "1.3.0-beta",
-    "@sodax/wallet-sdk-core": "1.3.0-beta"
+    "@sodax/types": "1.3.1-beta-rc1",
+    "@sodax/wallet-sdk-core": "1.3.1-beta-rc1"
   },
   "devDependencies": {
     "@types/react": "^19.0.8",

package/src/Hydrate.ts

@@ -5,7 +5,6 @@ import { useEffect } from 'react';
 import { EvmXService } from './xchains/evm';
 import { SolanaXService } from './xchains/solana/SolanaXService';
 import { SuiXService } from './xchains/sui';
-import { useAnchorProvider } from './xchains/solana/hooks/useAnchorProvider';
 import { useConnection, useWallet } from '@solana/wallet-adapter-react';
 import { useConfig } from 'wagmi';
 
@@ -33,7 +32,6 @@ export const Hydrate = () => {
   // solana
   const { connection: solanaConnection } = useConnection();
   const solanaWallet = useWallet();
-  const solanaProvider = useAnchorProvider();
   useEffect(() => {
     if (solanaConnection) {
       SolanaXService.getInstance().connection = solanaConnection;
@@ -44,11 +42,6 @@ export const Hydrate = () => {
       SolanaXService.getInstance().wallet = solanaWallet;
     }
   }, [solanaWallet]);
-  useEffect(() => {
-    if (solanaProvider) {
-      SolanaXService.getInstance().provider = solanaProvider;
-    }
-  }, [solanaProvider]);
 
   // evm
   const wagmiConfig = useConfig();

package/src/SodaxWalletProvider.tsx

@@ -22,7 +22,6 @@ import type { RpcConfig } from '@sodax/types';
 import { Hydrate } from './Hydrate';
 import { createWagmiConfig } from './xchains/evm/EvmXService';
 import { reconnectIcon } from './xchains/icon/actions';
-// import { reconnectInjective } from './xchains/injective/actions';
 import { reconnectStellar } from './xchains/stellar/actions';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
@@ -40,7 +39,7 @@ export const SodaxWalletProvider = ({ children, rpcConfig }: { children: React.R
       <WagmiProvider reconnectOnMount={false} config={wagmiConfig}>
         <SuiClientProvider networks={{ mainnet: { url: getFullnodeUrl('mainnet') } }} defaultNetwork="mainnet">
           <SuiWalletProvider autoConnect={true}>
-            <SolanaConnectionProvider endpoint={rpcConfig['solana'] ?? ''}>
+            <SolanaConnectionProvider endpoint={rpcConfig['solana'] ?? 'https://api.mainnet-beta.solana.com'}>
               <SolanaWalletProvider wallets={wallets} autoConnect>
                 <Hydrate />
                 {children}

package/src/hooks/useWalletProvider.ts

@@ -141,7 +141,7 @@ export function useWalletProvider(
 
         return new SolanaWalletProvider({
           wallet: solanaXService.wallet,
-          connection: solanaXService.connection,
+          endpoint: solanaXService.connection.rpcEndpoint,
         });
       }
 

package/src/hooks/useXBalances.ts

@@ -1,5 +1,5 @@
 import { getXChainType } from '@/actions';
-import { type UseQueryResult, keepPreviousData, useQuery } from '@tanstack/react-query';
+import { type UseQueryResult, useQuery } from '@tanstack/react-query';
 import type { ChainId, XToken } from '@sodax/types';
 import { useXService } from './useXService';
 
@@ -59,8 +59,7 @@ export function useXBalances({
 
       return balances;
     },
-    enabled: !!xService,
-    placeholderData: keepPreviousData,
+    enabled: !!xService && !!address && (xTokens?.length ?? 0) > 0,
     refetchInterval: 5_000,
   });
 }

package/src/xchains/solana/SolanaXService.ts

@@ -3,7 +3,6 @@ import { isNativeToken } from '@/utils';
 import type { XToken } from '@sodax/types';
 import { type Connection, PublicKey } from '@solana/web3.js';
 import { getAccount, getAssociatedTokenAddressSync } from '@solana/spl-token';
-import type { AnchorProvider } from '@coral-xyz/anchor';
 import type { WalletContextState } from '@solana/wallet-adapter-react';
 
 export class SolanaXService extends XService {
@@ -11,7 +10,6 @@ export class SolanaXService extends XService {
 
   public connection: Connection | undefined;
   public wallet: WalletContextState | undefined;
-  public provider: AnchorProvider | undefined;
 
   private constructor() {
     super('SOLANA');
@@ -29,7 +27,7 @@ export class SolanaXService extends XService {
 
     const connection = this.connection;
     if (!connection) {
-      throw new Error('Connection is not initialized');
+      return BigInt(0);
     }
 
     try {
@@ -41,10 +39,8 @@ export class SolanaXService extends XService {
       const tokenAccountPubkey = getAssociatedTokenAddressSync(new PublicKey(xToken.address), new PublicKey(address));
       const tokenAccount = await getAccount(connection, tokenAccountPubkey);
       return BigInt(tokenAccount.amount);
-    } catch (e) {
-      console.log('error', e);
+    } catch {
+      return BigInt(0);
     }
-
-    return BigInt(0);
   }
 }

package/src/xchains/solana/hooks/useAnchorProvider.tsx

@@ -1,9 +0,0 @@
-import { AnchorProvider } from '@coral-xyz/anchor';
-import { type AnchorWallet, useConnection, useWallet } from '@solana/wallet-adapter-react';
-
-export function useAnchorProvider() {
-  const { connection } = useConnection();
-  const wallet = useWallet();
-
-  return new AnchorProvider(connection, wallet as AnchorWallet, { commitment: 'confirmed' });
-}