@xswap-link/sdk 0.12.1 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xswap-link/sdk",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "JavaScript SDK for XSwap platform",
   "homepage": "https://github.com/xswap-link/xswap-sdk",
   "repository": {

package/src/components/TxConfigForm/index.tsx

@@ -110,6 +110,7 @@ export const TxConfigForm = (props: TxConfigFormProps) => {
     integratorFee,
     integratorFeeReceiverAddress,
     highlightedDstTokens,
+    wagmiConfig: providedWagmiConfig,
   } = normalizedProps;
 
   const onBackdropClick = (e: MouseEvent) => {
@@ -122,8 +123,11 @@ export const TxConfigForm = (props: TxConfigFormProps) => {
   };
 
   const wagmiConfig = useMemo(
-    () => getWagmiConfig(supportedChains),
-    [supportedChains],
+    () =>
+      providedWagmiConfig ??
+      window.xPayWagmiConfig ??
+      getWagmiConfig(supportedChains),
+    [providedWagmiConfig, supportedChains],
   );
 
   useEffect(() => {
@@ -223,6 +227,7 @@ export const openTxConfigForm = async ({
   srcTokenLocked,
   srcChainLocked,
   override,
+  wagmiConfig,
 }: TxConfigFormPayload): Promise<UnifiedRoute> => {
   try {
     if (xpayRoot === null) {
@@ -267,6 +272,7 @@ export const openTxConfigForm = async ({
           srcTokenLocked={srcTokenLocked}
           srcChainLocked={srcChainLocked}
           override={override}
+          wagmiConfig={wagmiConfig}
         />,
       );
     });

package/src/components/TxWidgetWCWrapped/index.tsx

@@ -51,7 +51,13 @@ export const TxWidgetWCWrapped = ({
   integratorFee,
   integratorFeeReceiverAddress,
   highlightedDstTokens,
+  wagmiConfig,
 }: WidgetIntegrationPayload) => {
+  // Must be synchronous: the WC mounts its inner React tree before useEffect fires.
+  if (typeof window !== "undefined") {
+    window.xPayWagmiConfig = wagmiConfig;
+  }
+
   useEffect(() => {
     // We couldn't find a way to pass a function to the web component created by @r2wc/core.
     // It is assigned to window to be accessed later from within the web component.

package/src/config/wagmiConfig.ts

@@ -4,7 +4,7 @@ import { defineChain, Transport } from "viem";
 import * as WagmiChains from "viem/chains";
 import { mainnet } from "viem/chains";
 import { Config, createConfig, createStorage, http } from "@wagmi/core";
-import { walletConnect } from "@wagmi/connectors";
+import { injected, walletConnect } from "@wagmi/connectors";
 
 const storage = createStorage({
   key: "xpay.wagmi.store",
@@ -18,6 +18,7 @@ export const getWagmiConfig = (supportedChains: Chain[]): Config => {
     chains,
     transports,
     connectors: [
+      injected(),
       walletConnect({
         projectId: "c392898b45ac587a280b5eb33e92aeb0",
         showQrModal: true,

package/src/context/SwapProvider.tsx

@@ -673,19 +673,24 @@ export const SwapProvider = ({
 
     const nonce = crypto.randomUUID();
     refreshSelectedTokenBalanceNonce.current = nonce;
-
     setIsFetchingBalance(true);
     let balance = "0";
     if (srcChain?.ecosystem === Ecosystem.EVM && evmAddress) {
-      const balanceUI = await getBalanceOf(
-        evmAddress,
-        srcToken.address,
-        srcChain?.publicRpcUrls[0],
-      );
-      balance = humanReadableToWei({
-        amount: balanceUI,
-        decimals: srcToken.decimals,
-      });
+      const balanceFromBackend =
+        tokenBalances[srcChain?.chainId]?.[srcToken.address];
+      if (balanceFromBackend === undefined) {
+        const balanceUI = await getBalanceOf(
+          evmAddress,
+          srcToken.address,
+          srcChain?.publicRpcUrls[0],
+        );
+        balance = humanReadableToWei({
+          amount: balanceUI,
+          decimals: srcToken.decimals,
+        });
+      } else {
+        balance = balanceFromBackend;
+      }
     } else if (srcChain?.ecosystem === Ecosystem.SOLANA && solanaAddress) {
       const solanaPublicKey = new PublicKey(solanaAddress);
       const connection = new Connection(srcChain.publicRpcUrls[0]!);
@@ -719,7 +724,6 @@ export const SwapProvider = ({
         }
       }
     }
-
     if (nonce !== refreshSelectedTokenBalanceNonce.current) {
       return;
     }
@@ -727,7 +731,7 @@ export const SwapProvider = ({
     setSrcTokenBalanceWei(balance);
 
     setIsFetchingBalance(false);
-  }, [evmAddress, solanaAddress, srcChain, srcToken]);
+  }, [evmAddress, solanaAddress, srcChain, srcToken, tokenBalances]);
   // retrieves token details for a given token address and chain from supported tokens mapping. (including imported tokens)
   const findTokenDataByAddressAndChain = useCallback(
     (tokenAddress: string, chainId: string): Token | undefined => {
@@ -796,10 +800,8 @@ export const SwapProvider = ({
   // fetches user all token balances when a wallet address is available and supported chains are loaded.
   useEffect(() => {
     let isCancelled = false;
-
     if ((evmAddress || solanaAddress) && supportedChains.length > 0) {
       setIsFetchingBalances(true);
-
       getBalances({
         walletAddress: evmAddress,
         solanaWalletAddress: solanaAddress,

package/src/models/payloads/ModalIntegrationPayload.ts

@@ -1,4 +1,5 @@
 import { ContractCall, Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 export type ModalIntegrationThemeStyles = {
   mainAccentLight?: string;
@@ -71,4 +72,5 @@ export type ModalIntegrationPayload = {
   integratorFee?: number;
   integratorFeeReceiverAddress?: string;
   highlightedDstTokens?: string[];
+  wagmiConfig?: Config;
 };

package/src/models/payloads/WidgetIntegrationPayload.ts

@@ -1,4 +1,5 @@
 import { ContractCall, ModalIntegrationStyles, Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 export type WidgetIntegrationPayload = {
   integratorId: string;
@@ -33,4 +34,5 @@ export type WidgetIntegrationPayload = {
   integratorFee?: number;
   integratorFeeReceiverAddress?: string;
   highlightedDstTokens?: string[];
+  wagmiConfig?: Config;
 };

package/src/services/integrations/transactions.ts

@@ -26,6 +26,7 @@ export const openTransactionModal = async ({
   onSrcChainChange,
   bridge,
   highlightedDstTokens,
+  wagmiConfig,
 }: ModalIntegrationPayload) => {
   const supportedChains: Chain[] = (await getChains()).filter(
     ({ web3Environment, swapSupported, bridgeSupported }) =>
@@ -66,6 +67,7 @@ export const openTransactionModal = async ({
     onSrcChainChange,
     bridge,
     highlightedDstTokens,
+    wagmiConfig,
   });
 };
 

package/src/types/global.d.ts

@@ -1,4 +1,5 @@
 import { Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 declare global {
   interface Window {
@@ -12,5 +13,6 @@ declare global {
     ) => void;
     xPayOnSrcChainChange?: (chain: string | undefined) => void;
     xPayOnConnectWallet?: () => void;
+    xPayWagmiConfig?: Config;
   }
 }