@daimo/pay 1.10.0 → 1.10.2

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, mantle } from 'wagmi/chains';
 import { safe, injected, coinbaseWallet, walletConnect } from '@wagmi/connectors';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { DaimoPayIntentStatus, assert, DaimoPayOrderMode, isHydrated, readDaimoPayOrderID, getOrderDestChainId, assertNotNull, getChainName, arbitrum as arbitrum$1, base as base$2, 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, DepositAddressPaymentOptions, ethereumUSDC, polygonUSDC, baseUSDC, arbitrumUSDC, optimismUSDC, isCCTPV1Chain, debugJson, writeDaimoPayOrderID, DaimoPayOrderStatusSource, getOrderSourceChainId, DaimoPayEventType, getDaimoPayOrderView, worldchainWLD, worldchainUSDCe } from '@daimo/pay-common';
+import { DaimoPayIntentStatus, assert, DaimoPayOrderMode, isHydrated, readDaimoPayOrderID, getOrderDestChainId, assertNotNull, getChainName, arbitrum as arbitrum$1, base as base$2, 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, DepositAddressPaymentOptions, ethereumUSDC, polygonUSDC, baseUSDC, arbitrumUSDC, optimismUSDC, isCCTPV1Chain, debugJson, writeDaimoPayOrderID, DaimoPayOrderStatusSource, getOrderSourceChainId, DaimoPayEventType, getDaimoPayOrderView, worldchainWLD, worldchainUSDC } 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.10.0";
+var version = "1.10.2";
 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.10.0",
+	"@daimo/pay-common": "1.10.2",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -7281,11 +7281,15 @@ const ConnectorItem = ({ wallet, isRecent, }) => {
         if (redirectToMoreWallets) {
             context.setRoute(ROUTES.MOBILECONNECTORS);
         }
-        else if (context.paymentState.isDepositFlow && isMobile) {
+        else if (context.paymentState.isDepositFlow &&
+            isMobile &&
+            !wallet.connector) {
             context.paymentState.setSelectedWallet(wallet);
             context.setRoute(ROUTES.SELECT_WALLET_AMOUNT);
         }
-        else if (isMobile && wallet.getDaimoPayDeeplink != null) {
+        else if (isMobile &&
+            wallet.getDaimoPayDeeplink != null &&
+            !wallet.connector) {
             context.paymentState.openInWalletBrowser(wallet);
         }
         else {
@@ -7296,11 +7300,7 @@ const ConnectorItem = ({ wallet, isRecent, }) => {
             context.setRoute(ROUTES.CONNECT);
         }
     };
-    return (jsxs(ConnectorButton, { type: "button", 
-        // Is this <a> tag necessary?
-        // as={deeplink ? "a" : undefined}
-        // href={deeplink ? deeplink : undefined}
-        onClick: onClick, children: [jsx(ConnectorIcon, { "data-small": wallet.iconShouldShrink, "data-shape": wallet.iconShape, children: wallet.iconConnector ?? wallet.icon }), jsxs(ConnectorLabel, { children: [isMobile ? (wallet.shortName ?? wallet.name) : wallet.name, !context.options?.hideRecentBadge && isRecent && (jsx(RecentlyUsedTag, { children: jsx("span", { children: "Recent" }) }))] })] }));
+    return (jsxs(ConnectorButton, { type: "button", onClick: onClick, children: [jsx(ConnectorIcon, { "data-small": wallet.iconShouldShrink, "data-shape": wallet.iconShape, children: wallet.iconConnector ?? wallet.icon }), jsxs(ConnectorLabel, { children: [isMobile ? (wallet.shortName ?? wallet.name) : wallet.name, !context.options?.hideRecentBadge && isRecent && (jsx(RecentlyUsedTag, { children: jsx("span", { children: "Recent" }) }))] })] }));
 };
 const SkeletonConnectorItem = () => {
     const { isMobile } = useIsMobile();
@@ -7669,6 +7669,8 @@ const QRPlaceholder = styled(motion.div) `
   display: flex;
   align-items: center;
   justify-content: center;
+  border-radius: var(--ck-qr-border-radius, 24px);
+  overflow: hidden;
   > div {
     z-index: 4;
     position: relative;
@@ -11518,7 +11520,8 @@ const CountdownWrap = styled.div `
   height: 16px;
 `;
 function useCountdown(expirationS) {
-    const [initMs] = useState(Date.now());
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const initMs = useMemo(() => Date.now(), [expirationS]);
     const [ms, setMs] = useState(initMs);
     useEffect(() => {
         const interval = setInterval(() => setMs(Date.now()), 1000);
@@ -11560,6 +11563,7 @@ const CopyRow = styled.button `
 
   cursor: pointer;
   background-color: var(--ck-body-background);
+  background-color: var(--ck-body-background);
 
   display: flex;
   align-items: center;
@@ -12081,7 +12085,9 @@ function useExternalPaymentOptions({ trpc, filterIds, platform, usdRequired, mod
                 });
                 // Filter out options not in options JSON
                 const enabledExtPaymentOptions = filterIds || DEFAULT_EXTERNAL_PAYMENT_OPTIONS;
-                const filteredOptions = newOptions.filter((option) => enabledExtPaymentOptions.includes(option.id));
+                const hasAllPaymentApps = enabledExtPaymentOptions.includes(ExternalPaymentOptions.AllPaymentApps);
+                const filteredOptions = newOptions.filter((option) => enabledExtPaymentOptions.includes(option.id) ||
+                    (hasAllPaymentApps && option.optionType === "zkp2p"));
                 const optionsByType = new Map();
                 filteredOptions.forEach((option) => {
                     const { optionType } = option;
@@ -12410,42 +12416,12 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         return externalPaymentOptionData.url;
     };
     const payWithDepositAddress = async (option) => {
-        const { order: hydratedOrder } = await pay.hydrateOrder();
-        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,
-            toAddress: hydratedOrder.intentAddr,
+        const { order } = await pay.hydrateOrder();
+        log(`[PAY DEPOSIT ADDRESS] hydrated order ${order.id} for ${order.usdValue} USD, checking out with deposit address: ${option}`);
+        return await trpc.getDepositAddressForOrder.query({
+            orderId: order.id.toString(),
+            option,
         });
-        return depositAddressOption;
     };
     const { isIOS } = useIsMobile();
     const openInWalletBrowser = (wallet, amountUsd) => {
@@ -13598,7 +13574,8 @@ async function promptWorldcoinPayment(order, trpc) {
         // Dynamically import @worldcoin/minikit-js to avoid bundling it for
         // developers who don't use World Mini App features, as it's an optional
         // peer dependency.
-        const { MiniKit, Tokens } = await import('@worldcoin/minikit-js');
+        const { MiniKit, Tokens } = await import(
+        /* webpackIgnore: true */ '@worldcoin/minikit-js');
         if (!MiniKit.isInstalled()) {
             console.error("[WORLD] MiniKit is not installed. Please install @worldcoin/minikit-js to use this feature.");
             return null;
@@ -13611,13 +13588,13 @@ async function promptWorldcoinPayment(order, trpc) {
                     token: worldchainWLD.token,
                 },
                 {
-                    chainId: worldchainUSDCe.chainId,
-                    token: worldchainUSDCe.token,
+                    chainId: worldchainUSDC.chainId,
+                    token: worldchainUSDC.token,
                 },
             ],
         }));
         const wld = paymentOptions.find((opt) => getAddress(opt.token.token) === getAddress(worldchainWLD.token));
-        const usdc = paymentOptions.find((opt) => getAddress(opt.token.token) === getAddress(worldchainUSDCe.token));
+        const usdc = paymentOptions.find((opt) => getAddress(opt.token.token) === getAddress(worldchainUSDC.token));
         assert(wld != null, "WLD DP token not found");
         assert(usdc != null, "USDCe DP token not found");
         const paymentId = crypto.randomUUID().replace(/-/g, "");
@@ -13658,7 +13635,7 @@ function WorldPayButtonCustom(props) {
         // Dynamically import @worldcoin/minikit-js to avoid bundling it for
         // developers who don't use World Mini App features, as it's an optional
         // peer dependency.
-        import('@worldcoin/minikit-js')
+        import(/* webpackIgnore: true */ '@worldcoin/minikit-js')
             .then(({ MiniKit }) => {
             if (MiniKit.isInstalled()) {
                 setIsMiniKitReady(true);