@xswap-link/sdk 0.9.1 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xswap-link/sdk",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "JavaScript SDK for XSwap platform",
   "homepage": "https://github.com/xswap-link/xswap-sdk",
   "repository": {
@@ -36,6 +36,8 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@r2wc/core": "^1.1.0",
     "@tanstack/react-query": "^5.64.2",
+    "@wagmi/connectors": "^5.7.5",
+    "@wagmi/core": "^2.16.3",
     "async-retry": "^1.3.3",
     "bignumber.js": "4.0.4",
     "date-fns": "^3.6.0",

package/src/components/Swap/SwapView/SwapButton/index.tsx

@@ -34,6 +34,8 @@ export const SwapButton = () => {
     srcTokenBalanceWei,
     isFetchingRoute,
     isAsyncDataLoaded,
+    hasOnConnectWalletCallback,
+    onConnectWallet,
   } = useSwapContext();
 
   const { setTxStatus, setTxMsg, setTxModalOpen, enqueueTransaction } =
@@ -111,13 +113,19 @@ export const SwapButton = () => {
 
     if (!address) {
       return {
-        text: integrationConfig.defaultWalletPicker
-          ? "Connect Wallet"
-          : "Connect Wallet First",
+        text:
+          integrationConfig.defaultWalletPicker || hasOnConnectWalletCallback
+            ? "Connect Wallet"
+            : "Connect Wallet First",
         fn: () => {
-          setConnectWalletModalOpen(true);
+          if (integrationConfig.defaultWalletPicker) {
+            setConnectWalletModalOpen(true);
+          } else if (hasOnConnectWalletCallback) {
+            onConnectWallet();
+          }
         },
-        disabled: !integrationConfig.defaultWalletPicker,
+        disabled:
+          !integrationConfig.defaultWalletPicker && !hasOnConnectWalletCallback,
       };
     }
 

package/src/components/TxConfigForm/index.tsx

@@ -32,9 +32,14 @@ const WagmiReload: FC = () => {
   const { reconnect } = useReconnect();
 
   useEffect(() => {
+    let count = 0;
     const interval = setInterval(() => {
       reconnect();
-    }, 200);
+      count++;
+      if (count >= 5) {
+        clearInterval(interval);
+      }
+    }, 1000);
 
     return () => {
       clearInterval(interval);
@@ -91,6 +96,7 @@ export const TxConfigForm = ({
   onSrcTokenChange,
   onSrcChainChange,
   bridge,
+  onConnectWallet,
 }: TxConfigFormPayload &
   (
     | {
@@ -156,6 +162,7 @@ export const TxConfigForm = ({
                 onSrcTokenChange,
                 onSrcChainChange,
                 bridge,
+                onConnectWallet,
               }}
               supportedChains={supportedChains}
               wagmiConfig={wagmiConfig}

package/src/components/TxWidgetWC/index.tsx

@@ -33,6 +33,7 @@ const TxWidget = ({
   onDstChainChange,
   onSrcTokenChange,
   onSrcChainChange,
+  onConnectWallet,
   bridge,
 }: WidgetIntegrationPayload) => {
   const [loading, setLoading] = useState(true);
@@ -95,6 +96,7 @@ const TxWidget = ({
           onDstChainChange={onDstChainChange}
           onSrcTokenChange={onSrcTokenChange}
           onSrcChainChange={onSrcChainChange}
+          onConnectWallet={onConnectWallet}
           bridge={bridge}
         />
       )}

package/src/components/TxWidgetWCWrapped/index.tsx

@@ -45,6 +45,7 @@ export const TxWidgetWCWrapped = ({
   onDstChainChange,
   onSrcTokenChange,
   onSrcChainChange,
+  onConnectWallet,
   bridge,
 }: WidgetIntegrationPayload) => {
   useEffect(() => {
@@ -55,12 +56,14 @@ export const TxWidgetWCWrapped = ({
     window.xPayOnDstChainChange = onDstChainChange;
     window.xPayOnSrcTokenChange = onSrcTokenChange;
     window.xPayOnSrcChainChange = onSrcChainChange;
+    window.xPayOnConnectWallet = onConnectWallet;
   }, [
     onPendingTransactionsChange,
     onDstTokenChange,
     onDstChainChange,
     onSrcTokenChange,
     onSrcChainChange,
+    onConnectWallet,
   ]);
 
   return (

package/src/config/wagmiConfig.ts

@@ -3,8 +3,8 @@ import { isServer } from "@src/utils";
 import { Transport } from "viem";
 import * as WagmiChains from "viem/chains";
 import { mainnet } from "viem/chains";
-import { Config, createConfig, createStorage, http } from "wagmi";
-import { injected, metaMask, safe, walletConnect } from "wagmi/connectors";
+import { Config, createConfig, createStorage, http } from "@wagmi/core";
+import { injected, walletConnect, coinbaseWallet } from "@wagmi/connectors";
 
 const storage = createStorage({
   key: "xpay.wagmi.store",
@@ -19,11 +19,13 @@ export const getWagmiConfig = (supportedChains: Chain[]): Config => {
     transports,
     connectors: [
       injected(),
-      metaMask(),
-      safe(),
+      coinbaseWallet({
+        appLogoUrl: "https://xswap.link/favicon.ico",
+        appName: "XSwap",
+      }),
       walletConnect({
         projectId: "c392898b45ac587a280b5eb33e92aeb0",
-        showQrModal: false,
+        showQrModal: true,
       }),
     ],
     storage,

package/src/context/SwapProvider.tsx

@@ -109,6 +109,8 @@ type SwapContext = {
     chainId: string,
   ) => Token | undefined;
   bridgeTokensDictionary: BridgeTokensDictionary | null;
+  onConnectWallet: () => void;
+  hasOnConnectWalletCallback: boolean;
 };
 
 const functionNotImplemented = () => {
@@ -172,6 +174,8 @@ const init: SwapContext = {
   refreshBalance: functionNotImplemented,
   findTokenDataByAddressAndChain: functionNotImplemented,
   bridgeTokensDictionary: null,
+  onConnectWallet: functionNotImplemented,
+  hasOnConnectWalletCallback: false,
 };
 
 const swapContext = createContext(init);
@@ -923,6 +927,18 @@ export const SwapProvider = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [integrationConfig.onSrcTokenChange, srcToken]);
 
+  const onConnectWallet = useCallback(() => {
+    if (integrationConfig.onConnectWallet) {
+      integrationConfig.onConnectWallet();
+    } else if (window.xPayOnConnectWallet) {
+      window.xPayOnConnectWallet();
+    }
+  }, [integrationConfig]);
+
+  const hasOnConnectWalletCallback = useMemo(() => {
+    return !!(integrationConfig.onConnectWallet || window.xPayOnConnectWallet);
+  }, [integrationConfig.onConnectWallet]);
+
   return (
     <swapContext.Provider
       value={{
@@ -982,6 +998,8 @@ export const SwapProvider = ({
         dstTokenLocked,
         dstChainLocked,
         bridgeTokensDictionary,
+        onConnectWallet,
+        hasOnConnectWalletCallback,
       }}
     >
       {children}

package/src/models/payloads/ModalIntegrationPayload.ts

@@ -61,5 +61,6 @@ export type ModalIntegrationPayload = {
     token: { address: string; symbol: string } | undefined,
   ) => void;
   onSrcChainChange?: (chain: string | undefined) => void;
+  onConnectWallet?: () => void;
   bridge?: boolean;
 };

package/src/models/payloads/WidgetIntegrationPayload.ts

@@ -25,5 +25,6 @@ export type WidgetIntegrationPayload = {
     token: { address: string; symbol: string } | undefined,
   ) => void;
   onSrcChainChange?: (chain: string | undefined) => void;
+  onConnectWallet?: () => void;
   bridge?: boolean;
 };

package/src/types/global.d.ts

@@ -11,5 +11,6 @@ declare global {
       token: { address: string; symbol: string } | undefined,
     ) => void;
     xPayOnSrcChainChange?: (chain: string | undefined) => void;
+    xPayOnConnectWallet?: () => void;
   }
 }