@rozoai/intent-pay 0.1.1-alpha.5 → 0.1.1-beta.10

package/build/src/components/Pages/SelectToken/index.js

@@ -23,18 +23,14 @@ function SelectToken() {
     const { tokenMode, connectedWalletOnly } = paymentState;
     const { isConnected: isEvmConnected } = useAccount();
     const { isConnected: isStellarConnected, connector } = useStellar();
-    const { connected: isSolConnected, publicKey: solPublicKey } = useWallet();
-    // For Solana, only consider truly connected when we have publicKey
-    const isSolanaReady = useMemo(() => isSolConnected ||
-        solPublicKey != null ||
-        paymentState.solanaPubKey != null, [isSolConnected, solPublicKey, paymentState.solanaPubKey]);
-    const isConnected = useMemo(() => isEvmConnected || isSolanaReady || isStellarConnected, [isEvmConnected, isSolanaReady, isStellarConnected]);
+    const { connected: isSolConnected } = useWallet();
+    const isConnected = useMemo(() => isEvmConnected || isSolConnected || isStellarConnected, [isEvmConnected, isSolConnected, isStellarConnected]);
     // Detect if multiple networks are connected (e.g., Phantom connecting both EVM and Solana)
     const connectedNetworksCount = useMemo(() => {
         return ((isEvmConnected ? 1 : 0) +
-            (isSolanaReady ? 1 : 0) +
+            (isSolConnected ? 1 : 0) +
             (isStellarConnected ? 1 : 0));
-    }, [isEvmConnected, isSolanaReady, isStellarConnected]);
+    }, [isEvmConnected, isSolConnected, isStellarConnected]);
     // If multiple networks are connected, override tokenMode to "all" to show all available tokens
     const effectiveTokenMode = useMemo(() => {
         return connectedNetworksCount > 1 ? "all" : tokenMode;
@@ -46,61 +42,28 @@ function SelectToken() {
             return false;
         // Check if there's a connected wallet that matches the payment options
         const hasMatchingConnectedWallet = (effectiveTokenMode === "evm" && isEvmConnected) ||
-            (effectiveTokenMode === "solana" && isSolanaReady) ||
+            (effectiveTokenMode === "solana" && isSolConnected) ||
             (effectiveTokenMode === "stellar" && isStellarConnected && connector) ||
             (effectiveTokenMode === "all" &&
-                (isEvmConnected || isSolanaReady || isStellarConnected));
+                (isEvmConnected || isSolConnected || isStellarConnected));
         return !hasMatchingConnectedWallet;
     }, [
         isEvmConnected,
-        isSolanaReady,
+        isSolConnected,
         isStellarConnected,
         connectedWalletOnly,
         effectiveTokenMode,
         connector,
     ]);
-    // Check if we're waiting for Solana publicKey to become available
-    const waitingForSolanaKey = useMemo(() => {
-        return ((effectiveTokenMode === "solana" || effectiveTokenMode === "all") &&
-            isSolConnected &&
-            !solPublicKey);
-    }, [effectiveTokenMode, isSolConnected, solPublicKey]);
-    // Check if we're still loading Solana data (publicKey exists but options not loaded yet)
-    const waitingForSolanaData = useMemo(() => {
-        return ((effectiveTokenMode === "solana" || effectiveTokenMode === "all") &&
-            isSolanaReady &&
-            optionsList.length === 0 &&
-            paymentState.solanaPaymentOptions.isLoading);
-    }, [
-        effectiveTokenMode,
-        isSolanaReady,
-        optionsList.length,
-        paymentState.solanaPaymentOptions.isLoading,
-    ]);
-    // Combined waiting state for better UX
-    const isWaitingForSolana = waitingForSolanaKey || waitingForSolanaData;
     // Prevent showing "Insufficient balance" too quickly to avoid flickering
     const showInsufficientBalance = useMemo(() => {
-        return (!isLoading &&
-            isConnected &&
-            optionsList.length === 0 &&
-            !isWaitingForSolana);
-    }, [isLoading, isConnected, optionsList.length, isWaitingForSolana]);
-    return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: !connectedWalletOnly, show: effectiveTokenMode, excludeLogos: ["stellar"] }), jsx(OptionsList, { requiredSkeletons: 3, isLoading: Boolean(isLoading || isWaitingForSolana), options: optionsList, scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), waitingForSolanaKey && (jsx(WaitingForWallet, { message: "Connecting to Solana wallet..." })), waitingForSolanaData && (jsx(WaitingForWallet, { message: "Loading Solana tokens..." })), showInsufficientBalance && !noConnectedWallet && (jsx(InsufficientBalance, { onRefresh: refreshOptions })), !isLoading && !isConnected && effectiveTokenMode === "all" && (jsx(ConnectButton, {})), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {}), noConnectedWallet && jsx(NoConnectedWallet, {})] }));
+        return !isLoading && isConnected && optionsList.length === 0;
+    }, [isLoading, isConnected, optionsList.length]);
+    return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: !connectedWalletOnly, show: effectiveTokenMode, excludeLogos: ["stellar"] }), jsx(OptionsList, { requiredSkeletons: 3, isLoading: isLoading, options: optionsList, scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), showInsufficientBalance && !noConnectedWallet && (jsx(InsufficientBalance, { onRefresh: refreshOptions })), !isLoading && !isConnected && effectiveTokenMode === "all" && (jsx(ConnectButton, {})), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {}), noConnectedWallet && jsx(NoConnectedWallet, {})] }));
 }
 function NoConnectedWallet() {
     return (jsxs(ModalContent, { children: [jsx(ModalH1, { children: "No connected wallet." }), jsx(SelectAnotherMethodButton, {})] }));
 }
-function WaitingForWallet({ message }) {
-    return (jsx(ModalContent, { style: {
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            justifyContent: "center",
-            paddingTop: 8,
-            paddingBottom: 8,
-        }, children: jsx(ModalH1, { style: { fontSize: "14px", fontWeight: 500 }, children: message }) }));
-}
 function InsufficientBalance({ onRefresh, }) {
     const [isRefreshing, setIsRefreshing] = useState(false);
     const handleRefresh = async () => {

package/build/src/components/Pages/SelectToken/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;;;;AAiBc,SAAU,WAAW,GAAA;AACjC,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,QAAQ,IAAI,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC;AAE5D,IAAA,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACzC,IAAA,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;IAExD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;AACpE,IAAA,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAC;;AAG3E,IAAA,MAAM,aAAa,GAAG,OAAO,CAC3B,MACE,cAAc;AACd,QAAA,YAAY,IAAI,IAAI;AACpB,QAAA,YAAY,CAAC,YAAY,IAAI,IAAI,EACnC,CAAC,cAAc,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,CAC1D,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,MAAM,cAAc,IAAI,aAAa,IAAI,kBAAkB,EAC3D,CAAC,cAAc,EAAE,aAAa,EAAE,kBAAkB,CAAC,CACpD,CAAC;;AAGF,IAAA,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAK;QAC1C,QACE,CAAC,cAAc,GAAG,CAAC,GAAG,CAAC;aACtB,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;aACtB,kBAAkB,GAAG,CAAC,GAAG,CAAC,CAAC,EAC5B;KACH,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC,CAAC;;AAGxD,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAK;QACtC,OAAO,sBAAsB,GAAG,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC;AACxD,KAAC,EAAE,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAAC;AAExC,IAAA,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAC9C,eAAe,CAAC,kBAAkB,CAAC,CAAC;AAEtC,IAAA,MAAM,4BAA4B,GAAG,OAAO,CAC1C,MAAM,CAAC,mBAAmB,EAC1B,CAAC,mBAAmB,CAAC,CACtB,CAAC;AAEF,IAAA,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAK;AACrC,QAAA,IAAI,CAAC,mBAAmB;AAAE,YAAA,OAAO,KAAK,CAAC;;QAGvC,MAAM,0BAA0B,GAC9B,CAAC,kBAAkB,KAAK,KAAK,IAAI,cAAc;AAC/C,aAAC,kBAAkB,KAAK,QAAQ,IAAI,aAAa,CAAC;AAClD,aAAC,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,IAAI,SAAS,CAAC;aACpE,kBAAkB,KAAK,KAAK;AAC3B,iBAAC,cAAc,IAAI,aAAa,IAAI,kBAAkB,CAAC,CAAC,CAAC;QAE7D,OAAO,CAAC,0BAA0B,CAAC;AACrC,KAAC,EAAE;QACD,cAAc;QACd,aAAa;QACb,kBAAkB;QAClB,mBAAmB;QACnB,kBAAkB;QAClB,SAAS;AACV,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAK;QACvC,QACE,CAAC,kBAAkB,KAAK,QAAQ,IAAI,kBAAkB,KAAK,KAAK;YAChE,cAAc;YACd,CAAC,YAAY,EACb;KACH,EAAE,CAAC,kBAAkB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;;AAGvD,IAAA,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAK;QACxC,QACE,CAAC,kBAAkB,KAAK,QAAQ,IAAI,kBAAkB,KAAK,KAAK;YAChE,aAAa;YACb,WAAW,CAAC,MAAM,KAAK,CAAC;AACxB,YAAA,YAAY,CAAC,oBAAoB,CAAC,SAAS,EAC3C;AACJ,KAAC,EAAE;QACD,kBAAkB;QAClB,aAAa;AACb,QAAA,WAAW,CAAC,MAAM;QAClB,YAAY,CAAC,oBAAoB,CAAC,SAAS;AAC5C,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,kBAAkB,GAAG,mBAAmB,IAAI,oBAAoB,CAAC;;AAGvE,IAAA,MAAM,uBAAuB,GAAG,OAAO,CAAC,MAAK;QAC3C,QACE,CAAC,SAAS;YACV,WAAW;YACX,WAAW,CAAC,MAAM,KAAK,CAAC;YACxB,CAAC,kBAAkB,EACnB;AACJ,KAAC,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;AAErE,IAAA,QACEA,IAAA,CAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,GAAC,CAAA,WAAW,EACV,EAAA,QAAQ,EAAE,CAAC,mBAAmB,EAC9B,IAAI,EAAE,kBAAkB,EACxB,YAAY,EAAE,CAAC,SAAS,CAAC,EACzB,CAAA,EACFA,GAAC,CAAA,WAAW,EACV,EAAA,iBAAiB,EAAE,CAAC,EACpB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC,EACnD,OAAO,EAAE,WAAW,EACpB,YAAY,EACV,4BAA4B,IAAI,cAAc,GAAG,GAAG,GAAG,GAAG,EAE5D,SAAS,EAAE,4BAA4B,EACvC,cAAc,EAAE,CAAC,4BAA4B,EAC7C,CAAA,EACD,mBAAmB,KAClBA,GAAA,CAAC,gBAAgB,EAAA,EAAC,OAAO,EAAC,gCAAgC,EAAA,CAAG,CAC9D,EACA,oBAAoB,KACnBA,GAAC,CAAA,gBAAgB,EAAC,EAAA,OAAO,EAAC,0BAA0B,EAAG,CAAA,CACxD,EACA,uBAAuB,IAAI,CAAC,iBAAiB,KAC5CA,GAAC,CAAA,mBAAmB,IAAC,SAAS,EAAE,cAAc,EAAA,CAAI,CACnD,EACA,CAAC,SAAS,IAAI,CAAC,WAAW,IAAI,kBAAkB,KAAK,KAAK,KACzDA,GAAC,CAAA,aAAa,EAAG,EAAA,CAAA,CAClB,EACA,4BAA4B,IAAIA,GAAA,CAAC,yBAAyB,EAAG,EAAA,CAAA,EAC7D,iBAAiB,IAAIA,GAAC,CAAA,iBAAiB,EAAG,EAAA,CAAA,CAAA,EAAA,CAC/B,EACd;AACJ,CAAC;AAED,SAAS,iBAAiB,GAAA;AACxB,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EAAA,QAAA,EAAA,CACXC,GAAC,CAAA,OAAO,EAA+B,EAAA,QAAA,EAAA,sBAAA,EAAA,CAAA,EACvCA,GAAC,CAAA,yBAAyB,EAAG,EAAA,CAAA,CAAA,EAAA,CAChB,EACf;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAE,OAAO,EAAuB,EAAA;AACxD,IAAA,QACEA,GAAA,CAAC,YAAY,EAAA,EACX,KAAK,EAAE;AACL,YAAA,OAAO,EAAE,MAAM;AACf,YAAA,aAAa,EAAE,QAAQ;AACvB,YAAA,UAAU,EAAE,QAAQ;AACpB,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,UAAU,EAAE,CAAC;AACb,YAAA,aAAa,EAAE,CAAC;AACjB,SAAA,EAAA,QAAA,EAEDA,IAAC,OAAO,EAAA,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,EAAA,QAAA,EAAG,OAAO,EAAW,CAAA,EAAA,CAC7D,EACf;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC3B,SAAS,GAGV,EAAA;IACC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AAExD,IAAA,MAAM,aAAa,GAAG,YAAW;QAC/B,eAAe,CAAC,IAAI,CAAC,CAAC;AACtB,QAAA,IAAI;YACF,MAAM,SAAS,EAAE,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;SACrD;gBAAS;YACR,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;AACH,KAAC,CAAC;AAEF,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EACX,KAAK,EAAE;AACL,YAAA,OAAO,EAAE,MAAM;AACf,YAAA,aAAa,EAAE,QAAQ;AACvB,YAAA,UAAU,EAAE,QAAQ;AACpB,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,aAAa,EAAE,EAAE;AACjB,YAAA,GAAG,EAAE,EAAE;SACR,EAED,QAAA,EAAA,CAAAC,GAAA,CAAC,OAAO,EAAgC,EAAA,QAAA,EAAA,uBAAA,EAAA,CAAA,EACxCA,IAAC,MAAM,EAAA,EACL,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAEA,GAAC,CAAA,SAAS,KAAG,EACnB,YAAY,EAAC,MAAM,EAAA,QAAA,EAElB,YAAY,GAAG,eAAe,GAAG,iBAAiB,EAC5C,CAAA,EACTA,IAAC,yBAAyB,EAAA,EAAA,CAAG,CAChB,EAAA,CAAA,EACf;AACJ,CAAC;AAED,SAAS,aAAa,GAAA;AACpB,IAAA,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAC;AACjC,IAAA,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;;IAElC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAClD,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAuB,CAClD,CAAC;AACF,IAAA,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,CAACA,GAAA,CAAC,QAAQ,EAAK,EAAA,EAAA,UAAU,CAAG,CAAC,CAAC;IAC5C,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAACA,GAAA,CAAC,MAAM,EAAK,EAAA,EAAA,QAAQ,CAAG,CAAC,CAAC;KACrC;IAED,MAAM,OAAO,GAAG,MAAK;AACnB,QAAA,OAAO,CAAC;YACN,SAAS,EAAE,QAAQ,EAAE;AACtB,SAAA,CAAC,CAAC;QACH,IAAI,eAAe,EAAE;AACnB,YAAA,IAAI,aAAa,CAAC,MAAM,IAAI,IAAI,EAAE;AAChC,gBAAA,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,aAAa,CAAC,OAAO,EAAE,CAAC;SACzB;AACH,KAAC,CAAC;AAEF,IAAA,MAAM,aAAa,GAAG;AACpB,QAAA,EAAE,EAAE,gBAAgB;AACpB,QAAA,KAAK,EAAE,gBAAgB;QACvB,KAAK;QACL,OAAO;KACR,CAAC;IAEF,OAAOA,GAAA,CAAC,WAAW,EAAC,EAAA,OAAO,EAAE,CAAC,aAAa,CAAC,EAAA,CAAI,CAAC;AACnD;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;;;;AAiBc,SAAU,WAAW,GAAA;AACjC,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,QAAQ,IAAI,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC;AAE5D,IAAA,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACzC,IAAA,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;IAExD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;IACpE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,CAAC;IAElD,MAAM,WAAW,GAAG,OAAO,CACzB,MAAM,cAAc,IAAI,cAAc,IAAI,kBAAkB,EAC5D,CAAC,cAAc,EAAE,cAAc,EAAE,kBAAkB,CAAC,CACrD,CAAC;;AAGF,IAAA,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAK;QAC1C,QACE,CAAC,cAAc,GAAG,CAAC,GAAG,CAAC;aACtB,cAAc,GAAG,CAAC,GAAG,CAAC,CAAC;aACvB,kBAAkB,GAAG,CAAC,GAAG,CAAC,CAAC,EAC5B;KACH,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAC;;AAGzD,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAK;QACtC,OAAO,sBAAsB,GAAG,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC;AACxD,KAAC,EAAE,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAAC;AAExC,IAAA,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAC9C,eAAe,CAAC,kBAAkB,CAAC,CAAC;AAEtC,IAAA,MAAM,4BAA4B,GAAG,OAAO,CAC1C,MAAM,CAAC,mBAAmB,EAC1B,CAAC,mBAAmB,CAAC,CACtB,CAAC;AAEF,IAAA,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAK;AACrC,QAAA,IAAI,CAAC,mBAAmB;AAAE,YAAA,OAAO,KAAK,CAAC;;QAGvC,MAAM,0BAA0B,GAC9B,CAAC,kBAAkB,KAAK,KAAK,IAAI,cAAc;AAC/C,aAAC,kBAAkB,KAAK,QAAQ,IAAI,cAAc,CAAC;AACnD,aAAC,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,IAAI,SAAS,CAAC;aACpE,kBAAkB,KAAK,KAAK;AAC3B,iBAAC,cAAc,IAAI,cAAc,IAAI,kBAAkB,CAAC,CAAC,CAAC;QAE9D,OAAO,CAAC,0BAA0B,CAAC;AACrC,KAAC,EAAE;QACD,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,mBAAmB;QACnB,kBAAkB;QAClB,SAAS;AACV,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,uBAAuB,GAAG,OAAO,CAAC,MAAK;QAC3C,OAAO,CAAC,SAAS,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC;KAC9D,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjD,QACEA,KAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,IAAC,WAAW,EAAA,EACV,QAAQ,EAAE,CAAC,mBAAmB,EAC9B,IAAI,EAAE,kBAAkB,EACxB,YAAY,EAAE,CAAC,SAAS,CAAC,EACzB,CAAA,EACFA,GAAC,CAAA,WAAW,IACV,iBAAiB,EAAE,CAAC,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,WAAW,EACpB,YAAY,EACV,4BAA4B,IAAI,cAAc,GAAG,GAAG,GAAG,GAAG,EAE5D,SAAS,EAAE,4BAA4B,EACvC,cAAc,EAAE,CAAC,4BAA4B,EAC7C,CAAA,EACD,uBAAuB,IAAI,CAAC,iBAAiB,KAC5CA,GAAA,CAAC,mBAAmB,EAAA,EAAC,SAAS,EAAE,cAAc,EAAI,CAAA,CACnD,EACA,CAAC,SAAS,IAAI,CAAC,WAAW,IAAI,kBAAkB,KAAK,KAAK,KACzDA,GAAC,CAAA,aAAa,EAAG,EAAA,CAAA,CAClB,EACA,4BAA4B,IAAIA,GAAC,CAAA,yBAAyB,EAAG,EAAA,CAAA,EAC7D,iBAAiB,IAAIA,IAAC,iBAAiB,EAAA,EAAA,CAAG,CAC/B,EAAA,CAAA,EACd;AACJ,CAAC;AAED,SAAS,iBAAiB,GAAA;AACxB,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EAAA,QAAA,EAAA,CACXC,GAAC,CAAA,OAAO,EAA+B,EAAA,QAAA,EAAA,sBAAA,EAAA,CAAA,EACvCA,GAAC,CAAA,yBAAyB,EAAG,EAAA,CAAA,CAAA,EAAA,CAChB,EACf;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC3B,SAAS,GAGV,EAAA;IACC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AAExD,IAAA,MAAM,aAAa,GAAG,YAAW;QAC/B,eAAe,CAAC,IAAI,CAAC,CAAC;AACtB,QAAA,IAAI;YACF,MAAM,SAAS,EAAE,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;SACrD;gBAAS;YACR,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;AACH,KAAC,CAAC;AAEF,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EACX,KAAK,EAAE;AACL,YAAA,OAAO,EAAE,MAAM;AACf,YAAA,aAAa,EAAE,QAAQ;AACvB,YAAA,UAAU,EAAE,QAAQ;AACpB,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,aAAa,EAAE,EAAE;AACjB,YAAA,GAAG,EAAE,EAAE;SACR,EAED,QAAA,EAAA,CAAAC,GAAA,CAAC,OAAO,EAAgC,EAAA,QAAA,EAAA,uBAAA,EAAA,CAAA,EACxCA,IAAC,MAAM,EAAA,EACL,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAEA,GAAC,CAAA,SAAS,KAAG,EACnB,YAAY,EAAC,MAAM,EAAA,QAAA,EAElB,YAAY,GAAG,eAAe,GAAG,iBAAiB,EAC5C,CAAA,EACTA,IAAC,yBAAyB,EAAA,EAAA,CAAG,CAChB,EAAA,CAAA,EACf;AACJ,CAAC;AAED,SAAS,aAAa,GAAA;AACpB,IAAA,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAC;AACjC,IAAA,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;;IAElC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAClD,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAuB,CAClD,CAAC;AACF,IAAA,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,CAACA,GAAA,CAAC,QAAQ,EAAK,EAAA,EAAA,UAAU,CAAG,CAAC,CAAC;IAC5C,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAACA,GAAA,CAAC,MAAM,EAAK,EAAA,EAAA,QAAQ,CAAG,CAAC,CAAC;KACrC;IAED,MAAM,OAAO,GAAG,MAAK;AACnB,QAAA,OAAO,CAAC;YACN,SAAS,EAAE,QAAQ,EAAE;AACtB,SAAA,CAAC,CAAC;QACH,IAAI,eAAe,EAAE;AACnB,YAAA,IAAI,aAAa,CAAC,MAAM,IAAI,IAAI,EAAE;AAChC,gBAAA,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,aAAa,CAAC,OAAO,EAAE,CAAC;SACzB;AACH,KAAC,CAAC;AAEF,IAAA,MAAM,aAAa,GAAG;AACpB,QAAA,EAAE,EAAE,gBAAgB;AACpB,QAAA,KAAK,EAAE,gBAAgB;QACvB,KAAK;QACL,OAAO;KACR,CAAC;IAEF,OAAOA,GAAA,CAAC,WAAW,EAAC,EAAA,OAAO,EAAE,CAAC,aAAa,CAAC,EAAA,CAAI,CAAC;AACnD;;;;"}

package/build/src/components/Pages/Solana/ConnectorSolana/index.js

@@ -12,7 +12,6 @@ import SquircleSpinner from '../../../Spinners/SquircleSpinner/index.js';
 const ConnectSolana = () => {
     const solanaWallets = useWallet();
     const isConnected = solanaWallets.connected;
-    const publicKey = solanaWallets.publicKey;
     const { solanaConnector, setRoute, paymentState } = usePayContext();
     const { setTokenMode } = paymentState;
     const selectedWallet = solanaWallets.wallets.find((wallet) => wallet.adapter.name === solanaConnector);
@@ -39,23 +38,19 @@ const ConnectSolana = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [solanaConnector]);
     useEffect(() => {
-        // Wait for BOTH connected status AND publicKey to be available
-        if (!isConnected || !publicKey)
+        if (!isConnected)
             return;
         // Wait so user can see it's connected
         const meta = {
             event: "wait-solana-connected",
             walletName: solanaWallets.wallet?.adapter.name,
-            publicKey: publicKey.toBase58(),
         };
-        // Longer timeout to ensure publicKey has fully propagated through ALL React contexts
-        // This is critical for mobile in-app browsers where context updates can be slower
         setTimeout(() => {
             setTokenMode("solana");
             setRoute(ROUTES.SELECT_TOKEN, meta);
-        }, 1500);
+        }, 500);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isConnected, publicKey]);
+    }, [isConnected]);
     if (!solanaConnector)
         return null;
     return (jsxs(PageContent, { children: [jsx(LoadingContainer, { children: jsx(AnimationContainer, { children: jsx(AnimatePresence, { children: jsx(SquircleSpinner, { logo: jsx("div", { style: { borderRadius: "22.5%", overflow: "hidden" }, children: getWalletIcon() }), loading: true }) }) }) }), jsx(ModalContent, { style: { paddingBottom: 0 }, children: isConnected ? (jsx(ModalH1, { children: "Connected" })) : (jsxs(Fragment, { children: [jsx(ModalH1, { children: "Requesting Connection" }), jsxs(ModalBody, { children: ["Open ", selectedWallet?.adapter.name, " to continue."] })] })) })] }));

package/build/src/components/Pages/Solana/ConnectorSolana/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/ConnectorSolana/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":";;;;;;;;;;;AAiBM,MAAA,aAAa,GAAa,MAAK;AACnC,IAAA,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAClC,IAAA,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC;AAC5C,IAAA,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;IAE1C,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACpE,IAAA,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC;IAEtC,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAC/C,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CACpD,CAAC;;IAGF,MAAM,aAAa,GAAG,MAAK;AACzB,QAAA,IAAI,CAAC,cAAc;AAAE,YAAA,OAAO,IAAI,CAAC;AAEjC,QAAA,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,KAAI;YAC9D,IAAI,CAAC,GAAG,CAAC,IAAI;AAAE,gBAAA,OAAO,KAAK,CAAC;YAC5B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7D,YAAA,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACtE,SAAC,CAAC,CAAC;AAEH,QAAA,IAAI,aAAa,EAAE,IAAI,EAAE;AACvB,YAAA,OAAO,OAAO,aAAa,CAAC,IAAI,KAAK,QAAQ,IAC3CA,GAAK,CAAA,KAAA,EAAA,EAAA,GAAG,EAAE,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,IAAI,EAAA,CAAI,IAExD,aAAa,CAAC,IAChB,CAAC;SACH;AAED,QAAA,QACEA,GACE,CAAA,KAAA,EAAA,EAAA,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,EAChC,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,EAAA,CAChC,EACF;AACJ,KAAC,CAAC;IAEF,SAAS,CAAC,MAAK;AACb,QAAA,IAAI,CAAC,eAAe;YAAE,OAAO;AAC7B,QAAA,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;;AAExC,KAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,SAAS,CAAC,MAAK;;AAEb,QAAA,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS;YAAE,OAAO;;AAGvC,QAAA,MAAM,IAAI,GAAG;AACX,YAAA,KAAK,EAAE,uBAAuB;AAC9B,YAAA,UAAU,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;AAC9C,YAAA,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;SAChC,CAAC;;;QAIF,UAAU,CAAC,MAAK;YACd,YAAY,CAAC,QAAQ,CAAC,CAAC;AACvB,YAAA,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;SACrC,EAAE,IAAI,CAAC,CAAC;;AAEX,KAAC,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;AAE7B,IAAA,IAAI,CAAC,eAAe;AAAE,QAAA,OAAO,IAAI,CAAC;AAElC,IAAA,QACEC,IAAC,CAAA,WAAW,eACVD,GAAC,CAAA,gBAAgB,cACfA,GAAC,CAAA,kBAAkB,EACjB,EAAA,QAAA,EAAAA,GAAA,CAAC,eAAe,EACd,EAAA,QAAA,EAAAA,GAAA,CAAC,eAAe,EACd,EAAA,IAAI,EACFA,GAAK,CAAA,KAAA,EAAA,EAAA,KAAK,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAA,QAAA,EACtD,aAAa,EAAE,EAAA,CACZ,EAER,OAAO,EAAE,IAAI,EACb,CAAA,EAAA,CACc,GACC,EACJ,CAAA,EACnBA,GAAC,CAAA,YAAY,IAAC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAA,QAAA,EACtC,WAAW,IACVA,IAAC,OAAO,EAAA,EAAA,QAAA,EAAA,WAAA,EAAA,CAAoB,KAE5BC,4BACED,GAAC,CAAA,OAAO,wCAAgC,EACxCC,IAAA,CAAC,SAAS,EACF,EAAA,QAAA,EAAA,CAAA,OAAA,EAAA,cAAc,EAAE,OAAO,CAAC,IAAI,EACxB,eAAA,CAAA,EAAA,CAAA,CAAA,EAAA,CACX,CACJ,EACY,CAAA,CAAA,EAAA,CACH,EACd;AACJ,EAAE;AAEW,MAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA,CAAA;;;;;;EAMhD;AACF,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA,CAAA;;;;;;;;;;;CAW5C;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/ConnectorSolana/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}

package/build/src/components/Pages/Solana/PayWithSolanaToken/index.js

@@ -1,9 +1,9 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { useRef, useState, useEffect } from 'react';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useState, useEffect, useCallback } from 'react';
 import { ROUTES } from '../../../../constants/routes.js';
 import { usePayContext } from '../../../../hooks/usePayContext.js';
 import { PageContent, ModalContent, ModalH1, Link } from '../../../Common/Modal/styles.js';
-import { formatPaymentResponseToHydratedOrder, rozoSolanaUSDC, getChainExplorerTxUrl, rozoSolana } from '@rozoai/intent-common';
+import { formatPaymentResponseToHydratedOrder, getChainExplorerTxUrl, rozoSolana } from '@rozoai/intent-common';
 import { useRozoPay } from '../../../../hooks/useDaimoPay.js';
 import { useSolanaDestination } from '../../../../hooks/useSolanaDestination.js';
 import { getSupportUrl } from '../../../../utils/supportUrl.js';
@@ -23,23 +23,32 @@ var PayState;
 })(PayState || (PayState = {}));
 const PayWithSolanaToken = () => {
     const { triggerResize, paymentState, setRoute, log } = usePayContext();
-    const { selectedSolanaTokenOption, payWithSolanaTokenRozo: payWithSolanaTokenImpl, payParams, rozoPaymentId, setRozoPaymentId, setTxHash, createPayment, } = paymentState;
-    const { store, order, paymentState: state, setPaymentStarted, setPaymentUnpaid, setPaymentRozoCompleted, setPaymentCompleted, hydrateOrderRozo, } = useRozoPay();
+    const { selectedSolanaTokenOption, payWithSolanaTokenRozo, payParams, rozoPaymentId, setRozoPaymentId, setTxHash, createPayment, } = paymentState;
+    const { store, order, paymentState: state, setPayId, setPaymentStarted, setPaymentUnpaid, setPaymentRozoCompleted, setPaymentCompleted, hydrateOrderRozo, } = useRozoPay();
     // Get the destination address and payment direction using our custom hook
     const { destinationAddress } = useSolanaDestination(payParams);
-    const submitButtonRef = useRef(null);
-    const [payState, setPayState] = useState(PayState.PreparingTransaction);
+    const [payState, setPayStateInner] = useState(PayState.PreparingTransaction);
     const [txURL, setTxURL] = useState();
     const [isLoading, setIsLoading] = useState(true);
-    const [pendingTxHash, setPendingTxHash] = useState();
     useEffect(() => {
         if (state === "error") {
             setRoute(ROUTES.ERROR);
             return;
         }
     }, [state]);
+    const setPayState = (state) => {
+        if (state === payState)
+            return;
+        setPayStateInner(state);
+        log(`[PayWithSolanaToken] payState: ${state}`);
+        // (trpc as TrpcClient).nav.mutate({
+        //   action: "pay-with-solana-token-state",
+        //   data: { state },
+        // });
+    };
+    // @NOTE: This is Pay In Solana by Rozo
     // FOR TRANSFER ACTION
-    const handleTransfer = async (option) => {
+    const handleTransfer = useCallback(async (option) => {
         setIsLoading(true);
         try {
             if (!destinationAddress) {
@@ -49,11 +58,12 @@ const PayWithSolanaToken = () => {
                 throw new Error("Order not initialized");
             }
             const { required } = option;
-            const needRozoPayment = "payinchainid" in order.metadata &&
-                Number(order.metadata.payinchainid) !== required.token.chainId;
+            const needRozoPayment = order.preferredChainId !== null &&
+                order.preferredChainId !== required.token.chainId;
             let hydratedOrder;
             let paymentId;
-            if (state === "payment_unpaid" && !needRozoPayment) {
+            if ((state === "payment_unpaid" || state === "payment_started") &&
+                !needRozoPayment) {
                 hydratedOrder = order;
             }
             else if (needRozoPayment) {
@@ -62,7 +72,8 @@ const PayWithSolanaToken = () => {
                     throw new Error("Failed to create Rozo payment");
                 }
                 paymentId = res.id;
-                hydratedOrder = formatPaymentResponseToHydratedOrder(res);
+                const formattedOrder = formatPaymentResponseToHydratedOrder(res);
+                hydratedOrder = formattedOrder;
             }
             else {
                 // Hydrate existing order
@@ -75,34 +86,88 @@ const PayWithSolanaToken = () => {
             const newId = paymentId ?? hydratedOrder.externalId;
             if (newId) {
                 setRozoPaymentId(newId);
-                setPaymentStarted(String(newId), hydratedOrder);
+                // Handle payment state transitions
+                // Get the ACTUAL current state from the store, not the stale React state
+                const currentState = store.getState().type;
+                if (currentState === "payment_started" && paymentId) {
+                    // A new payment was created while in payment_started state (cross-chain switch)
+                    // First transition back to payment_unpaid, then to payment_started with new order
+                    const oldPaymentId = order?.externalId;
+                    if (oldPaymentId) {
+                        try {
+                            await setPaymentUnpaid(oldPaymentId);
+                            await setPaymentStarted(String(newId), hydratedOrder);
+                        }
+                        catch (e) {
+                            // State might have changed during async operations
+                            console.warn("[PayWithSolanaToken] State transition failed, attempting direct start:", e);
+                            // Try to set started directly if state is already unpaid
+                            try {
+                                await setPaymentStarted(String(newId), hydratedOrder);
+                            }
+                            catch (e2) {
+                                console.error("[PayWithSolanaToken] Could not start payment:", e2);
+                                throw e2;
+                            }
+                        }
+                    }
+                    else {
+                        await setPaymentStarted(String(newId), hydratedOrder);
+                    }
+                }
+                else if (currentState !== "payment_started") {
+                    // State is not payment_started (preview, unhydrated, or payment_unpaid)
+                    // Only transition to payment_started if we're in payment_unpaid
+                    const stateBeforeTransition = store.getState().type;
+                    if (stateBeforeTransition === "payment_unpaid") {
+                        try {
+                            await setPaymentStarted(String(newId), hydratedOrder);
+                        }
+                        catch (e) {
+                            console.error("[PayWithSolanaToken] Could not start payment:", e);
+                            throw e;
+                        }
+                    }
+                    else {
+                        log(`[PayWithSolanaToken] Skipping setPaymentStarted - state is ${stateBeforeTransition}, needs to be payment_unpaid`);
+                    }
+                }
             }
             setPayState(PayState.RequestingPayment);
             const paymentData = {
-                tokenAddress: required.token.token ?? rozoSolanaUSDC.token,
-                destAddress: hydratedOrder.destFinalCall.to || destinationAddress,
-                usdcAmount: String(hydratedOrder.destFinalCallTokenAmount.usd),
-                solanaAmount: String(hydratedOrder.destFinalCallTokenAmount.usd),
+                destAddress: hydratedOrder.intentAddr || destinationAddress,
+                usdcAmount: String(option.required.usd),
             };
-            if (hydratedOrder.metadata?.memo) {
+            if (hydratedOrder.memo) {
                 Object.assign(paymentData, {
-                    memo: hydratedOrder.metadata.memo,
+                    memo: hydratedOrder.memo,
                 });
             }
-            log?.("[PAY SOLANA] Rozo payment:", { paymentData });
-            const result = await payWithSolanaTokenImpl(option, paymentData);
-            log?.("[PAY SOLANA] Result", result, getChainExplorerTxUrl(rozoSolana.chainId, result.txHash));
+            const result = await payWithSolanaTokenRozo(option, paymentData);
+            log("[PAY SOLANA] Result", result, getChainExplorerTxUrl(rozoSolana.chainId, result.txHash));
+            setTxURL(getChainExplorerTxUrl(rozoSolana.chainId, result.txHash));
             if (result.success) {
-                setPendingTxHash(result.txHash);
-                setPayState(PayState.WaitingForConfirmation);
+                setPayState(PayState.RequestSuccessful);
+                setTxHash(result.txHash);
+                setTimeout(() => {
+                    setPaymentRozoCompleted(true);
+                    setPaymentCompleted(result.txHash, rozoPaymentId);
+                    setRoute(ROUTES.CONFIRMATION, { event: "wait-pay-with-solana" });
+                }, 200);
             }
             else {
                 setPayState(PayState.RequestCancelled);
             }
         }
         catch (error) {
+            console.error("Failed to pay with solana token", error);
             if (rozoPaymentId) {
-                setPaymentUnpaid(rozoPaymentId);
+                try {
+                    await setPaymentUnpaid(rozoPaymentId);
+                }
+                catch (e) {
+                    console.error("Failed to set payment unpaid:", e);
+                }
             }
             if (error.message.includes("rejected")) {
                 setPayState(PayState.RequestCancelled);
@@ -114,60 +179,22 @@ const PayWithSolanaToken = () => {
         finally {
             setIsLoading(false);
         }
-    };
-    const handleSubmitTx = async () => {
-        if (pendingTxHash) {
-            try {
-                setIsLoading(true);
-                setPayState(PayState.ProcessingPayment);
-                // Set the transaction URL and hash
-                setTxURL(getChainExplorerTxUrl(rozoSolana.chainId, pendingTxHash));
-                setTxHash(pendingTxHash);
-                setPayState(PayState.RequestSuccessful);
-                setTimeout(() => {
-                    setPendingTxHash(undefined);
-                    setPaymentRozoCompleted(true);
-                    setPaymentCompleted(pendingTxHash, rozoPaymentId);
-                    setRoute(ROUTES.CONFIRMATION, { event: "wait-pay-with-solana" });
-                }, 200);
-            }
-            catch (error) {
-                if (error.message.includes("rejected")) {
-                    setPayState(PayState.RequestCancelled);
-                }
-                else {
-                    setPayState(PayState.RequestFailed);
-                }
-            }
-            finally {
-                setIsLoading(false);
-            }
-        }
-        else {
-            log?.("[PAY SOLANA] Cannot submit transaction - missing requirements");
-        }
-    };
-    useEffect(() => {
-        if (pendingTxHash) {
-            submitButtonRef.current?.click();
-        }
-    }, [pendingTxHash]);
+    }, [destinationAddress, order, state, rozoPaymentId]);
     useEffect(() => {
         if (!selectedSolanaTokenOption)
             return;
-        // Give user time to see the UI before opening
         const transferTimeout = setTimeout(() => handleTransfer(selectedSolanaTokenOption), 100);
         return () => clearTimeout(transferTimeout);
-    }, [selectedSolanaTokenOption]);
+    }, [selectedSolanaTokenOption]); // eslint-disable-line react-hooks/exhaustive-deps
     useEffect(() => {
         triggerResize();
-    }, [payState]);
+    }, [payState]); // eslint-disable-line react-hooks/exhaustive-deps
     if (selectedSolanaTokenOption == null) {
         return jsx(PageContent, {});
     }
-    return (jsxs(PageContent, { children: [jsx("button", { ref: submitButtonRef, style: { display: "none" }, onClick: handleSubmitTx }), selectedSolanaTokenOption && (jsx(TokenLogoSpinner, { token: selectedSolanaTokenOption.required.token, loading: isLoading })), jsxs(ModalContent, { style: { paddingBottom: 0 }, children: [txURL ? (jsx(ModalH1, { children: jsx(Link, { href: txURL, target: "_blank", rel: "noopener noreferrer", children: payState }) })) : (jsx(ModalH1, { children: payState })), jsx(PaymentBreakdown, { paymentOption: selectedSolanaTokenOption }), payState === PayState.WaitingForConfirmation && pendingTxHash && (jsx(Button, { variant: "primary", onClick: handleSubmitTx, children: "Confirm Payment" })), payState === PayState.RequestCancelled && (jsx(Button, { onClick: handleSubmitTx, children: "Retry Payment" })), payState === PayState.RequestFailed && (jsxs(Fragment, { children: [jsx(Button, { onClick: handleSubmitTx, children: "Retry Payment" }), jsx(Button, { onClick: () => {
-                                    window.open(getSupportUrl(order?.id?.toString() ?? "", `Pay with Solana token${txURL ? ` ${txURL}` : ""}`), "_blank");
-                                }, children: "Contact Support" })] }))] })] }));
+    return (jsxs(PageContent, { children: [selectedSolanaTokenOption && (jsx(TokenLogoSpinner, { token: selectedSolanaTokenOption.required.token, loading: isLoading })), jsxs(ModalContent, { style: { paddingBottom: 0 }, children: [txURL ? (jsx(ModalH1, { children: jsx(Link, { href: txURL, target: "_blank", rel: "noopener noreferrer", children: payState }) })) : (jsx(ModalH1, { children: payState })), jsx(PaymentBreakdown, { paymentOption: selectedSolanaTokenOption }), payState === PayState.RequestCancelled && !isLoading && (jsx(Button, { onClick: () => handleTransfer(selectedSolanaTokenOption), children: "Retry Payment" })), payState === PayState.RequestFailed && (jsx(Button, { onClick: () => {
+                            window.open(getSupportUrl(order?.id?.toString() ?? "", `Pay with Solana token${txURL ? ` ${txURL}` : ""}`), "_blank");
+                        }, children: "Contact Support" }))] })] }));
 };
 
 export { PayWithSolanaToken as default };

package/build/src/components/Pages/Solana/PayWithSolanaToken/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/PayWithSolanaToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/PayWithSolanaToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}

package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js

@@ -8,7 +8,6 @@ import { Networks, TransactionBuilder } from '@stellar/stellar-sdk';
 import { useRozoPay } from '../../../../hooks/useDaimoPay.js';
 import { useStellarDestination } from '../../../../hooks/useStellarDestination.js';
 import { useStellar } from '../../../../provider/StellarContextProvider.js';
-import { roundTokenAmount } from '../../../../utils/format.js';
 import { getSupportUrl } from '../../../../utils/supportUrl.js';
 import Button from '../../../Common/Button/index.js';
 import PaymentBreakdown from '../../../Common/PaymentBreakdown/index.js';
@@ -26,7 +25,7 @@ var PayState;
 })(PayState || (PayState = {}));
 const PayWithStellarToken = () => {
     const { triggerResize, paymentState, setRoute, log } = usePayContext();
-    const { selectedStellarTokenOption, payWithStellarToken: payWithStellarTokenImpl, setTxHash, payParams, rozoPaymentId, setRozoPaymentId, createPayment, } = paymentState;
+    const { selectedStellarTokenOption, payWithStellarToken, setTxHash, payParams, rozoPaymentId, setRozoPaymentId, createPayment, } = paymentState;
     const { store, order, paymentState: state, setPaymentStarted, setPaymentUnpaid, setPaymentRozoCompleted, setPaymentCompleted, hydrateOrderRozo, } = useRozoPay();
     // Get the destination address and payment direction using our custom hook
     const { destinationAddress } = useStellarDestination(payParams);
@@ -53,11 +52,12 @@ const PayWithStellarToken = () => {
                 throw new Error("Order not initialized");
             }
             const { required } = option;
-            const needRozoPayment = "payinchainid" in order.metadata &&
-                Number(order.metadata.payinchainid) !== required.token.chainId;
+            const needRozoPayment = order.preferredChainId !== null &&
+                order.preferredChainId !== required.token.chainId;
             let hydratedOrder;
             let paymentId;
-            if (state === "payment_unpaid" && !needRozoPayment) {
+            if ((state === "payment_unpaid" || state === "payment_started") &&
+                !needRozoPayment) {
                 hydratedOrder = order;
             }
             else if (needRozoPayment) {
@@ -79,26 +79,41 @@ const PayWithStellarToken = () => {
             const newId = paymentId ?? hydratedOrder.externalId;
             if (newId) {
                 setRozoPaymentId(newId);
-                setPaymentStarted(String(newId), hydratedOrder);
+                // Handle payment state transitions
+                if (paymentId && state === "payment_started") {
+                    // A new payment was created while in payment_started state (e.g., user switched chains)
+                    // First transition back to payment_unpaid, then to payment_started with new order
+                    await setPaymentUnpaid(rozoPaymentId);
+                    await setPaymentStarted(String(newId), hydratedOrder);
+                }
+                else if (state !== "payment_started") {
+                    // Normal flow: transition to payment_started
+                    await setPaymentStarted(String(newId), hydratedOrder);
+                }
+                // If state === "payment_started" && !paymentId, we're reusing the same order, no state change needed
             }
             setPayState(PayState.RequestingPayment);
             const paymentData = {
-                destAddress: hydratedOrder.destFinalCall.to || destinationAddress,
-                usdcAmount: String(hydratedOrder.destFinalCallTokenAmount.usd),
-                stellarAmount: roundTokenAmount(hydratedOrder.destFinalCallTokenAmount.amount, hydratedOrder.destFinalCallTokenAmount.token),
+                destAddress: hydratedOrder.intentAddr || destinationAddress,
+                usdcAmount: String(option.required.usd),
             };
-            if (hydratedOrder.metadata?.memo) {
+            if (hydratedOrder.memo) {
                 Object.assign(paymentData, {
-                    memo: hydratedOrder.metadata.memo,
+                    memo: hydratedOrder.memo,
                 });
             }
-            const result = await payWithStellarTokenImpl(option, paymentData);
+            const result = await payWithStellarToken(option, paymentData);
             setSignedTx(result.signedTx);
             setPayState(PayState.WaitingForConfirmation);
         }
         catch (error) {
             if (rozoPaymentId) {
-                setPaymentUnpaid(rozoPaymentId);
+                try {
+                    await setPaymentUnpaid(rozoPaymentId);
+                }
+                catch (e) {
+                    console.error("Failed to set payment unpaid:", e);
+                }
             }
             if (error.message.includes("rejected")) {
                 setPayState(PayState.RequestCancelled);

package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Stellar/PayWithStellarToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Stellar/PayWithStellarToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":";;;;;;;;;;;;;;;AAgCA,IAAK,QAQJ,CAAA;AARD,CAAA,UAAK,QAAQ,EAAA;AACX,IAAA,QAAA,CAAA,sBAAA,CAAA,GAAA,uBAA8C,CAAA;AAC9C,IAAA,QAAA,CAAA,mBAAA,CAAA,GAAA,qBAAyC,CAAA;AACzC,IAAA,QAAA,CAAA,wBAAA,CAAA,GAAA,0BAAmD,CAAA;AACnD,IAAA,QAAA,CAAA,mBAAA,CAAA,GAAA,oBAAwC,CAAA;AACxC,IAAA,QAAA,CAAA,kBAAA,CAAA,GAAA,mBAAsC,CAAA;AACtC,IAAA,QAAA,CAAA,eAAA,CAAA,GAAA,gBAAgC,CAAA;AAChC,IAAA,QAAA,CAAA,mBAAA,CAAA,GAAA,oBAAwC,CAAA;AAC1C,CAAC,EARI,QAAQ,KAAR,QAAQ,GAQZ,EAAA,CAAA,CAAA,CAAA;AAEK,MAAA,mBAAmB,GAAa,MAAK;AACzC,IAAA,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;AACvE,IAAA,MAAM,EACJ,0BAA0B,EAC1B,mBAAmB,EACnB,SAAS,EACT,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,aAAa,GACd,GAAG,YAAY,CAAC;IACjB,MAAM,EACJ,KAAK,EACL,KAAK,EACL,YAAY,EAAE,KAAK,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,gBAAgB,GACjB,GAAG,UAAU,EAAE,CAAC;;IAEjB,MAAM,EAAE,kBAAkB,EAAE,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;AAChE,IAAA,MAAM,EACJ,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,gBAAgB,EAC3B,GAAG,EAAE,UAAU,GAChB,GAAG,UAAU,EAAE,CAAC;AACjB,IAAA,MAAM,eAAe,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;AAExD,IAAA,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CACtC,QAAQ,CAAC,oBAAoB,CAC9B,CAAC;IACF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAsB,CAAC;IACzD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAsB,CAAC;IAE/D,SAAS,CAAC,MAAK;AACb,QAAA,IAAI,KAAK,KAAK,OAAO,EAAE;AACrB,YAAA,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvB,OAAO;SACR;AACH,KAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;;AAGZ,IAAA,MAAM,cAAc,GAAG,OAAO,MAA2B,KAAI;QAC3D,YAAY,CAAC,IAAI,CAAC,CAAC;AACnB,QAAA,IAAI;YACF,IAAI,CAAC,kBAAkB,EAAE;AACvB,gBAAA,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC5D;YAED,IAAI,CAAC,KAAK,EAAE;AACV,gBAAA,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;aAC1C;AAED,YAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;AAE5B,YAAA,MAAM,eAAe,GACnB,KAAK,CAAC,gBAAgB,KAAK,IAAI;gBAC/B,KAAK,CAAC,gBAAgB,KAAK,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;AAEpD,YAAA,IAAI,aAA0C,CAAC;AAC/C,YAAA,IAAI,SAA6B,CAAC;YAElC,IACE,CAAC,KAAK,KAAK,gBAAgB,IAAI,KAAK,KAAK,iBAAiB;gBAC1D,CAAC,eAAe,EAChB;gBACA,aAAa,GAAG,KAAK,CAAC;aACvB;iBAAM,IAAI,eAAe,EAAE;gBAC1B,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,KAAY,CAAC,CAAC;gBAEtD,IAAI,CAAC,GAAG,EAAE;AACR,oBAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;iBAClD;AAED,gBAAA,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC;AACnB,gBAAA,aAAa,GAAG,oCAAoC,CAAC,GAAG,CAAC,CAAC;aAC3D;iBAAM;;gBAEL,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AACtD,gBAAA,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC;aAC3B;YAED,IAAI,CAAC,aAAa,EAAE;AAClB,gBAAA,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;AAED,YAAA,MAAM,KAAK,GAAG,SAAS,IAAI,aAAa,CAAC,UAAU,CAAC;YACpD,IAAI,KAAK,EAAE;gBACT,gBAAgB,CAAC,KAAK,CAAC,CAAC;;AAGxB,gBAAA,IAAI,SAAS,IAAI,KAAK,KAAK,iBAAiB,EAAE;;;AAG5C,oBAAA,MAAM,gBAAgB,CAAC,aAAc,CAAC,CAAC;oBACvC,MAAM,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;iBACvD;AAAM,qBAAA,IAAI,KAAK,KAAK,iBAAiB,EAAE;;oBAEtC,MAAM,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;iBACvD;;aAEF;AAED,YAAA,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAExC,YAAA,MAAM,WAAW,GAAG;AAClB,gBAAA,WAAW,EAAE,aAAa,CAAC,UAAU,IAAI,kBAAkB;gBAC3D,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;aACxC,CAAC;AAEF,YAAA,IAAI,aAAa,CAAC,IAAI,EAAE;AACtB,gBAAA,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;oBACzB,IAAI,EAAE,aAAa,CAAC,IAAI;AACzB,iBAAA,CAAC,CAAC;aACJ;YAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAC9D,YAAA,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC7B,YAAA,WAAW,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,EAAE;AACjB,gBAAA,IAAI;AACF,oBAAA,MAAM,gBAAgB,CAAC,aAAa,CAAC,CAAC;iBACvC;gBAAC,OAAO,CAAC,EAAE;AACV,oBAAA,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;iBACnD;aACF;YACD,IAAK,KAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;AAC/C,gBAAA,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;aACxC;iBAAM;AACL,gBAAA,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;aACrC;SACF;gBAAS;YACR,YAAY,CAAC,KAAK,CAAC,CAAC;SACrB;AACH,KAAC,CAAC;AAEF,IAAA,MAAM,cAAc,GAAG,YAAW;AAChC,QAAA,IAAI,QAAQ,IAAI,aAAa,IAAI,UAAU,EAAE;AAC3C,YAAA,IAAI;;gBAEF,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE;AACnE,oBAAA,OAAO,EAAE,gBAAgB;oBACzB,iBAAiB,EAAE,QAAQ,CAAC,MAAM;AACnC,iBAAA,CAAC,CAAC;gBAEH,YAAY,CAAC,IAAI,CAAC,CAAC;AACnB,gBAAA,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAExC,gBAAA,MAAM,EAAE,GAAG,kBAAkB,CAAC,OAAO,CACnC,iBAAiB,CAAC,WAAW,EAC7B,QAAQ,CAAC,MAAM,CAChB,CAAC;gBAEF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,iBAAiB,CACpD,EAAsC,CACvC,CAAC;AAEF,gBAAA,IAAI,QAAQ,CAAC,UAAU,EAAE;AACvB,oBAAA,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AACxC,oBAAA,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,oBAAA,QAAQ,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;oBAChE,UAAU,CAAC,MAAK;wBACd,WAAW,CAAC,SAAS,CAAC,CAAC;wBACvB,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAC9B,wBAAA,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;wBAClD,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC;qBACnE,EAAE,GAAG,CAAC,CAAC;iBACT;qBAAM;AACL,oBAAA,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;iBACrC;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAK,KAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;AAC/C,oBAAA,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;iBACxC;qBAAM;AACL,oBAAA,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;iBACrC;aACF;oBAAS;gBACR,YAAY,CAAC,KAAK,CAAC,CAAC;aACrB;SACF;aAAM;AACL,YAAA,GAAG,GAAG,gEAAgE,CAAC,CAAC;SACzE;AACH,KAAC,CAAC;IAEF,SAAS,CAAC,MAAK;QACb,IAAI,QAAQ,EAAE;AACZ,YAAA,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;SAClC;AACH,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,MAAK;AACb,QAAA,IAAI,CAAC,0BAA0B;YAAE,OAAO;;AAGxC,QAAA,MAAM,eAAe,GAAG,UAAU,CAChC,MAAM,cAAc,CAAC,0BAA0B,CAAC,EAChD,GAAG,CACJ,CAAC;AACF,QAAA,OAAO,MAAM,YAAY,CAAC,eAAe,CAAC,CAAC;AAC7C,KAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAEjC,SAAS,CAAC,MAAK;AACb,QAAA,aAAa,EAAE,CAAC;AAClB,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEf,IAAA,IAAI,0BAA0B,IAAI,IAAI,EAAE;QACtC,OAAOA,GAAA,CAAC,WAAW,EAAA,EAAA,CAAe,CAAC;KACpC;AAED,IAAA,QACEC,IAAC,CAAA,WAAW,EACV,EAAA,QAAA,EAAA,CAAAD,GAAA,CAAA,QAAA,EAAA,EACE,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAC1B,OAAO,EAAE,cAAc,GACvB,EACD,0BAA0B,KACzBA,IAAC,gBAAgB,EAAA,EACf,KAAK,EAAE,0BAA0B,CAAC,QAAQ,CAAC,KAAK,EAChD,OAAO,EAAE,SAAS,EAAA,CAClB,CACH,EACDC,IAAA,CAAC,YAAY,EAAA,EAAC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAA,QAAA,EAAA,CACtC,KAAK,IACJD,GAAC,CAAA,OAAO,cACNA,GAAC,CAAA,IAAI,EAAC,EAAA,IAAI,EAAE,KAAK,EAAE,MAAM,EAAC,QAAQ,EAAC,GAAG,EAAC,qBAAqB,EAAA,QAAA,EACzD,QAAQ,EACJ,CAAA,EAAA,CACC,KAEVA,GAAC,CAAA,OAAO,cAAE,QAAQ,EAAA,CAAW,CAC9B,EACDA,IAAC,gBAAgB,EAAA,EAAC,aAAa,EAAE,0BAA0B,EAAI,CAAA,EAC9D,QAAQ,KAAK,QAAQ,CAAC,sBAAsB,IAAI,QAAQ,KACvDA,GAAA,CAAC,MAAM,EAAA,EAAC,OAAO,EAAC,SAAS,EAAC,OAAO,EAAE,cAAc,EAExC,QAAA,EAAA,iBAAA,EAAA,CAAA,CACV,EACA,QAAQ,KAAK,QAAQ,CAAC,gBAAgB,KACrCA,GAAC,CAAA,MAAM,EAAC,EAAA,OAAO,EAAE,cAAc,EAAA,QAAA,EAAA,eAAA,EAAA,CAAwB,CACxD,EACA,QAAQ,KAAK,QAAQ,CAAC,aAAa,KAClCC,IAAA,CAAAC,QAAA,EAAA,EAAA,QAAA,EAAA,CACEF,GAAC,CAAA,MAAM,IAAC,OAAO,EAAE,cAAc,EAAA,QAAA,EAAA,eAAA,EAAA,CAAwB,EACvDA,GAAC,CAAA,MAAM,IACL,OAAO,EAAE,MAAK;AACZ,oCAAA,MAAM,CAAC,IAAI,CACT,aAAa,CACX,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAC3B,CAAA,sBAAA,EAAyB,KAAK,GAAG,CAAI,CAAA,EAAA,KAAK,EAAE,GAAG,EAAE,CAAE,CAAA,CACpD,EACD,QAAQ,CACT,CAAC;AACJ,iCAAC,gCAGM,CACR,EAAA,CAAA,CACJ,CACY,EAAA,CAAA,CAAA,EAAA,CACH,EACd;AACJ;;;;"}

package/build/src/components/Pages/WaitingDepositAddress/index.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { isHydrated, DepositAddressPaymentOptions, getPayment, generateEVMDeepLink, getChainName, getKnownToken, getFee, getAddressContraction } from '@rozoai/intent-common';
+import { isHydrated, DepositAddressPaymentOptions, getPayment, generateEVMDeepLink, getChainName, getKnownToken, getFee, FeeType, getAddressContraction } from '@rozoai/intent-common';
 import { useState, useEffect, useRef, useMemo } from 'react';
 import { keyframes } from 'styled-components';
 import { AlertIcon, WarningIcon } from '../../../assets/icons.js';
@@ -97,7 +97,7 @@ function WaitingDepositAddress() {
             try {
                 context.log("[PAYMENT POLLING] Polling for payment transaction:", depAddr?.externalId);
                 const isMugglePay = depAddr?.externalId.includes("mugglepay_order");
-                const response = await getPayment(depAddr?.externalId);
+                const response = await getPayment(depAddr?.externalId, "v2");
                 context.log("[PAYMENT POLLING] Debug - API Response:", {
                     status: response.status,
                     hasData: !!response.data,
@@ -213,7 +213,9 @@ function WaitingDepositAddress() {
                 if (amount && payParams?.appId) {
                     try {
                         const feeResponse = await getFee({
-                            amount,
+                            currency: "USD",
+                            type: payParams?.feeType ?? FeeType.ExactIn,
+                            toUnits: amount.toString(),
                             appId: payParams.appId,
                             toChain: selectedDepositAddressOption.chainId,
                         });