@daimo/pay 1.8.6 → 1.9.0

package/build/index.js

@@ -2,7 +2,7 @@ import { http, useConnectors as useConnectors$1, useAccount, useSwitchChain, use
 import { mainnet, base as base$1, polygon, optimism, arbitrum, linea, bsc, sepolia, baseSepolia, worldchain, blast, mantle } from 'wagmi/chains';
 import { safe, injected, coinbaseWallet, walletConnect } from '@wagmi/connectors';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { DaimoPayIntentStatus, assert, DaimoPayOrderMode, readDaimoPayOrderID, getOrderDestChainId, assertNotNull, getChainName, arbitrum as arbitrum$1, base as base$2, blast as blast$1, bsc as bsc$1, ethereum, linea as linea$1, mantle as mantle$1, optimism as optimism$1, polygon as polygon$1, worldchain as worldchain$1, solana, getAddressContraction, supportedChains, getChainExplorerTxUrl, ExternalPaymentOptions, isCCTPV1Chain, debugJson, writeDaimoPayOrderID, getOrderSourceChainId, DaimoPayEventType, getDaimoPayOrderView } from '@daimo/pay-common';
+import { DaimoPayIntentStatus, assert, DaimoPayOrderMode, readDaimoPayOrderID, getOrderDestChainId, assertNotNull, getChainName, arbitrum as arbitrum$1, base as base$2, blast as blast$1, bsc as bsc$1, ethereum, linea as linea$1, mantle as mantle$1, optimism as optimism$1, polygon as polygon$1, worldchain as worldchain$1, solana, getAddressContraction, supportedChains, getChainExplorerTxUrl, ExternalPaymentOptions, isCCTPV1Chain, debugJson, DepositAddressPaymentOptions, writeDaimoPayOrderID, getOrderSourceChainId, DaimoPayEventType, getDaimoPayOrderView } from '@daimo/pay-common';
 import { Buffer } from 'buffer';
 import React, { createContext, useRef, useState, useEffect, useLayoutEffect, useMemo, useContext, useSyncExternalStore, useCallback, createElement } from 'react';
 import styled$1, { css, keyframes, ThemeProvider } from 'styled-components';
@@ -22,7 +22,7 @@ import { VersionedTransaction } from '@solana/web3.js';
 import { normalize } from 'viem/ens';
 
 var name = "@daimo/pay";
-var version = "1.8.6";
+var version = "1.9.0";
 var author = "Daimo";
 var homepage = "https://pay.daimo.com";
 var license = "BSD-2-Clause license";
@@ -61,7 +61,7 @@ var keywords = [
 	"crypto"
 ];
 var dependencies = {
-	"@daimo/pay-common": "1.8.6",
+	"@daimo/pay-common": "1.9.0",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -2160,7 +2160,7 @@ function useLockBodyScroll(initialLocked) {
     useEffect(() => {
         if (locked !== initialLocked)
             setLocked(initialLocked);
-    }, [initialLocked]);
+    }, [initialLocked]); // eslint-disable-line react-hooks/exhaustive-deps
     return [locked, setLocked];
 }
 
@@ -2600,11 +2600,12 @@ async function pollFindSourcePayment(store, trpc, orderId) {
         onResult: (found) => {
             const state = store.getState();
             // Check that we're still in the payment_unpaid state
-            if (state.type !== "payment_unpaid")
-                return;
-            if (found) {
-                store.dispatch({ type: "payment_started", order: state.order });
+            if (state.type !== "payment_unpaid") {
+                stopPolling();
+            }
+            else if (found) {
                 stopPolling();
+                store.dispatch({ type: "payment_started", order: state.order });
             }
         },
         onError: () => { },
@@ -2913,15 +2914,12 @@ function useFocusTrap() {
         }
     }
     useEffect(() => {
-        if (elRef.current) {
-            elRef.current.addEventListener("keydown", handleFocus);
-            elRef.current.focus({ preventScroll: true });
-        }
-        return () => {
-            if (elRef.current) {
-                elRef.current.removeEventListener("keydown", handleFocus);
-            }
-        };
+        const el = elRef.current;
+        if (el == null)
+            return;
+        el.addEventListener("keydown", handleFocus);
+        el.focus({ preventScroll: true });
+        return () => el.removeEventListener("keydown", handleFocus);
     }, []);
     return elRef;
 }
@@ -2931,7 +2929,7 @@ function FocusTrap(props) {
         if (!elRef.current)
             return;
         elRef.current.focus({ preventScroll: true });
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     return (jsx("div", { ref: elRef, tabIndex: 0, children: props.children }));
 }
 
@@ -6171,9 +6169,8 @@ const About = () => {
     const animationDuration = 600;
     let interval;
     useEffect(() => {
-        //interval = setTimeout(nextSlide, autoplayDelay);
         return () => clearInterval(interval);
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     const isSwipe = () => {
         if (sliderRef.current) {
             const { overflow } = getComputedStyle(sliderRef.current);
@@ -6225,19 +6222,18 @@ const About = () => {
     };
     const sliderRef = useRef(null);
     useEffect(() => {
-        if (!sliderRef.current)
+        const slider = sliderRef.current;
+        if (slider == null)
             return;
-        sliderRef.current.addEventListener("scroll", onScroll);
-        sliderRef.current.addEventListener("touchmove", onTouchMove);
-        sliderRef.current.addEventListener("touchend", onTouchEnd);
+        slider.addEventListener("scroll", onScroll);
+        slider.addEventListener("touchmove", onTouchMove);
+        slider.addEventListener("touchend", onTouchEnd);
         return () => {
-            if (!sliderRef.current)
-                return;
-            sliderRef.current.removeEventListener("scroll", onScroll);
-            sliderRef.current.removeEventListener("touchmove", onTouchMove);
-            sliderRef.current.removeEventListener("touchend", onTouchEnd);
+            slider.removeEventListener("scroll", onScroll);
+            slider.removeEventListener("touchmove", onTouchMove);
+            slider.removeEventListener("touchend", onTouchEnd);
         };
-    }, [sliderRef]);
+    }, [sliderRef.current]); // eslint-disable-line react-hooks/exhaustive-deps
     const graphics = [
         jsx(SlideOne, { layoutId: "graphicCircle", duration: animationDuration, ease: animationEase }, "slideOne"),
         jsx(SlideTwo, { layoutId: "graphicCircle", duration: animationDuration, ease: animationEase }, "slideTwo"),
@@ -6597,7 +6593,7 @@ const useLastConnector = () => {
             setLastConnectorId(id ?? "");
         };
         init();
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     const update = (id) => {
         storage?.setItem("recentConnectorId", id);
     };
@@ -6818,7 +6814,7 @@ const ScrollArea = ({ children, height, backgroundColor, mobileDirection, hideBo
         return () => {
             el.removeEventListener("scroll", handleScroll);
         };
-    }, [ref.current]);
+    }, [ref.current]); // eslint-disable-line react-hooks/exhaustive-deps
     return (jsxs(ScrollContainer, { children: [jsx(ScrollAreaContainer, { ref: ref, "$mobile": isMobileFormat, "$height": height, "$backgroundColor": backgroundColor, "$mobileDirection": mobileDirection, "$hideBottomLine": hideBottomLine, "$totalItems": totalItems, children: children }), jsx(MoreIndicator, { ref: moreRef, className: "hide", onClick: () => {
                     if (ref.current) {
                         ref.current.scrollTo({
@@ -7329,7 +7325,6 @@ const BinanceSmartChain = ({ testnet, ...props }) => (jsx("svg", { ...props, "ar
 const Solana = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 200 200", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("rect", { width: "200", height: "200", rx: "100", fill: "#121212" }), jsx("g", { clipPath: "url(#clip0_295_42)", children: jsx("path", { d: "M149.48 125.382L132.807 142.801C132.444 143.18 132.006 143.482 131.519 143.688C131.031 143.894 130.505 144 129.974 144H50.9356C50.5585 144 50.1896 143.893 49.8742 143.691C49.5588 143.49 49.3107 143.203 49.1604 142.866C49.0101 142.529 48.9641 142.157 49.028 141.795C49.092 141.432 49.2631 141.096 49.5204 140.828L66.2061 123.408C66.5676 123.031 67.0047 122.729 67.4904 122.523C67.9762 122.317 68.5002 122.21 69.0301 122.21H148.064C148.441 122.21 148.81 122.317 149.126 122.518C149.441 122.72 149.689 123.007 149.84 123.344C149.99 123.681 150.036 124.053 149.972 124.415C149.908 124.777 149.737 125.113 149.48 125.382ZM132.807 90.3032C132.444 89.9248 132.006 89.6231 131.519 89.4169C131.031 89.2108 130.505 89.1045 129.974 89.1048H50.9356C50.5585 89.1048 50.1896 89.2121 49.8742 89.4136C49.5588 89.6151 49.3107 89.9019 49.1604 90.2388C49.0101 90.5758 48.9641 90.9482 49.028 91.3103C49.092 91.6723 49.2631 92.0083 49.5204 92.277L66.2061 109.697C66.5676 110.074 67.0047 110.375 67.4904 110.581C67.9762 110.788 68.5002 110.894 69.0301 110.895H148.064C148.441 110.895 148.81 110.788 149.126 110.586C149.441 110.385 149.689 110.098 149.84 109.761C149.99 109.424 150.036 109.052 149.972 108.69C149.908 108.328 149.737 107.992 149.48 107.723L132.807 90.3032ZM50.9356 77.7905H129.974C130.505 77.7907 131.031 77.6845 131.519 77.4783C132.006 77.2721 132.444 76.9704 132.807 76.592L149.48 59.1722C149.737 58.9036 149.908 58.5676 149.972 58.2055C150.036 57.8434 149.99 57.471 149.84 57.1341C149.689 56.7971 149.441 56.5103 149.126 56.3088C148.81 56.1073 148.441 56 148.064 56H69.0301C68.5002 56.0009 67.9762 56.1077 67.4904 56.3138C67.0047 56.52 66.5676 56.8211 66.2061 57.1985L49.5247 74.6183C49.2677 74.8866 49.0966 75.2223 49.0325 75.5839C48.9684 75.9456 49.0141 76.3177 49.1639 76.6545C49.3136 76.9913 49.5611 77.2781 49.8758 77.4799C50.1905 77.6817 50.5589 77.7896 50.9356 77.7905Z", fill: "url(#paint0_linear_295_42)" }) }), jsxs("defs", { children: [jsxs("linearGradient", { id: "paint0_linear_295_42", x1: "57.5256", y1: "146.097", x2: "137.993", y2: "52.9838", gradientUnits: "userSpaceOnUse", children: [jsx("stop", { offset: "0.08", stopColor: "#9945FF" }), jsx("stop", { offset: "0.3", stopColor: "#8752F3" }), jsx("stop", { offset: "0.5", stopColor: "#5497D5" }), jsx("stop", { offset: "0.6", stopColor: "#43B4CA" }), jsx("stop", { offset: "0.72", stopColor: "#28E0B9" }), jsx("stop", { offset: "0.97", stopColor: "#19FB9B" })] }), jsx("clipPath", { id: "clip0_295_42", children: jsx("rect", { width: "101", height: "88", fill: "white", transform: "translate(49 56)" }) })] })] }));
 const Bitcoin = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 44 44", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("path", { d: "M43.3388 27.3219C40.4005 39.1077 28.4634 46.2804 16.6762 43.3413C4.89383 40.4029 -2.27886 28.4652 0.660895 16.68C3.59789 4.89286 15.535 -2.28052 27.3187 0.657859C39.1052 3.59623 46.2772 15.5354 43.3388 27.3219Z", fill: "#F7931A" }), jsx("path", { d: "M31.6992 18.8656C32.1371 15.9382 29.9082 14.3645 26.8605 13.3147L27.8492 9.34922L25.4353 8.74765L24.4728 12.6087C23.8383 12.4505 23.1865 12.3013 22.5389 12.1535L23.5083 8.26709L21.0958 7.66553L20.1065 11.6297C19.5813 11.51 19.0657 11.3918 18.5652 11.2673L18.5679 11.255L15.239 10.4238L14.5969 13.0019C14.5969 13.0019 16.3878 13.4123 16.35 13.4378C17.3277 13.6818 17.5043 14.3288 17.4748 14.8417L16.3487 19.3592C16.416 19.3764 16.5033 19.4012 16.5996 19.4397C16.5192 19.4197 16.4332 19.3977 16.3445 19.3764L14.766 25.7048C14.6464 26.0018 14.3432 26.4473 13.6598 26.2782C13.6839 26.3133 11.9053 25.8403 11.9053 25.8403L10.707 28.6033L13.8482 29.3864C14.4326 29.5328 15.0053 29.6862 15.569 29.8305L14.5701 33.8414L16.9812 34.443L17.9705 30.4747C18.6291 30.6535 19.2685 30.8185 19.8941 30.9738L18.9082 34.9235L21.322 35.5251L22.321 31.5218C26.437 32.3007 29.5322 31.9865 30.835 28.2637C31.8848 25.2662 30.7827 23.5372 28.6171 22.4097C30.1942 22.046 31.3822 21.0085 31.6992 18.8656ZM26.184 26.5993C25.4381 29.5968 20.3912 27.9763 18.7549 27.57L20.0804 22.2563C21.7167 22.6647 26.9637 23.4732 26.184 26.5993ZM26.9307 18.8223C26.25 21.5489 22.0494 20.1636 20.6868 19.824L21.8885 15.0046C23.2512 15.3442 27.6395 15.9781 26.9307 18.8223Z", fill: "white" })] }));
 const Tron = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 44 44", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsxs("g", { clipPath: "url(#clip0_450_171)", children: [jsx("path", { d: "M43.3388 27.3219C40.4005 39.1077 28.4634 46.2804 16.6762 43.3413C4.89383 40.4029 -2.27886 28.4652 0.660896 16.68C3.59789 4.89286 15.535 -2.28052 27.3187 0.65786C39.1052 3.59623 46.2772 15.5354 43.3388 27.3219Z", fill: "#FF060A" }), jsx("path", { d: "M36.3975 17.2381C35.0196 16.0232 33.1057 14.1724 31.5555 12.8625L31.4598 12.8056C31.3067 12.6917 31.1344 12.5968 30.9526 12.5303C27.2015 11.8659 9.74716 8.76218 9.41224 8.80015C9.31654 8.80964 9.22085 8.84761 9.1443 8.89507L9.05817 8.96151C8.95291 9.06591 8.86679 9.1893 8.81894 9.33167L8.7998 9.38862V9.70184V9.7493C10.7615 14.9507 18.5222 31.9785 20.0532 35.9839C20.1489 36.2591 20.3212 36.7717 20.6465 36.8001H20.7231C20.8953 36.8001 21.6417 35.8605 21.6417 35.8605C21.6417 35.8605 34.9717 20.5032 36.321 18.8707C36.4932 18.6713 36.6463 18.453 36.7803 18.2252C36.8186 18.0449 36.7994 17.8646 36.7324 17.6937C36.6655 17.5229 36.5411 17.3615 36.3975 17.2381ZM25.0484 19.032L30.7325 14.552L34.0722 17.4754L25.0484 19.032ZM22.8379 18.7378L13.0486 11.1066L28.8952 13.8876L22.8379 18.7378ZM23.7183 20.731L33.7373 19.1934L22.2829 32.3202L23.7183 20.731ZM11.7184 11.8754L22.0245 20.1805L20.5317 32.3296L11.7184 11.8754Z", fill: "white" })] }), jsx("defs", { children: jsx("clipPath", { id: "clip0_450_171", children: jsx("rect", { width: "44", height: "44", fill: "white" }) }) })] }));
-const Zcash = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 44 44", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("path", { d: "M43.3415 27.3221C40.4029 39.1078 28.4645 46.2804 16.676 43.3413C4.8924 40.403 -2.28106 28.4654 0.659014 16.6803C3.59632 4.8933 15.5347 -2.28001 27.3197 0.658341C39.1074 3.59668 46.2802 15.5357 43.3415 27.3221Z", fill: "white" }), jsx("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M0 22C0 9.86741 9.86741 0 22 0C34.1326 0 44 9.86741 44 22C44 34.1326 34.1326 44 22 44C9.86741 44 0 34.1326 0 22ZM29.8475 11.7904V15.1384L20.5358 27.7681H29.8475V32.2088H23.8447V35.8885H20.1553V32.2088H14.1525V28.8607L23.4544 16.2311H14.1525V11.7904H20.1553V8.10089H23.8447V11.7904H29.8475Z", fill: "#F4B728" })] }));
 const Base = ({ testnet, ...props }) => (jsx("svg", { ...props, width: "44", height: "44", viewBox: "0 0 44 44", fill: "none", xmlns: "http://www.w3.org/2000/svg", style: {
         background: testnet
             ? "linear-gradient(180deg, #8995A9 0%, #424D5F 99.48%)"
@@ -7972,21 +7967,21 @@ function QRCode({ ecl = "M", size: sizeProp = 200, uri, clearArea = false, image
             });
         });
         return dots;
-    }, [ecl, size, uri]);
+    }, [ecl, size, uri]); // eslint-disable-line react-hooks/exhaustive-deps
     return (jsxs("svg", { height: size, width: size, viewBox: `0 0 ${size} ${size}`, style: {
             width: size,
             height: size,
         }, children: [jsx("rect", { fill: "transparent", height: size, width: size }), dots] }));
 }
 
-function CustomQRCode({ value, image, imageBackground, imagePosition = "center", tooltipMessage, }) {
+function CustomQRCode({ value, image, imageBackground, imagePosition = "center", tooltipMessage, contentPadding = 13, }) {
     const windowSize = useWindowSize();
     const Logo = windowSize.width > 920 && tooltipMessage ? (jsx(Tooltip, { xOffset: 139, yOffset: 5, delay: 0.1, message: tooltipMessage, children: image })) : (image);
-    return (jsx(QRCodeContainer, { children: jsxs(QRCodeContent, { children: [image && (jsx(LogoContainer$3, { children: jsx(LogoIcon, { "$wcLogo": imagePosition !== "center", style: {
+    return (jsx(QRCodeContainer, { children: jsxs(QRCodeContent, { style: { inset: contentPadding }, children: [image && (jsx(LogoContainer$3, { children: jsx(LogoIcon, { "$wcLogo": imagePosition !== "center", style: {
                             background: imagePosition === "center" ? imageBackground : undefined,
                         }, children: Logo }) })), jsx(AnimatePresence, { initial: false, children: value ? (jsx(motion.div, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0, position: "absolute", inset: [0, 0] }, transition: {
                             duration: 0.2,
-                        }, children: jsx(QRCode, { uri: value, size: 576, ecl: "H", clearArea: !!(imagePosition === "center" && image) }) }, value)) : (jsxs(QRPlaceholder, { initial: { opacity: 0.1 }, animate: { opacity: 0.1 }, exit: { opacity: 0, position: "absolute", inset: [0, 0] }, transition: {
+                        }, children: jsx(QRCode, { uri: value, size: 576, ecl: "H", clearArea: !!(imagePosition === "center" && image), image: imagePosition === "bottom right" ? image : undefined, imageBackground: imageBackground }) }, value)) : (jsxs(QRPlaceholder, { initial: { opacity: 0.1 }, animate: { opacity: 0.1 }, exit: { opacity: 0, position: "absolute", inset: [0, 0] }, transition: {
                             duration: 0.2,
                         }, children: [jsx("span", {}), jsx("span", {}), jsx("span", {}), jsx("div", {})] })) })] }) }));
 }
@@ -9184,7 +9179,7 @@ const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
         return () => {
             clearTimeout(connectTimeout);
         };
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     /** Timeout functionality if necessary
     let expiryTimeout: any;
     useEffect(() => {
@@ -9484,7 +9479,7 @@ function useWalletConnectUri({ enabled } = {
                 };
             }
         }
-    }, [enabled, connector, isConnected]);
+    }, [enabled, connector, isConnected]); // eslint-disable-line react-hooks/exhaustive-deps
     return {
         uri,
     };
@@ -9598,7 +9593,7 @@ const ConnectUsing = () => {
         };
         if (status === states.INJECTOR)
             checkProvider();
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     if (!wallet)
         return jsx(Alert, { children: "Connector not found" });
     return (jsxs(AnimatePresence, { children: [status === states.QRCODE && (jsx(motion.div, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants$2, children: jsx(ConnectWithQRCode, { switchConnectMethod: (id) => {
@@ -10113,7 +10108,7 @@ const MultiCurrencySelectAmount = ({ selectedTokenOption, setSelectedTokenOption
     const [continueDisabled, setContinueDisabled] = useState(true);
     useEffect(() => {
         triggerResize();
-    }, [message]);
+    }, [message]); // eslint-disable-line react-hooks/exhaustive-deps
     /**
      * Update the editable value and secondary value, taking into account whether
      * the user is currently editing the USD value or the token value.
@@ -10250,19 +10245,17 @@ const ExternalPaymentSpinner = ({ logoURI, logoShape, }) => {
     return (jsx(LoadingContainer$2, { children: jsx(AnimationContainer$1, { "$circle": logoShape === "circle", children: jsx(AnimatePresence, { children: optionSpinner }) }) }));
 };
 
-// TODO: min amount for deposit address should come from the backend
-const MIN_USD_VALUE = 20;
 const SelectDepositAddressAmount = () => {
     const { paymentState, setRoute, triggerResize } = usePayContext();
     const { selectedDepositAddressOption } = paymentState;
     const maxUsdLimit = paymentState.getOrderUsdLimit();
-    const minimumMessage = `Minimum ${formatUsd(MIN_USD_VALUE, "up")}`;
+    // const minimumMessage = `Minimum ${formatUsd(MIN_USD_VALUE, "up")}`;
     const [usdInput, setUsdInput] = useState("");
-    const [message, setMessage] = useState(minimumMessage);
+    const [message, setMessage] = useState("");
     const [continueDisabled, setContinueDisabled] = useState(true);
     useEffect(() => {
         triggerResize();
-    }, [message]);
+    }, [message]); // eslint-disable-line react-hooks/exhaustive-deps
     if (selectedDepositAddressOption == null) {
         return jsx(PageContent, {});
     }
@@ -10275,10 +10268,10 @@ const SelectDepositAddressAmount = () => {
             setMessage(`Maximum ${formatUsd(maxUsdLimit)}`);
         }
         else {
-            setMessage(minimumMessage);
+            setMessage("");
         }
         const usd = Number(sanitizeNumber(value));
-        setContinueDisabled(usd <= 0 || usd < MIN_USD_VALUE || usd > maxUsdLimit);
+        setContinueDisabled(usd <= 0 || usd > maxUsdLimit);
     };
     const handleKeyDown = (e) => {
         if (e.key === "Enter" && !continueDisabled) {
@@ -10452,7 +10445,7 @@ const OptionsList = ({ options, isLoading, requiredSkeletons, scrollHeight = 300
 const SkeletonOptionItem = () => {
     return (jsxs(OptionButton, { type: "button", children: [jsx(SkeletonIcon, {}), jsx(SkeletonLabel, {})] }));
 };
-const pulse = keyframes `
+const pulse$1 = keyframes `
   0% {
     opacity: 0.6;
   }
@@ -10470,14 +10463,14 @@ const SkeletonIcon = styled.div `
   height: 32px;
   border-radius: 22.5%;
   background-color: rgba(0, 0, 0, 0.1);
-  animation: ${pulse} 1.5s ease-in-out infinite;
+  animation: ${pulse$1} 1.5s ease-in-out infinite;
 `;
 const SkeletonLabel = styled.div `
   width: 100px;
   height: 16px;
   border-radius: 8px;
   background-color: rgba(0, 0, 0, 0.1);
-  animation: ${pulse} 1.5s ease-in-out infinite;
+  animation: ${pulse$1} 1.5s ease-in-out infinite;
 `;
 const OptionItem = ({ option }) => {
     const hydratedIcons = option.icons.map((icon) => {
@@ -10637,7 +10630,7 @@ const SelectExternalAmount = () => {
     const [continueDisabled, setContinueDisabled] = useState(true);
     useEffect(() => {
         triggerResize();
-    }, [message]);
+    }, [message]); // eslint-disable-line react-hooks/exhaustive-deps
     if (selectedExternalOption == null) {
         return jsx(PageContent, {});
     }
@@ -10699,9 +10692,7 @@ function SelectMethod() {
     const { connected: isSolanaConnected, wallet: solanaWallet, wallets: solanaWallets, disconnect: disconnectSolana, publicKey, } = useWallet$1();
     const { setRoute, paymentState, wcWallet, log } = usePayContext();
     const { disconnectAsync } = useDisconnect();
-    const { setSelectedExternalOption, externalPaymentOptions, showSolanaPaymentMethod, depositAddressOptions, senderEnsName, } = paymentState;
-    const { order } = useDaimoPay();
-    const paymentOptions = order?.metadata.payer?.paymentOptions;
+    const { setSelectedExternalOption, externalPaymentOptions, showSolanaPaymentMethod, senderEnsName, } = paymentState;
     // Decide whether to show the connected eth account, solana account, or both.
     const showConnectedEth = isEthConnected;
     const showConnectedSolana = isSolanaConnected && showSolanaPaymentMethod;
@@ -10764,10 +10755,6 @@ function SelectMethod() {
         }
         return connectedOptions;
     };
-    // Deposit address options, e.g. Bitcoin, Tron, Zcash, etc.
-    // Include by default if paymentOptions not provided
-    const showDepositAddressMethod = paymentOptions == null ||
-        paymentOptions.includes(ExternalPaymentOptions.ExternalChains);
     const connectedWalletOptions = getConnectedWalletOptions();
     const unconnectedWalletOption = {
         id: "unconnectedWallet",
@@ -10790,20 +10777,6 @@ function SelectMethod() {
             options.push(solanaOption);
         }
     }
-    // ZKP2P is currently only available on desktop. Check if the user is on
-    // desktop and if any ZKP2P options are available.
-    const zkp2pOptions = externalPaymentOptions.options.get("zkp2p") ?? [];
-    const showZkp2pPaymentMethod = !isMobile && zkp2pOptions.length > 0;
-    if (showZkp2pPaymentMethod) {
-        options.push({
-            id: "ZKP2P",
-            title: "Pay via payment app",
-            icons: zkp2pOptions.slice(0, 3).map((option) => option.logoURI),
-            onClick: () => {
-                setRoute(ROUTES.SELECT_ZKP2P);
-            },
-        });
-    }
     // External payment options, e.g. Binance, Coinbase, etc.
     options.push(...(externalPaymentOptions.options.get("external") ?? []).map((option) => ({
         id: option.id,
@@ -10822,9 +10795,21 @@ function SelectMethod() {
         disabled: option.disabled,
         subtitle: option.message,
     })));
-    if (showDepositAddressMethod) {
-        const depositAddressOption = getDepositAddressOption(depositAddressOptions, setRoute, paymentState.isDepositFlow);
-        options.push(depositAddressOption);
+    const depositAddressOption = getDepositAddressOption(setRoute);
+    options.push(depositAddressOption);
+    // ZKP2P is currently only available on desktop. Check if the user is on
+    // desktop and if any ZKP2P options are available.
+    const zkp2pOptions = externalPaymentOptions.options.get("zkp2p") ?? [];
+    const showZkp2pPaymentMethod = !isMobile && zkp2pOptions.length > 0;
+    if (showZkp2pPaymentMethod) {
+        options.push({
+            id: "ZKP2P",
+            title: "Pay via payment app",
+            icons: zkp2pOptions.slice(0, 2).map((option) => option.logoURI),
+            onClick: () => {
+                setRoute(ROUTES.SELECT_ZKP2P);
+            },
+        });
     }
     return (jsxs(PageContent, { children: [jsx(OrderHeader, {}), jsx(OptionsList, { requiredSkeletons: isMobile ? 4 : 3, isLoading: externalPaymentOptions.loading, options: externalPaymentOptions.loading ? [] : options }), jsx(PoweredByFooter, {})] }));
 }
@@ -10833,11 +10818,10 @@ function getBestUnconnectedWalletIcons(connector, isMobile) {
     const icons = [];
     const strippedId = connector?.id.toLowerCase(); // some connector ids can have weird casing and or suffixes and prefixes
     const [isRainbow, isTrust, isPhantom, isCoinbase] = [
-        strippedId?.includes("rainbow.me"),
+        strippedId?.includes("rainbow"),
         strippedId?.includes("trust"),
         strippedId?.includes("phantom"),
         strippedId?.includes("coinbase"),
-        strippedId?.includes("rainbow"),
     ];
     if (isMobile) {
         if (!isTrust)
@@ -10846,7 +10830,7 @@ function getBestUnconnectedWalletIcons(connector, isMobile) {
             icons.push(jsx(Rainbow, {}));
         if (!isPhantom)
             icons.push(jsx(Phantom, {}));
-        if (icons.length < 3)
+        if (!isCoinbase && icons.length < 3)
             icons.push(jsx(Coinbase, {}));
     }
     else {
@@ -10854,10 +10838,6 @@ function getBestUnconnectedWalletIcons(connector, isMobile) {
             icons.push(jsx(Rainbow, {}));
         if (!isPhantom)
             icons.push(jsx(Phantom, {}));
-        if (!isCoinbase)
-            icons.push(jsx(Coinbase, {}));
-        if (icons.length < 3)
-            icons.push(jsx(Rabby, {}));
     }
     return icons;
 }
@@ -10877,25 +10857,14 @@ function getSolanaOption(isIOS, isAndroid, solanaWallets, disconnectSolana, setR
         },
     };
 }
-function getDepositAddressOption(depositAddressOptions, setRoute, isDepositFlow) {
-    // TODO: API should serve the subtitle and disabled
-    const disabled = !isDepositFlow &&
-        !depositAddressOptions.loading &&
-        depositAddressOptions.options.length === 0;
-    const subtitle = disabled ? "Minimum $20.00" : "Bitcoin, Tron, Zcash...";
+function getDepositAddressOption(setRoute) {
     return {
         id: "depositAddress",
-        title: "Pay on another chain",
-        subtitle,
-        icons: [
-            jsx(Bitcoin, {}, "bitcoin"),
-            jsx(Tron, {}, "tron"),
-            jsx(Zcash, {}, "zcash"),
-        ],
+        title: "Pay to address",
+        icons: [jsx(Ethereum, {}, "eth"), jsx(Tron, {}, "tron"), jsx(Base, {}, "base")],
         onClick: () => {
             setRoute(ROUTES.SELECT_DEPOSIT_ADDRESS_CHAIN);
         },
-        disabled,
     };
 }
 
@@ -11272,10 +11241,10 @@ const PayWithSolanaToken = () => {
         // Give user time to see the UI before opening
         const transferTimeout = setTimeout(handleTransfer, 100);
         return () => clearTimeout(transferTimeout);
-    }, [selectedSolanaTokenOption]);
+    }, [selectedSolanaTokenOption]); // eslint-disable-line react-hooks/exhaustive-deps
     useEffect(() => {
         triggerResize();
-    }, [payState]);
+    }, [payState]); // eslint-disable-line react-hooks/exhaustive-deps
     return (jsxs(PageContent, { children: [selectedSolanaTokenOption && (jsx(TokenLogoSpinner, { token: selectedSolanaTokenOption.required.token })), jsxs(ModalContent, { style: { paddingBottom: 0 }, children: [jsx(ModalH1, { children: payState }), selectedSolanaTokenOption && (jsx(PaymentBreakdown, { paymentOption: selectedSolanaTokenOption })), payState === PayState.RequestCancelled && (jsx(Button, { onClick: handleTransfer, children: "Retry Payment" }))] })] }));
 };
 
@@ -11288,13 +11257,55 @@ const SelectSolanaAmount = () => {
     return (jsx(MultiCurrencySelectAmount, { selectedTokenOption: selectedSolanaTokenOption, setSelectedTokenOption: setSelectedSolanaTokenOption, nextPage: ROUTES.SOLANA_PAY_WITH_TOKEN }));
 };
 
-const WaitingDepositAddress = () => {
+const CircleTimer = ({ total, size = 24, stroke = 3, currentTime, onTimeChange, children, }) => {
+    // timestamp (ms) when timer ends
+    const [target, setTarget] = useState(Date.now() + (currentTime ?? total) * 1000);
+    const [left, setLeft] = useState(currentTime ?? total);
+    // react to external currentTime updates
+    useEffect(() => {
+        if (currentTime !== undefined) {
+            setTarget(Date.now() + currentTime * 1000);
+            setLeft(currentTime);
+        }
+    }, [currentTime]);
+    // interval tick
+    useEffect(() => {
+        const id = setInterval(() => {
+            const secs = Math.max(0, Math.ceil((target - Date.now()) / 1000));
+            setLeft(secs);
+            onTimeChange?.(secs);
+            if (secs === 0)
+                clearInterval(id);
+        }, 1000);
+        return () => clearInterval(id);
+    }, [target, onTimeChange]);
+    const ratio = Math.round((left * 100) / total); // 0-100
+    const radius = Math.round((size - stroke) / 2); // integer radius
+    const circumference = Math.round((2 * 314 * radius) / 100); // 2πr, π≈3.14
+    const dashoffset = Math.round((circumference * (100 - ratio)) / 100);
+    // colour transition: green → orange → red
+    const color = ratio <= 10
+        ? "var(--timer-red, #D92D20)"
+        : ratio <= 40
+            ? "var(--timer-orange, #F79009)"
+            : "var(--timer-green, #12D18E)";
+    const center = Math.round(size / 2);
+    return (jsxs("svg", { viewBox: `0 0 ${size} ${size}`, width: size, height: size, role: "img", "aria-label": `Timer: ${left}s left of ${total}s`, children: [jsx("circle", { cx: center, cy: center, r: radius, fill: "transparent", stroke: "var(--ck-body-background-secondary, #EEE)", strokeWidth: stroke }), jsx("circle", { cx: center, cy: center, r: radius, fill: "transparent", stroke: color, strokeWidth: stroke, strokeDasharray: circumference, strokeDashoffset: dashoffset, strokeLinecap: "round", style: { transition: "stroke-dashoffset 1s linear" }, transform: `rotate(-90 ${center} ${center})` }), children && (jsx("foreignObject", { x: "0", y: "0", width: size, height: size, children: jsx("div", { style: {
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        width: "100%",
+                        height: "100%",
+                    }, children: children }) }))] }));
+};
+
+function WaitingDepositAddress() {
     const context = usePayContext();
     const { triggerResize, paymentState } = context;
     const { payWithDepositAddress, selectedDepositAddressOption } = paymentState;
     const [details, setDetails] = useState();
     const [failed, setFailed] = useState(false);
-    useEffect(() => {
+    const generateDepositAddress = () => {
         if (!selectedDepositAddressOption)
             return;
         payWithDepositAddress(selectedDepositAddressOption.id).then((details) => {
@@ -11303,12 +11314,172 @@ const WaitingDepositAddress = () => {
             else
                 setDetails(details);
         });
-    }, [selectedDepositAddressOption]);
+    };
+    // TODO: load payment status, show underpayment
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useEffect(generateDepositAddress, [selectedDepositAddressOption]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useEffect(triggerResize, [details]);
+    return (jsx(PageContent, { children: selectedDepositAddressOption == null ? null : failed ? (jsx(DepositFailed, { meta: selectedDepositAddressOption })) : (jsx(DepositAddressInfo, { meta: selectedDepositAddressOption, details: details, refresh: generateDepositAddress })) }));
+}
+function DepositAddressInfo({ meta, details, refresh, }) {
+    const { isMobile } = useIsMobile();
+    const [remainingS, totalS] = useCountdown(details?.expirationS);
+    const isExpired = details?.expirationS != null && remainingS === 0;
+    return (jsxs(ModalContent, { children: [isExpired ? (jsx(LogoWrap, { children: jsx(Button, { onClick: refresh, style: { width: 128 }, children: "Refresh" }) })) : isMobile ? (jsx(LogoWrap, { children: jsx("img", { src: meta.logoURI, width: "64px", height: "64px" }) })) : (jsx(QRWrap, { children: jsx(CustomQRCode, { value: details?.uri, contentPadding: 24, size: 200, image: jsx("img", { src: meta.logoURI, width: "100%", height: "100%" }) }) })), jsx(CopyableInfo, { meta: meta, details: details, remainingS: remainingS, totalS: totalS })] }));
+}
+const LogoWrap = styled.div `
+  padding: 32px 0;
+  height: 128px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+const QRWrap = styled.div `
+  margin: 0 auto;
+  width: 280px;
+`;
+function CopyableInfo({ meta, details, remainingS, totalS, }) {
+    const currencies = details?.suffix;
+    const isExpired = details?.expirationS != null && remainingS === 0;
+    return (jsxs(CopyableInfoWrapper, { children: [jsx(CopyRowOrThrobber, { title: "Send Exactly", value: details?.amount, smallText: currencies, disabled: isExpired }), jsx(CopyRowOrThrobber, { title: "Receiving Address", value: details?.address, valueText: details && getAddressContraction(details.address), disabled: isExpired }), jsx(CountdownWrap, { children: jsx(CountdownTimer, { remainingS: remainingS, totalS: totalS }) })] }));
+}
+const CopyableInfoWrapper = styled.div `
+  display: flex;
+  flex-direction: column;
+  justify-content: stretch;
+  gap: 0;
+  margin-top: 8px;
+`;
+const CountdownWrap = styled.div `
+  margin-top: 24px;
+  height: 16px;
+`;
+function useCountdown(expirationS) {
+    const [initMs] = useState(Date.now());
+    const [ms, setMs] = useState(initMs);
     useEffect(() => {
-        triggerResize();
-    }, [details]);
-    return (jsx(PageContent, { children: failed ? (jsxs(ModalContent, { style: { marginLeft: 24, marginRight: 24 }, children: [jsxs(ModalH1, { children: [selectedDepositAddressOption?.id, " unavailable"] }), jsxs(ModalBody, { children: ["We're unable to process ", selectedDepositAddressOption?.id, " ", "payments at this time. Please select another payment method."] }), jsx(SelectAnotherMethodButton, {})] })) : (jsxs(ModalContent, { children: [jsx(CustomQRCode, { value: details?.uri, image: jsx("img", { src: selectedDepositAddressOption?.logoURI, width: "100%", height: "100%" }), tooltipMessage: jsxs(Fragment, { children: [jsx(ScanIconWithLogos, { logo: jsx("img", { src: selectedDepositAddressOption?.logoURI }) }), jsxs("span", { children: ["Use a ", selectedDepositAddressOption?.id, " wallet to scan"] })] }) }), details && (jsxs(Fragment, { children: [jsx(OrDivider, {}), jsxs(ModalBody, { children: ["Send exactly ", details.amount, " ", details.suffix, " to", " ", getAddressContraction(details.address), " and return to this page. Confirmation should appear in a few minutes."] }), jsx(CopyToClipboard, { variant: "button", string: details.address, children: "Copy Address" }), jsx(CopyToClipboard, { variant: "left", string: details.amount, children: "Copy Amount" })] }))] })) }));
+        const interval = setInterval(() => setMs(Date.now()), 1000);
+        return () => clearInterval(interval);
+    }, []);
+    if (expirationS == null)
+        return [0, 0];
+    const remainingS = Math.max(0, (expirationS - ms / 1000) | 0);
+    const totalS = Math.max(0, (expirationS - initMs / 1000) | 0);
+    return [remainingS, totalS];
+}
+function CountdownTimer({ remainingS, totalS, }) {
+    if (totalS == 0)
+        return null;
+    if (remainingS > 3600)
+        return null;
+    const isExpired = remainingS === 0;
+    return (jsx(ModalBody, { children: jsxs(CountdownRow, { children: [jsx(CircleTimer, { total: totalS, currentTime: remainingS, size: 18, stroke: 3 }), jsx("strong", { children: isExpired ? "Expired" : formatTime(remainingS) })] }) }));
+}
+const CountdownRow = styled.div `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  font-variant-numeric: tabular-nums;
+`;
+const formatTime = (sec) => {
+    const m = `${Math.floor(sec / 60)}`.padStart(2, "0");
+    const s = `${sec % 60}`.padStart(2, "0");
+    return `${m}:${s}`;
 };
+function DepositFailed({ meta, }) {
+    return (jsxs(ModalContent, { style: { marginLeft: 24, marginRight: 24 }, children: [jsxs(ModalH1, { children: [meta.id, " unavailable"] }), jsxs(ModalBody, { children: ["We're unable to process ", meta.id, " payments at this time. Please select another payment method."] }), jsx(SelectAnotherMethodButton, {})] }));
+}
+const CopyRow = styled.button `
+  display: block;
+  height: 64px;
+  border-radius: 8px;
+  padding: 8px 16px;
+
+  cursor: pointer;
+
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  transition: all 100ms ease;
+
+  &:hover {
+    opacity: 0.8;
+  }
+
+  &:active {
+    transform: scale(0.98);
+    background-color: var(--ck-body-background-secondary);
+  }
+
+  &:disabled {
+    cursor: default;
+    opacity: 0.5;
+    transform: scale(0.98);
+    background-color: var(--ck-body-background-secondary);
+  }
+`;
+const LabelRow = styled.div `
+  margin-bottom: 4px;
+`;
+const MainRow = styled.div `
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+`;
+const ValueContainer = styled.div `
+  display: flex;
+  align-items: center;
+  gap: 8px;
+`;
+const SmallText = styled.span `
+  font-size: 14px;
+  color: var(--ck-body-color-muted);
+`;
+const pulse = keyframes `
+  0% {
+    opacity: 0.6;
+  }
+  50% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0.6;
+  }
+`;
+const Skeleton = styled.div `
+  width: 80px;
+  height: 16px;
+  border-radius: 8px;
+  background-color: rgba(0, 0, 0, 0.1);
+  animation: ${pulse} 1.5s ease-in-out infinite;
+`;
+function CopyRowOrThrobber({ title, value, valueText, smallText, disabled, }) {
+    const [copied, setCopied] = useState(false);
+    const handleCopy = () => {
+        if (disabled)
+            return;
+        if (!value)
+            return;
+        const str = value.trim();
+        if (navigator.clipboard) {
+            navigator.clipboard.writeText(str);
+        }
+        setCopied(true);
+        setTimeout(() => setCopied(false), 1000);
+    };
+    if (!value) {
+        return (jsxs(CopyRow, { children: [jsx(LabelRow, { children: jsx(ModalBody, { style: { margin: 0, textAlign: "left" }, children: title }) }), jsx(MainRow, { children: jsx(Skeleton, {}) })] }));
+    }
+    const displayValue = valueText || value;
+    return (jsxs(CopyRow, { as: "button", onClick: handleCopy, disabled: disabled, children: [jsxs("div", { children: [jsx(LabelRow, { children: jsx(ModalBody, { style: { margin: 0, textAlign: "left" }, children: title }) }), jsx(MainRow, { children: jsxs(ValueContainer, { children: [jsx("span", { style: { fontWeight: 600 }, children: displayValue }), smallText && jsx(SmallText, { children: smallText })] }) })] }), jsx(CopyIconWrap, { children: jsx(CopyToClipboardIcon, { copied: copied, dark: true }) })] }));
+}
+const CopyIconWrap = styled.div `
+  --color: var(--ck-copytoclipboard-stroke);
+  --bg: var(--ck-body-background);
+`;
 
 const WaitingExternal = () => {
     const context = usePayContext();
@@ -11332,7 +11503,7 @@ const WaitingExternal = () => {
             setExternalURL(url);
             openExternalWindow(url);
         });
-    }, [selectedExternalOption]);
+    }, [selectedExternalOption]); // eslint-disable-line react-hooks/exhaustive-deps
     const openExternalWindow = (url) => {
         if (isMobile || isPaymentApp) {
             // on mobile: open in a new tab
@@ -11355,7 +11526,7 @@ const WaitingExternal = () => {
     const waitingMessageLength = paymentWaitingMessage?.length;
     useEffect(() => {
         triggerResize();
-    }, [waitingMessageLength, externalURL]);
+    }, [waitingMessageLength, externalURL]); // eslint-disable-line react-hooks/exhaustive-deps
     if (!selectedExternalOption) {
         return jsx(PageContent, {});
     }
@@ -11714,7 +11885,7 @@ function useDepositAddressOptions({ trpc, usdRequired, mode, }) {
         if (usdRequired != null && mode != null) {
             refreshDepositAddressOptions(usdRequired, mode);
         }
-    }, [usdRequired, mode]);
+    }, [usdRequired, mode]); // eslint-disable-line react-hooks/exhaustive-deps
     return { options, loading };
 }
 
@@ -11781,7 +11952,7 @@ function useOrderUsdLimits({ trpc }) {
             }
         };
         refreshOrderUsdLimits();
-    }, []);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
     return { limits, loading };
 }
 
@@ -11813,7 +11984,7 @@ function useSolanaPaymentOptions({ trpc, address, usdRequired, isDepositFlow, })
         if (address != null && usdRequired != null) {
             refreshWalletPaymentOptions();
         }
-    }, [address, usdRequired, isDepositFlow]);
+    }, [address, usdRequired, isDepositFlow]); // eslint-disable-line react-hooks/exhaustive-deps
     return {
         options,
         isLoading,
@@ -11858,6 +12029,7 @@ function useWalletPaymentOptions({ trpc, address, usdRequired, destChainId, pref
         if (address != null && usdRequired != null && destChainId != null) {
             refreshWalletPaymentOptions();
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         address,
         usdRequired,
@@ -12061,9 +12233,36 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         return externalPaymentOptionData.url;
     };
     const payWithDepositAddress = async (option) => {
-        assert(pay.paymentState == "payment_unpaid", `[PAY DEPOSIT ADDRESS] paymentState is ${pay.paymentState}, must be payment_unpaid`);
         const { order: hydratedOrder } = await pay.hydrateOrder();
-        log(`[PAY DEPOSIT ADDRESS] hydrated order: ${JSON.stringify(hydratedOrder)}, checking out with deposit address: ${option}`);
+        log(`[PAY DEPOSIT ADDRESS] hydrated order: ${debugJson(hydratedOrder)}, checking out with deposit address: ${option}`);
+        // Special-case: USDT on Tron uses the Untron service rather than ChangeNow
+        const payParams = currPayParams;
+        if (option === DepositAddressPaymentOptions.TRON_USDT) {
+            // Ensure we have an appId for auth to backend
+            assert(payParams?.appId != null, "[PAY DEPOSIT ADDRESS] missing appId required for Tron USDT payments");
+            // Round up to the nearest integer number of USDT to avoid fractional tokens.
+            const usd = hydratedOrder.usdValue.toFixed(2);
+            const amountTronUSDT = parseUnits(usd, 6);
+            const untronResp = await trpc.untronTryCreateOrder.mutate({
+                appId: payParams.appId,
+                intentAddr: assertNotNull(hydratedOrder.intentAddr, `[PAY DEPOSIT ADDRESS] missing intentAddr on order ${hydratedOrder.id}`),
+                amountTronUSDT: Number(amountTronUSDT),
+            });
+            if ("error" in untronResp) {
+                log(`[PAY DEPOSIT ADDRESS] failed to create Untron order: ${untronResp.error}`);
+                return null;
+            }
+            const untronOrder = untronResp.untronOrder;
+            // Map Untron response to the generic deposit-address shape expected by the UI
+            return {
+                address: untronOrder.receiver,
+                amount: usd,
+                suffix: "USDT on Tron",
+                uri: `tron:${untronOrder.receiver}`,
+                expirationS: untronOrder.expiresAtS - 60,
+            };
+        }
+        // Default behaviour for all other tokens via ChangeNow
         const depositAddressOption = await trpc.getDepositAddressOptionData.query({
             input: option,
             usdRequired: hydratedOrder.destFinalCallTokenAmount.usd,