@swype-org/react-sdk 0.2.261 → 0.2.263

package/dist/index.js

@@ -7553,6 +7553,9 @@ function screenForSession(session) {
       return "deposit-failed";
   }
 }
+function isSameChainSameTokenSelection(option, destination) {
+  return option.chainId === destination.chainId && option.tokenAddress.toLowerCase() === destination.token.address.toLowerCase();
+}
 function feeCopy(_session) {
   return "No fees";
 }
@@ -7651,9 +7654,13 @@ function useManualTransferSession({
       if (cancelled) return;
       setSourceOptions(sources);
       setLoadingSources(false);
+      const destTokenAddrLower = destination.token.address.toLowerCase();
+      const destMatch = sources.find(
+        (s) => s.chainId === destination.chainId && s.tokenAddress.toLowerCase() === destTokenAddrLower
+      );
       const svmCanonical = sources.find((s) => s.canonical && s.chainFamily === "svm");
       const evmCanonical = sources.find((s) => s.canonical && s.chainFamily === "evm");
-      const defaultOption = svmCanonical ?? evmCanonical ?? sources[0];
+      const defaultOption = destMatch ?? svmCanonical ?? evmCanonical ?? sources[0];
       if (defaultOption) {
         setSelectedToken(defaultOption.tokenSymbol);
         setSelectedChainId(String(defaultOption.chainId));
@@ -7750,10 +7757,14 @@ function useManualTransferSession({
   }, [sourceOptions, selectedToken]);
   const session = useMemo(() => {
     if (!selectedOption) return null;
+    const perToken = perTokenSessions[perTokenKey(selectedOption.chainId, selectedOption.tokenAddress)] ?? null;
+    if (isSameChainSameTokenSelection(selectedOption, destination)) {
+      return perToken ?? sessionsByFamily[selectedOption.chainFamily] ?? null;
+    }
     const familySession = sessionsByFamily[selectedOption.chainFamily];
     if (familySession) return familySession;
-    return perTokenSessions[perTokenKey(selectedOption.chainId, selectedOption.tokenAddress)] ?? null;
-  }, [selectedOption, sessionsByFamily, perTokenSessions]);
+    return perToken;
+  }, [selectedOption, destination, sessionsByFamily, perTokenSessions]);
   const depositAddress = session?.depositAddress;
   const qrReady = !!depositAddress;
   const lastFeeCopyRef = useRef(null);
@@ -7844,8 +7855,11 @@ function useManualTransferSession({
   }, [apiBaseUrl, destination, idempotencyKey, merchantAuthorization, tokens.text, tokens.bg]);
   useEffect(() => {
     if (!selectedOption) return;
-    if (sessionsByFamily[selectedOption.chainFamily]) return;
-    if (premintedFamiliesRef.current.has(selectedOption.chainFamily)) return;
+    const sameTokenSelection = isSameChainSameTokenSelection(selectedOption, destination);
+    if (!sameTokenSelection) {
+      if (sessionsByFamily[selectedOption.chainFamily]) return;
+      if (premintedFamiliesRef.current.has(selectedOption.chainFamily)) return;
+    }
     const key = perTokenKey(selectedOption.chainId, selectedOption.tokenAddress);
     if (perTokenSessions[key]) return;
     if (inFlightPerTokenRef.current.has(key)) return;
@@ -7853,7 +7867,7 @@ function useManualTransferSession({
     void createSession(selectedOption).finally(() => {
       inFlightPerTokenRef.current.delete(key);
     });
-  }, [selectedOption, sessionsByFamily, perTokenSessions, createSession]);
+  }, [selectedOption, destination, sessionsByFamily, perTokenSessions, createSession]);
   const resetSessionForNewSelection = useCallback(() => {
     setError(null);
   }, []);