@daimo/pay 1.9.1 → 1.9.4

package/build/index.js

@@ -1,8 +1,8 @@
 import { http, useConnectors as useConnectors$1, useAccount, useSwitchChain, useConnect as useConnect$1, useConfig, useDisconnect, useChainId, useAccountEffect, useEnsName, useSendTransaction, useWriteContract, WagmiContext, createConfig, useEnsAddress, useEnsAvatar } from 'wagmi';
-import { mainnet, base as base$1, polygon, optimism, arbitrum, linea, bsc, sepolia, baseSepolia, worldchain, blast, mantle } from 'wagmi/chains';
+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, 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 { 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 } 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.9.1";
+var version = "1.9.4";
 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.9.1",
+	"@daimo/pay-common": "1.9.4",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -175,7 +175,6 @@ const REQUIRED_CHAINS = [
     sepolia,
     baseSepolia,
     worldchain,
-    blast,
     mantle,
 ];
 /** Daimo Pay recommended config, for use with wagmi's createConfig(). */
@@ -2164,6 +2163,7 @@ function useLockBodyScroll(initialLocked) {
     return [locked, setLocked];
 }
 
+const WarningIcon = () => (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", strokeWidth: 1.5, stroke: "currentColor", className: "size-6", width: "16", height: "16", children: jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z" }) }));
 const ExternalLinkIcon = ({ ...props }) => (jsxs("svg", { "aria-hidden": "true", width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", xmlns: "http://www.w3.org/2000/svg", style: {
         left: 0,
         top: 0,
@@ -2392,8 +2392,8 @@ function reduceUnhydrated(state, event) {
 }
 function reducePaymentUnpaid(state, event) {
     switch (event.type) {
-        case "payment_started":
-            return { type: "payment_started", order: state.order };
+        case "order_refreshed":
+            return reduceOrderRefreshed(state, event.order);
         case "error":
             return {
                 type: "error",
@@ -2408,14 +2408,8 @@ function reducePaymentUnpaid(state, event) {
 }
 function reducePaymentStarted(state, event) {
     switch (event.type) {
-        case "order_refreshed": {
-            assert(event.order.mode === DaimoPayOrderMode.HYDRATED, `[PAYMENT_REDUCER] order ${event.order.id} is ${event.order.intentStatus} but not hydrated`);
-            return { type: "payment_started", order: event.order };
-        }
-        case "dest_processed":
-            return event.order.intentStatus === DaimoPayIntentStatus.COMPLETED
-                ? { type: "payment_completed", order: event.order }
-                : { type: "payment_bounced", order: event.order };
+        case "order_refreshed":
+            return reduceOrderRefreshed(state, event.order);
         case "error":
             return {
                 type: "error",
@@ -2428,6 +2422,21 @@ function reducePaymentStarted(state, event) {
             return state;
     }
 }
+function reduceOrderRefreshed(state, order) {
+    assert(isHydrated(order), `[PAYMENT_REDUCER] unhydrated`);
+    switch (order.intentStatus) {
+        case DaimoPayIntentStatus.UNPAID:
+            return { type: "payment_unpaid", order };
+        case DaimoPayIntentStatus.STARTED:
+            return { type: "payment_started", order };
+        case DaimoPayIntentStatus.COMPLETED:
+            return { type: "payment_completed", order };
+        case DaimoPayIntentStatus.BOUNCED:
+            return { type: "payment_bounced", order };
+        default:
+            return state;
+    }
+}
 function reduceTerminal(state, event) {
     switch (event.type) {
         case "reset":
@@ -2461,10 +2470,9 @@ function waitForPaymentState(store, predicate) {
  * Will poll the given function at the specified interval. Stops when the
  * returned handle is invoked.
  */
-function startPolling({ key, intervalMs, pollFn, onResult, onError, maxErrors = 5, log = console.log, }) {
+function startPolling({ key, intervalMs, pollFn, onResult, onError, log = console.log, }) {
     let active = true;
     let timer;
-    let errorCount = 0;
     const stop = () => {
         active = false;
         clearTimeout(timer);
@@ -2476,7 +2484,6 @@ function startPolling({ key, intervalMs, pollFn, onResult, onError, maxErrors =
             const res = await pollFn();
             if (!active)
                 return;
-            errorCount = 0;
             log(`[POLL] ${key} success`);
             onResult(res);
         }
@@ -2485,11 +2492,6 @@ function startPolling({ key, intervalMs, pollFn, onResult, onError, maxErrors =
                 return;
             log(`[POLL] ${key} error: ${e}`);
             onError(e);
-            errorCount++;
-            if (errorCount >= maxErrors) {
-                log(`[POLL] ${key} reached max errors (${maxErrors}), giving up`);
-                return stop();
-            }
         }
         timer = setTimeout(tick, intervalMs);
     };
@@ -2527,7 +2529,7 @@ function attachPaymentEffectHandlers(store, trpc, log) {
         if (prev.type !== next.type) {
             // Start watching for source payment
             if (next.type === "payment_unpaid") {
-                pollFindSourcePayment(store, trpc, next.order.id);
+                pollFindPayments(store, trpc, next.order.id);
             }
             // Refresh the order to watch for destination processing
             if (next.type === "payment_started") {
@@ -2591,22 +2593,19 @@ function attachPaymentEffectHandlers(store, trpc, log) {
     };
     return cleanup;
 }
-async function pollFindSourcePayment(store, trpc, orderId) {
+async function pollFindPayments(store, trpc, orderId) {
     const key = `${PollerType.FIND_SOURCE_PAYMENT}:${orderId}`;
     const stopPolling = startPolling({
         key,
         intervalMs: 1_000,
-        pollFn: () => trpc.findSourcePayment.query({ orderId: orderId.toString() }),
-        onResult: (found) => {
+        pollFn: () => trpc.findOrderPayments.query({ orderId: orderId.toString() }),
+        onResult: (order) => {
             const state = store.getState();
-            // Check that we're still in the payment_unpaid state
             if (state.type !== "payment_unpaid") {
                 stopPolling();
+                return;
             }
-            else if (found) {
-                stopPolling();
-                store.dispatch({ type: "payment_started", order: state.order });
-            }
+            store.dispatch({ type: "order_refreshed", order });
         },
         onError: () => { },
     });
@@ -2621,16 +2620,12 @@ async function pollRefreshOrder(store, trpc, orderId) {
         onResult: (res) => {
             const state = store.getState();
             // Check that we're still in the payment_started state
-            if (state.type !== "payment_started")
+            if (state.type !== "payment_started") {
+                stopPolling();
                 return;
+            }
             const order = res.order;
             store.dispatch({ type: "order_refreshed", order });
-            if (order.intentStatus === "payment_completed" ||
-                order.intentStatus === "payment_bounced") {
-                assert(order.mode === DaimoPayOrderMode.HYDRATED, `[PAYMENT_EFFECTS] order ${order.id} is ${order.intentStatus} but not hydrated`);
-                store.dispatch({ type: "dest_processed", order });
-                stopPolling();
-            }
         },
         onError: () => { },
     });
@@ -2739,7 +2734,7 @@ async function runHydratePayIdEffects(store, trpc, prev, event) {
 async function runPayEthereumSourceEffects(store, trpc, prev, event) {
     const orderId = prev.order.id;
     try {
-        await trpc.processSourcePayment.mutate({
+        const order = await trpc.processSourcePayment.mutate({
             orderId: orderId.toString(),
             sourceInitiateTxHash: event.paymentTxHash,
             sourceChainId: event.sourceChainId,
@@ -2747,8 +2742,7 @@ async function runPayEthereumSourceEffects(store, trpc, prev, event) {
             sourceToken: event.sourceToken,
             sourceAmount: event.sourceAmount.toString(),
         });
-        // TODO: Update order state with updated txHash
-        store.dispatch({ type: "payment_started", order: prev.order });
+        store.dispatch({ type: "order_refreshed", order });
     }
     catch (e) {
         store.dispatch({ type: "error", order: prev.order, message: e.message });
@@ -2757,13 +2751,12 @@ async function runPayEthereumSourceEffects(store, trpc, prev, event) {
 async function runPaySolanaSourceEffects(store, trpc, prev, event) {
     const orderId = prev.order.id;
     try {
-        await trpc.processSolanaSourcePayment.mutate({
+        const order = await trpc.processSolanaSourcePayment.mutate({
             orderId: orderId.toString(),
             startIntentTxHash: event.paymentTxHash,
             token: event.sourceToken,
         });
-        // TODO: Update order state with updated txHash
-        store.dispatch({ type: "payment_started", order: prev.order });
+        store.dispatch({ type: "order_refreshed", order });
     }
     catch (e) {
         store.dispatch({ type: "error", order: prev.order, message: e.message });
@@ -7333,12 +7326,33 @@ const Base = ({ testnet, ...props }) => (jsx("svg", { ...props, width: "44", hei
     }, children: jsx("path", { d: "M21.9756 36C29.721 36 36 29.732 36 22C36 14.268 29.721 8 21.9756 8C14.6271 8 8.59871 13.6419 8 20.8232H26.5371V23.1768H8C8.59871 30.3581 14.6271 36 21.9756 36Z", fill: "white" }) }));
 const Linea = ({ testnet, ...props }) => (jsxs("svg", { ...props, width: "44", height: "44", viewBox: "0 0 200 200", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("path", { d: "M200 0H0V200H200V0Z", fill: "#121212" }), jsx("mask", { id: "mask0_267_10", style: { maskType: "luminance" }, maskUnits: "userSpaceOnUse", x: "50", y: "48", width: "100", height: "104", children: jsx("path", { d: "M149.541 48H50V151.977H149.541V48Z", fill: "white" }) }), jsxs("g", { mask: "url(#mask0_267_10)", children: [jsx("path", { d: "M132.669 151.977H50V64.8721H68.9147V135.096H132.669V151.968V151.977Z", fill: "white" }), jsx("path", { d: "M132.669 81.7441C141.987 81.7441 149.541 74.1902 149.541 64.8721C149.541 55.5539 141.987 48 132.669 48C123.35 48 115.797 55.5539 115.797 64.8721C115.797 74.1902 123.35 81.7441 132.669 81.7441Z", fill: "white" })] })] }));
 const Worldchain = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 400 400", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("path", { d: "M0 0 C132 0 264 0 400 0 C400 132 400 264 400 400 C268 400 136 400 0 400 C0 268 0 136 0 0 Z ", fill: "#FEFEFE", transform: "translate(0,0)" }), jsx("path", { d: "M0 0 C0.70403961 0.0012085 1.40807922 0.00241699 2.13345337 0.00366211 C37.34271908 0.16721508 68.5105973 14.80090333 93.17163086 39.68505859 C98.62984305 45.41558542 103.09177892 51.78200535 107.4375 58.375 C108.159375 59.4475 108.88125 60.52 109.625 61.625 C122.08220864 80.87704972 127.84793078 103.26191133 127.75 126.0625 C127.74850952 126.72419189 127.74701904 127.38588379 127.7454834 128.06762695 C127.70436084 138.22551322 127.07498098 147.56085403 124.4375 157.375 C124.14746094 158.56480469 123.85742188 159.75460938 123.55859375 160.98046875 C117.33294616 184.86715846 102.42700827 208.48904018 83.4375 224.375 C82.7775 224.375 82.1175 224.375 81.4375 224.375 C81.4375 225.035 81.4375 225.695 81.4375 226.375 C79.55168751 227.86844182 77.6802053 229.22460868 75.6875 230.5625 C75.09767334 230.96251221 74.50784668 231.36252441 73.90014648 231.7746582 C45.33982467 250.94089101 10.69801357 259.36417248 -23.53125 253.31640625 C-58.32294327 245.96067382 -87.68703658 225.97193245 -107.32177734 196.33154297 C-113.84308531 186.04784324 -119.21618764 175.09939589 -122.5625 163.375 C-122.75714844 162.7032373 -122.95179687 162.03147461 -123.15234375 161.33935547 C-126.29298989 150.01096274 -126.95426502 138.7553544 -127 127.0625 C-127.0061734 126.39534973 -127.0123468 125.72819946 -127.01870728 125.04083252 C-127.22210042 90.87814217 -112.10569979 60.09763142 -88.5625 35.9375 C-73.41024939 20.79283974 -54.8893351 10.80975271 -34.5625 4.375 C-33.52222656 4.04242188 -32.48195313 3.70984375 -31.41015625 3.3671875 C-20.96204118 0.67295275 -10.76743051 -0.03432509 0 0 Z ", fill: "#030303", transform: "translate(199.5625,72.625)" }), jsx("path", { d: "M0 0 C11.55 0 23.1 0 35 0 C37.475 7.425 37.475 7.425 40 15 C49.21380616 33.94914853 62.0370052 48.14330377 82.26171875 55.140625 C83.16535156 55.42421875 84.06898438 55.7078125 85 56 C86.03415543 56.34114838 87.06831085 56.68229675 88.13380432 57.03378296 C92.4151578 58.10375381 96.2112859 58.30653699 100.59741211 58.31884766 C101.84252563 58.33391609 101.84252563 58.33391609 103.11279297 58.34928894 C105.83430337 58.37997941 108.55571605 58.39711649 111.27734375 58.4140625 C113.17306857 58.43278554 115.06878515 58.45235979 116.9644928 58.4727478 C121.93741998 58.52395501 126.91037415 58.56364168 131.88342285 58.60089111 C136.96466688 58.64100246 142.04579976 58.69206221 147.12695312 58.7421875 C157.08455721 58.83881161 167.04222421 58.92325948 177 59 C176.06240625 60.11818809 175.12128368 61.23341782 174.17871094 62.34741211 C173.39315826 63.27945717 173.39315826 63.27945717 172.59173584 64.23033142 C162.58148353 75.35958323 147.85650103 82.10162688 134 87 C132.87980469 87.41765625 131.75960937 87.8353125 130.60546875 88.265625 C112.47396566 93.94296445 87.79207496 93.59729315 70 87 C68.77410156 86.5875 67.54820312 86.175 66.28515625 85.75 C40.7576163 76.74144211 20.58906247 57.52681738 8.6484375 33.45703125 C3.51705369 22.69571686 0 12.06068152 0 0 Z ", fill: "#FAFAFA", transform: "translate(98,212)" }), jsx("path", { d: "M0 0 C0.99128906 0.26683594 1.98257813 0.53367187 3.00390625 0.80859375 C20.02205338 5.90723969 35.38784974 15.53622797 48 28 C48 28.33 48 28.66 48 29 C46.99569946 29.00142502 45.99139893 29.00285004 44.95666504 29.00431824 C35.42537052 29.02109205 25.89449728 29.06417913 16.36342621 29.13209057 C11.46504263 29.16617258 6.56696472 29.19144103 1.66845703 29.19555664 C-3.07161547 29.19988029 -7.81100063 29.22867466 -12.55085754 29.27343178 C-14.34621658 29.28627824 -16.14165841 29.29076089 -17.9370575 29.28615379 C-39.57125354 29.2436265 -58.64662622 35.40002391 -74.56494141 50.54882812 C-85.14790619 61.25062171 -89.66973578 73.56885506 -93 88 C-104.88 88 -116.76 88 -129 88 C-129 64.08086196 -115.40828709 41.63583644 -99 25 C-72.65926108 0.43663887 -35.01441399 -9.99793527 0 0 Z ", fill: "#FBFBFB", transform: "translate(227,100)" }), jsx("path", { d: "M0 0 C1.43530815 -0.00043808 1.43530815 -0.00043808 2.89961243 -0.00088501 C6.04327657 0.00050157 9.18669983 0.01603116 12.33032227 0.03173828 C14.51750051 0.0354708 16.70468044 0.03831664 18.89186096 0.04031372 C24.63427386 0.04793137 30.37658477 0.06756384 36.11895752 0.08972168 C41.98432028 0.11022036 47.8496996 0.11932403 53.71508789 0.12939453 C65.21317945 0.15081148 76.71119548 0.18492487 88.20922852 0.22705078 C89.01417532 1.6299547 89.81343075 3.03612493 90.61035156 4.44360352 C91.05606003 5.22630112 91.50176849 6.00899872 91.96098328 6.81541443 C93.86879215 10.50134175 94.96928018 14.29024711 96.02172852 18.28955078 C96.34560547 19.41586914 96.34560547 19.41586914 96.67602539 20.56494141 C98.11972655 25.86767867 98.20922852 29.34376842 98.20922852 35.22705078 C50.68922852 35.22705078 3.16922852 35.22705078 -45.79077148 35.22705078 C-41.98207673 22.53140161 -35.92269341 12.61991806 -24.31030273 5.76220703 C-16.09258333 1.47307966 -9.18687217 -0.07412284 0 0 Z ", fill: "#FDFDFD", transform: "translate(203.790771484375,152.77294921875)" }), jsx("path", { d: "M0 0 C47.52 0 95.04 0 144 0 C142.84140283 13.90316605 142.84140283 13.90316605 140.6875 20.3125 C140.48705078 20.96283203 140.28660156 21.61316406 140.08007812 22.28320312 C138.58431084 26.91869244 136.43289036 30.78177675 134 35 C121.42969934 35.09296032 108.85948139 35.16389686 96.2889061 35.20724869 C90.45094348 35.22806258 84.61321724 35.25626666 78.77539062 35.30175781 C73.1343582 35.34543695 67.49355217 35.36918365 61.85236359 35.37950897 C59.70752655 35.38686085 57.56270095 35.40121672 55.41796112 35.42292023 C38.21797933 35.58994386 24.82919001 34.23919899 11.77734375 21.8984375 C5.69643497 15.465177 1.74000471 8.70002355 0 0 Z ", fill: "#FDFDFD", transform: "translate(158,212)" }), jsx("path", { d: "M0 0 C47.52 0 95.04 0 144 0 C144 0.33 144 0.66 144 1 C143.27516733 1.00238835 142.55033466 1.00477671 141.80353737 1.00723743 C124.18601629 1.0663125 106.5686429 1.14181412 88.95127296 1.23571491 C80.43172058 1.28072596 71.91221049 1.32012822 63.39257812 1.34643555 C55.96891368 1.3693728 48.5453825 1.40272254 41.12182367 1.44870156 C37.1892239 1.47269179 33.25675658 1.49138239 29.32408524 1.49761391 C25.62550831 1.50363876 21.92727054 1.52354315 18.22881889 1.55427551 C16.21821404 1.56731688 14.2075301 1.56547871 12.19688416 1.5632782 C11.00773911 1.57581635 9.81859406 1.58835449 8.59341431 1.60127258 C7.55547541 1.60588155 6.51753651 1.61049051 5.44814491 1.61523914 C4.64025709 1.74221023 3.83236927 1.86918131 3 2 C2.01 3.485 2.01 3.485 1 5 C0.67 3.35 0.34 1.7 0 0 Z ", fill: "#DDDDDD", transform: "translate(158,212)" }), jsx("path", { d: "M0 0 C0.66 0.66 1.32 1.32 2 2 C-0.97 5.3 -3.94 8.6 -7 12 C-7.66 11.01 -8.32 10.02 -9 9 C-8.01 8.34 -7.02 7.68 -6 7 C-4.78715124 3.94570927 -4.78715124 3.94570927 -4 1 C-3.01 1 -2.02 1 -1 1 C-0.67 0.67 -0.34 0.34 0 0 Z ", fill: "#090909", transform: "translate(126,124)" }), jsx("path", { d: "M0 0 C-0.99 1.485 -0.99 1.485 -2 3 C-3.9453125 3.29296875 -3.9453125 3.29296875 -6.125 3.1875 C-7.40375 3.125625 -8.6825 3.06375 -10 3 C-10 2.01 -10 1.02 -10 0 C-2.25 -1.125 -2.25 -1.125 0 0 Z ", fill: "#121212", transform: "translate(182,75)" }), jsx("path", { d: "M0 0 C0.66 0.33 1.32 0.66 2 1 C0.515 2.485 0.515 2.485 -1 4 C-0.67 4.66 -0.34 5.32 0 6 C-2.31 5.67 -4.62 5.34 -7 5 C-2.25 1.125 -2.25 1.125 0 0 Z ", fill: "#181818", transform: "translate(171,136)" }), jsx("path", { d: "M0 0 C4 4.5 4 4.5 4 9 C3.34 8.67 2.68 8.34 2 8 C2 6.68 2 5.36 2 4 C0.68 3.34 -0.64 2.68 -2 2 C-1.34 2 -0.68 2 0 2 C0 1.34 0 0.68 0 0 Z ", fill: "#E6E6E6", transform: "translate(90,265)" }), jsx("path", { d: "M0 0 C-1.39332574 3.36720387 -2.9789286 4.9859524 -6 7 C-6.33 6.01 -6.66 5.02 -7 4 C-2.25 0 -2.25 0 0 0 Z ", fill: "#1A1A1A", transform: "translate(124,129)" })] }));
-const Blast = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 128 128", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("path", { d: "M0 0 C42.24 0 84.48 0 128 0 C128 42.24 128 84.48 128 128 C85.76 128 43.52 128 0 128 C0 85.76 0 43.52 0 0 Z ", fill: "#FBFB02", transform: "translate(0,0)" }), jsx("path", { d: "M0 0 C1.29626816 -0.00432541 2.59253632 -0.00865082 3.92808533 -0.0131073 C6.65588944 -0.01887515 9.38206966 -0.00018386 12.10961914 0.03686523 C15.58233542 0.08239403 19.05191484 0.06972176 22.5246973 0.03905773 C25.87091674 0.01684949 29.21626874 0.04154386 32.5625 0.0625 C34.41440697 0.0489875 34.41440697 0.0489875 36.3037262 0.03520203 C44.24833063 0.18576309 49.15483387 1.67114298 55.21484375 6.89453125 C54.95700697 8.90565812 54.59904373 10.90367679 54.21484375 12.89453125 C54.10011719 13.61769531 53.98539062 14.34085938 53.8671875 15.0859375 C52.92855388 19.19506689 52.06398095 21.28119581 48.5703125 23.8046875 C45.82568204 25.29503241 43.08020729 26.65400884 40.21484375 27.89453125 C40.21484375 28.55453125 40.21484375 29.21453125 40.21484375 29.89453125 C42.17632249 31.28391202 44.17650951 32.62057235 46.21484375 33.89453125 C45.70230165 40.94198511 44.80867926 47.70762156 39.26782227 52.62109375 C28.09200342 59.30025375 15.01841579 57.53817431 2.46484375 57.26953125 C0.01435568 57.23939433 -2.43616809 57.21202513 -4.88671875 57.1875 C-10.85365094 57.12180305 -16.81923525 57.02175013 -22.78515625 56.89453125 C-15.80058377 33.54211776 -15.80058377 33.54211776 -13.03515625 24.70703125 C-12.74511719 23.75634766 -12.45507812 22.80566406 -12.15625 21.82617188 C-11.87394531 20.92705078 -11.59164062 20.02792969 -11.30078125 19.1015625 C-11.05618164 18.31241455 -10.81158203 17.5232666 -10.55957031 16.71020508 C-9.78515625 14.89453125 -9.78515625 14.89453125 -7.78515625 13.89453125 C-5.14515625 15.87453125 -2.50515625 17.85453125 0.21484375 19.89453125 C-1.81250285 28.89397227 -4.65412522 37.12764436 -7.78515625 45.89453125 C5.41484375 45.89453125 18.61484375 45.89453125 32.21484375 45.89453125 C33.69984375 40.44953125 33.69984375 40.44953125 35.21484375 34.89453125 C35.54484375 33.90453125 35.87484375 32.91453125 36.21484375 31.89453125 C26.97484375 31.89453125 17.73484375 31.89453125 8.21484375 31.89453125 C8.87484375 29.25453125 9.53484375 26.61453125 10.21484375 23.89453125 C19.78484375 23.89453125 29.35484375 23.89453125 39.21484375 23.89453125 C40.20484375 20.26453125 41.19484375 16.63453125 42.21484375 12.89453125 C19.11484375 12.56453125 -3.98515625 12.23453125 -27.78515625 11.89453125 C-18.85278804 2.96216304 -12.73867052 -0.17886377 0 0 Z ", fill: "#000000", transform: "translate(49.78515625,36.10546875)" })] }));
+// const Blast = ({ testnet, ...props }: { testnet?: boolean }) => (
+//   <svg
+//     {...props}
+//     aria-hidden="true"
+//     width="44"
+//     height="44"
+//     viewBox="0 0 128 128"
+//     fill="none"
+//     xmlns="http://www.w3.org/2000/svg"
+//   >
+//     <path
+//       d="M0 0 C42.24 0 84.48 0 128 0 C128 42.24 128 84.48 128 128 C85.76 128 43.52 128 0 128 C0 85.76 0 43.52 0 0 Z "
+//       fill="#FBFB02"
+//       transform="translate(0,0)"
+//     />
+//     <path
+//       d="M0 0 C1.29626816 -0.00432541 2.59253632 -0.00865082 3.92808533 -0.0131073 C6.65588944 -0.01887515 9.38206966 -0.00018386 12.10961914 0.03686523 C15.58233542 0.08239403 19.05191484 0.06972176 22.5246973 0.03905773 C25.87091674 0.01684949 29.21626874 0.04154386 32.5625 0.0625 C34.41440697 0.0489875 34.41440697 0.0489875 36.3037262 0.03520203 C44.24833063 0.18576309 49.15483387 1.67114298 55.21484375 6.89453125 C54.95700697 8.90565812 54.59904373 10.90367679 54.21484375 12.89453125 C54.10011719 13.61769531 53.98539062 14.34085938 53.8671875 15.0859375 C52.92855388 19.19506689 52.06398095 21.28119581 48.5703125 23.8046875 C45.82568204 25.29503241 43.08020729 26.65400884 40.21484375 27.89453125 C40.21484375 28.55453125 40.21484375 29.21453125 40.21484375 29.89453125 C42.17632249 31.28391202 44.17650951 32.62057235 46.21484375 33.89453125 C45.70230165 40.94198511 44.80867926 47.70762156 39.26782227 52.62109375 C28.09200342 59.30025375 15.01841579 57.53817431 2.46484375 57.26953125 C0.01435568 57.23939433 -2.43616809 57.21202513 -4.88671875 57.1875 C-10.85365094 57.12180305 -16.81923525 57.02175013 -22.78515625 56.89453125 C-15.80058377 33.54211776 -15.80058377 33.54211776 -13.03515625 24.70703125 C-12.74511719 23.75634766 -12.45507812 22.80566406 -12.15625 21.82617188 C-11.87394531 20.92705078 -11.59164062 20.02792969 -11.30078125 19.1015625 C-11.05618164 18.31241455 -10.81158203 17.5232666 -10.55957031 16.71020508 C-9.78515625 14.89453125 -9.78515625 14.89453125 -7.78515625 13.89453125 C-5.14515625 15.87453125 -2.50515625 17.85453125 0.21484375 19.89453125 C-1.81250285 28.89397227 -4.65412522 37.12764436 -7.78515625 45.89453125 C5.41484375 45.89453125 18.61484375 45.89453125 32.21484375 45.89453125 C33.69984375 40.44953125 33.69984375 40.44953125 35.21484375 34.89453125 C35.54484375 33.90453125 35.87484375 32.91453125 36.21484375 31.89453125 C26.97484375 31.89453125 17.73484375 31.89453125 8.21484375 31.89453125 C8.87484375 29.25453125 9.53484375 26.61453125 10.21484375 23.89453125 C19.78484375 23.89453125 29.35484375 23.89453125 39.21484375 23.89453125 C40.20484375 20.26453125 41.19484375 16.63453125 42.21484375 12.89453125 C19.11484375 12.56453125 -3.98515625 12.23453125 -27.78515625 11.89453125 C-18.85278804 2.96216304 -12.73867052 -0.17886377 0 0 Z "
+//       fill="#000000"
+//       transform="translate(49.78515625,36.10546875)"
+//     />
+//   </svg>
+// );
 const Mantle = ({ testnet, ...props }) => (jsxs("svg", { ...props, "aria-hidden": "true", width: "44", height: "44", viewBox: "0 0 311 311", xmlns: "http://www.w3.org/2000/svg", children: [jsx("style", { children: ".st0{fill:#fff}" }), jsx("path", { d: "M0 0h314v311H0z" }), jsx("path", { d: "M155.5 289.1v-45.7c-4.6 0-9.3-.4-13.9-1.1l-7.2 45.1c7 1.2 14.1 1.7 21.1 1.7zm21-1.6c7-1.1 13.9-2.7 20.6-4.9L183 239.1c-4.4 1.4-9 2.5-13.6 3.2l7.1 45.2zm-62.6-4.9 14.1-43.4c-4.4-1.4-8.7-3.2-12.9-5.3l-20.8 40.7c6.3 3.1 12.9 5.8 19.6 8zm102.7-8c6.3-3.2 12.3-6.9 18-11l-27-36.9c-3.7 2.7-7.7 5.2-11.9 7.2l20.9 40.7zM76.3 263.5l27-36.9c-3.7-2.7-7.3-5.7-10.6-9l-32.4 32.3c5 4.9 10.4 9.5 16 13.6zm174.2-13.4.3-.3c5-4.9 9.6-10.3 13.7-15.9l-37-26.9c-2.7 3.7-5.8 7.3-9 10.5l-.5.5 15.6 14.7 16.9 17.4zM46.6 233.8l37-26.9c-2.7-3.7-5.2-7.7-7.3-11.8l-40.8 20.7c3.2 6.3 6.9 12.3 11.1 18zm228.9-17.9c3.2-6.2 5.9-12.8 8.1-19.5l-43.6-14c-1.4 4.4-3.2 8.7-5.3 12.8l40.8 20.7zM27.4 196.4 71 182.3c-1.4-4.4-2.5-8.9-3.2-13.5l-45.3 7.1c1.1 6.9 2.8 13.8 4.9 20.5zM288.5 176c1.1-6.9 1.7-14 1.7-21h-45.8c0 4.6-.4 9.3-1.1 13.9l45.2 7.1zM66.7 154.9c0-4.6.4-9.3 1.1-13.9l-45.3-7.1c-1.1 6.9-1.6 14-1.7 21h45.9zm176.6-13.8 45.3-7.1c-1.1-6.9-2.7-13.8-4.9-20.5l-43.6 14c1.4 4.5 2.5 9 3.2 13.6zM71 127.5c1.4-4.4 3.2-8.7 5.3-12.8L35.5 94c-3.2 6.2-5.9 12.8-8.1 19.5l43.6 14zm163.8-12.7 40.9-20.7c-3.2-6.3-6.9-12.3-11.1-18L227.5 103c2.7 3.7 5.2 7.7 7.3 11.8zM83.6 102.9c2.7-3.7 5.8-7.3 9.1-10.6l.1-.1-32.4-32.3-.1.1c-5 5-9.6 10.3-13.7 16l37 26.9zm134.9-10.4 9.8-9.9 22.5-22.4-.1-.1c-5-4.9-10.3-9.5-15.9-13.6l-27 36.9c3.7 2.7 7.3 5.7 10.5 9l.2.1zm-115.1-9.3c3.7-2.7 7.7-5.1 11.9-7.2L94.5 35.3c-6.3 3.2-12.3 6.9-18 11l26.9 36.9zm92.6-7.1 20.9-40.7c-6.3-3.2-12.8-5.9-19.5-8.1l-14.2 43.4c4.3 1.5 8.6 3.3 12.8 5.4zm-67.8-5.4c4.4-1.4 9-2.5 13.6-3.2l-7.1-45.1c-6.9 1.1-13.9 2.7-20.6 4.9l14.1 43.4zm41.3-3.2 7.2-45.1c-6.9-1.1-14-1.7-21-1.7v45.7c4.6 0 9.3.4 13.8 1.1z", className: "st0" }), jsx("path", { d: "M155.5 245.5v-45.9c-3.9 0-7.7-.5-11.5-1.5l-12 44.3c7.7 2 15.6 3.1 23.5 3.1zm23.5-3.1c7.7-2 15-5 21.9-9l-23.2-39.7c-3.3 1.9-6.9 3.4-10.6 4.4l11.9 44.3zm-68.8-9 23.2-39.7c-3.3-1.9-6.4-4.3-9.2-7l-.4-.4-14.6 15.3-18 17.3.3.3c5.6 5.5 11.9 10.3 18.7 14.2zm109.4-14.2c5.6-5.6 10.5-11.8 14.4-18.6l-40.1-23c-1.9 3.3-4.3 6.3-7.1 9.1l32.8 32.5zM77 200.5l40.1-22.9c-1.9-3.3-3.4-6.8-4.4-10.5L68 178.9c2 7.5 5.1 14.8 9 21.6zM243.1 179c2-7.6 3.1-15.4 3.1-23.2h-46.3c0 3.8-.5 7.7-1.5 11.4l44.7 11.8zm-131.8-23.3c0-3.8.5-7.7 1.5-11.4L68 132.5c-2 7.6-3.1 15.4-3.1 23.2h46.4zm87-11.3 44.8-11.8c-2-7.6-5.1-14.9-9-21.7L194 133.8c1.8 3.4 3.3 6.9 4.3 10.6zm-81.1-10.6c1.9-3.2 4.2-6.3 7-9l.1-.1-16.6-16.4L91.8 92l-.3.3c-5.6 5.5-10.4 11.8-14.4 18.5l40.1 23zm-9.5-25.5.2.2-.2-.2zm79.1 16.5 16.4-16.3L220 92.7l-.4-.4C214 86.7 207.7 82 200.9 78l-23.2 39.7c3.3 1.9 6.3 4.2 9.1 6.9v.2zm-53.4-7.1c3.3-1.9 6.9-3.4 10.6-4.4L132.2 69c-7.7 2-15 5-21.9 9l23.1 39.7zm33.6-4.3 12-44.3c-7.6-2-15.5-3.1-23.4-3.1v45.9c3.8 0 7.7.5 11.4 1.5z", className: "st0" })] }));
 const chainToLogo = {
     [arbitrum$1.chainId]: jsx(Arbitrum, {}),
     [base$2.chainId]: jsx(Base, {}),
-    [blast$1.chainId]: jsx(Blast, {}),
+    // [blast.chainId]: <Blast />,
     [bsc$1.chainId]: jsx(BinanceSmartChain, {}),
     [ethereum.chainId]: jsx(Ethereum, {}),
     [linea$1.chainId]: jsx(Linea, {}),
@@ -7676,7 +7690,7 @@ const QRPlaceholder = styled(motion.div) `
     content: "";
     position: absolute;
     inset: 0;
-    transform: scale(1.5) rotate(45deg);
+    transform: scale(1.7) rotate(45deg);
     background-image: linear-gradient(
       90deg,
       rgba(255, 255, 255, 0) 50%,
@@ -7719,16 +7733,6 @@ const LogoIcon = styled(motion.div) `
     : css `
           width: 28%;
           height: 28%;
-          border-radius: 17px;
-          &:before {
-            pointer-events: none;
-            z-index: 2;
-            content: "";
-            position: absolute;
-            inset: 0;
-            border-radius: inherit;
-            box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.02);
-          }
         `}
 `;
 
@@ -8013,6 +8017,7 @@ const WalletItem = styled.button `
   text-align: center;
   transition: opacity 100ms ease;
   opacity: ${(props) => (props.$waiting ? 0.4 : 1)};
+  background: transparent;
 `;
 const WalletIcon = styled.div `
   z-index: 9;
@@ -10250,9 +10255,10 @@ const SelectDepositAddressAmount = () => {
     const { paymentState, setRoute, triggerResize } = usePayContext();
     const { selectedDepositAddressOption } = paymentState;
     const maxUsdLimit = paymentState.getOrderUsdLimit();
-    // const minimumMessage = `Minimum ${formatUsd(MIN_USD_VALUE, "up")}`;
+    const minUsd = selectedDepositAddressOption?.minimumUsd ?? 0;
+    const minimumMessage = `Minimum ${formatUsd(minUsd, "up")}`;
     const [usdInput, setUsdInput] = useState("");
-    const [message, setMessage] = useState("");
+    const [message, setMessage] = useState(minimumMessage);
     const [continueDisabled, setContinueDisabled] = useState(true);
     useEffect(() => {
         triggerResize();
@@ -10269,7 +10275,7 @@ const SelectDepositAddressAmount = () => {
             setMessage(`Maximum ${formatUsd(maxUsdLimit)}`);
         }
         else {
-            setMessage("");
+            setMessage(minimumMessage);
         }
         const usd = Number(sanitizeNumber(value));
         setContinueDisabled(usd <= 0 || usd > maxUsdLimit);
@@ -10592,6 +10598,8 @@ function SelectAnotherMethodButton() {
 
 const SelectDepositAddressChain = () => {
     const { setRoute, paymentState } = usePayContext();
+    const pay = useDaimoPay();
+    const { order } = pay;
     const { isDepositFlow, setSelectedDepositAddressOption, depositAddressOptions, } = paymentState;
     return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: true }), !depositAddressOptions.loading &&
                 depositAddressOptions.options?.length === 0 && (jsxs(ModalContent, { style: {
@@ -10605,6 +10613,9 @@ const SelectDepositAddressChain = () => {
                         id: option.id,
                         title: option.id,
                         icons: [option.logoURI],
+                        disabled: option.minimumUsd > 0 &&
+                            order?.mode === DaimoPayOrderMode.HYDRATED &&
+                            order.usdValue < option.minimumUsd,
                         onClick: () => {
                             setSelectedDepositAddressOption(option);
                             const meta = { event: "click-option", option: option.id };
@@ -10812,6 +10823,8 @@ function SelectMethod() {
             },
         });
     }
+    // Order disabled to bottom
+    options.sort((a, b) => (a.disabled ? 1 : 0) - (b.disabled ? 1 : 0));
     return (jsxs(PageContent, { children: [jsx(OrderHeader, {}), jsx(OptionsList, { requiredSkeletons: isMobile ? 4 : 3, isLoading: externalPaymentOptions.loading, options: externalPaymentOptions.loading ? [] : options }), jsx(PoweredByFooter, {})] }));
 }
 // Get 3 icons, skipping the one that is already connected
@@ -10869,21 +10882,53 @@ function getDepositAddressOption(setRoute) {
     };
 }
 
-const TokenChainLogo = ({ token }) => {
-    return (jsxs(TokenChainContainer, { children: [jsx("img", { src: token.logoURI, alt: token.symbol, style: { borderRadius: 9999 } }), jsx(ChainContainer$1, { children: chainToLogo[token.chainId] })] }));
+const TokenChainLogo = ({ token, size = 32, offset = 0, }) => {
+    const chainLogoSize = Math.round((size * 30) / 64);
+    return (jsxs(TokenChainContainer, { "$size": size, children: [jsx(TokenImage, { src: token.logoURI, alt: token.symbol, "$size": size }), jsx(ChainContainer$1, { "$size": chainLogoSize, "$offset": offset, children: chainToLogo[token.chainId] })] }));
 };
 const TokenChainContainer = styled(motion.div) `
-  width: 100%;
-  height: 100%;
+  position: relative;
+  width: ${(props) => props.$size}px;
+  height: ${(props) => props.$size}px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+const TokenImage = styled.img `
+  width: ${(props) => props.$size}px;
+  height: ${(props) => props.$size}px;
+  border-radius: 50%;
+  object-fit: cover;
+  transition: transform 0.2s ease;
+
+  ${(props) => props.$showBorder &&
+    `
+    border: 2px solid var(--ck-body-background, #fff);
+  `}
 `;
 const ChainContainer$1 = styled(motion.div) `
   position: absolute;
-  width: 16px;
-  height: 16px;
-  border-radius: 9999px;
-  overflow: hidden;
+  width: ${(props) => props.$size}px;
+  height: ${(props) => props.$size}px;
+  min-width: ${(props) => props.$size}px;
+  min-height: ${(props) => props.$size}px;
   bottom: 0px;
-  right: 0px;
+  right: ${(props) => props.$offset}px;
+  border-radius: 50%;
+  aspect-ratio: 1 / 1;
+  overflow: hidden;
+  background: ${(props) => props.$showBorder ? "var(--ck-body-background, #fff)" : "transparent"};
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+
+  svg {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    flex-shrink: 0;
+  }
 `;
 
 /// and Solana tokens. See OptionsList.
@@ -11281,7 +11326,8 @@ const CircleTimer = ({ total, size = 24, stroke = 3, currentTime, onTimeChange,
         return () => clearInterval(id);
     }, [target, onTimeChange]);
     const ratio = Math.round((left * 100) / total); // 0-100
-    const radius = Math.round((size - stroke) / 2); // integer radius
+    // Ensure stroke stays within viewBox: use floor to be conservative
+    const radius = Math.floor((size - stroke) / 2);
     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
@@ -11304,47 +11350,132 @@ function WaitingDepositAddress() {
     const context = usePayContext();
     const { triggerResize, paymentState } = context;
     const { payWithDepositAddress, selectedDepositAddressOption } = paymentState;
-    const [details, setDetails] = useState();
+    const { order } = useDaimoPay();
+    const [depAddr, setDepAddr] = useState();
     const [failed, setFailed] = useState(false);
+    // If we selected a deposit address option, generate the address...
     const generateDepositAddress = () => {
-        if (!selectedDepositAddressOption)
-            return;
-        payWithDepositAddress(selectedDepositAddressOption.id).then((details) => {
-            if (!details)
-                setFailed(true);
-            else
-                setDetails(details);
-        });
+        if (selectedDepositAddressOption == null) {
+            if (order == null || !isHydrated(order))
+                return;
+            if (order.sourceTokenAmount == null)
+                return;
+            // Pay underpaid order
+            const taPaid = order.sourceTokenAmount;
+            const usdPaid = taPaid.usd; // TODO: get usdPaid directly from the order
+            const usdToPay = Math.max(order.usdValue - usdPaid, 0.01);
+            const dispDecimals = taPaid.token.displayDecimals;
+            const unitsToPay = (usdToPay / taPaid.token.usd).toFixed(dispDecimals);
+            const unitsPaid = (Number(taPaid.amount) /
+                10 ** taPaid.token.decimals).toFixed(dispDecimals);
+            // Hack to always show a <= 60 minute countdown
+            let expirationS = (order.createdAt ?? 0) + 59.5 * 60;
+            if (order.expirationTs != null &&
+                Number(order.expirationTs) < expirationS) {
+                expirationS = Number(order.expirationTs);
+            }
+            setDepAddr({
+                address: order.intentAddr,
+                amount: unitsToPay,
+                underpayment: { unitsPaid, coin: taPaid.token.symbol },
+                coins: `${taPaid.token.symbol} on ${getChainName(taPaid.token.chainId)}`,
+                expirationS: expirationS,
+                uri: order.intentAddr,
+                displayToken: taPaid.token,
+                logoURI: "", // Not needed for underpaid orders
+            });
+        }
+        else {
+            payWithDepositAddress(selectedDepositAddressOption.id).then((details) => {
+                if (details) {
+                    setDepAddr({
+                        address: details.address,
+                        amount: details.amount,
+                        coins: details.suffix,
+                        expirationS: details.expirationS,
+                        uri: details.uri,
+                        displayToken: getDisplayToken(selectedDepositAddressOption),
+                        logoURI: selectedDepositAddressOption.logoURI,
+                    });
+                }
+                else {
+                    setFailed(true);
+                }
+            });
+        }
     };
-    // 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 })) }));
+    useEffect(triggerResize, [depAddr, failed]);
+    return (jsx(PageContent, { children: failed ? (selectedDepositAddressOption && (jsx(DepositFailed, { name: selectedDepositAddressOption.id }))) : (jsx(DepositAddressInfo, { depAddr: depAddr, refresh: generateDepositAddress, triggerResize: triggerResize })) }));
 }
-function DepositAddressInfo({ meta, details, refresh, }) {
+function DepositAddressInfo({ depAddr, refresh, triggerResize, }) {
     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 [remainingS, totalS] = useCountdown(depAddr?.expirationS);
+    const isExpired = depAddr?.expirationS != null && remainingS === 0;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useEffect(triggerResize, [isExpired]);
+    const logoOffset = isMobile ? 4 : 0;
+    const logoElement = depAddr?.displayToken ? (jsx(TokenChainLogo, { token: depAddr.displayToken, size: 64, offset: logoOffset })) : (jsx("img", { src: depAddr?.logoURI, width: "64px", height: "64px" }));
+    return (jsxs(ModalContent, { children: [isExpired ? (jsx(LogoRow, { children: jsx(Button, { onClick: refresh, style: { width: 128 }, children: "Refresh" }) })) : isMobile ? (jsx(LogoRow, { children: jsx(LogoWrap, { children: logoElement }) })) : (jsx(QRWrap, { children: jsx(CustomQRCode, { value: depAddr?.uri, contentPadding: 24, size: 200, image: logoElement }) })), jsx(CopyableInfo, { depAddr: depAddr, remainingS: remainingS, totalS: totalS })] }));
+}
+function getDisplayToken(meta) {
+    switch (meta.id) {
+        case DepositAddressPaymentOptions.OP_MAINNET:
+            return optimismUSDC;
+        case DepositAddressPaymentOptions.ARBITRUM:
+            return arbitrumUSDC;
+        case DepositAddressPaymentOptions.BASE:
+            return baseUSDC;
+        case DepositAddressPaymentOptions.POLYGON:
+            return polygonUSDC;
+        case DepositAddressPaymentOptions.ETH_L1:
+            return ethereumUSDC;
+        default:
+            return null;
+    }
 }
 const LogoWrap = styled.div `
+  position: relative;
+  width: 64px;
+  height: 64px;
+`;
+const LogoRow = styled.div `
   padding: 32px 0;
   height: 128px;
   display: flex;
   align-items: center;
+  gap: 8px;
   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 }) })] }));
+function CopyableInfo({ depAddr, remainingS, totalS, }) {
+    const underpayment = depAddr?.underpayment;
+    const isExpired = depAddr?.expirationS != null && remainingS === 0;
+    return (jsxs(CopyableInfoWrapper, { children: [underpayment && jsx(UnderpaymentInfo, { underpayment: underpayment }), jsx(CopyRowOrThrobber, { title: "Send Exactly", value: depAddr?.amount, smallText: depAddr?.coins, disabled: isExpired }), jsx(CopyRowOrThrobber, { title: "Receiving Address", value: depAddr?.address, valueText: depAddr?.address && getAddressContraction(depAddr.address), disabled: isExpired }), jsx(CountdownWrap, { children: jsx(CountdownTimer, { remainingS: remainingS, totalS: totalS }) })] }));
 }
+function UnderpaymentInfo({ underpayment }) {
+    return (jsxs(UnderpaymentWrapper, { children: [jsxs(UnderpaymentHeader, { children: [jsx(WarningIcon, {}), jsxs("span", { children: ["Received ", underpayment.unitsPaid, " ", underpayment.coin] })] }), jsx(SmallText, { children: "Finish by sending the extra amount below." })] }));
+}
+const UnderpaymentWrapper = styled.div `
+  background: var(--ck-body-background-tertiary);
+  border-radius: 8px;
+  padding: 16px;
+  margin: 0 4px 16px 4px;
+  margin-bottom: 16px;
+`;
+const UnderpaymentHeader = styled.div `
+  font-weight: 500;
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  gap: 8px;
+  margin-bottom: 8px;
+`;
 const CopyableInfoWrapper = styled.div `
   display: flex;
   flex-direction: column;
@@ -11370,10 +11501,9 @@ function useCountdown(expirationS) {
     return [remainingS, totalS];
 }
 function CountdownTimer({ remainingS, totalS, }) {
-    if (totalS == 0)
-        return null;
-    if (remainingS > 3600)
-        return null;
+    if (totalS == 0 || remainingS > 3600) {
+        return jsx(SmallText, { children: "Send only once" });
+    }
     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) })] }) }));
 }
@@ -11389,8 +11519,8 @@ const formatTime = (sec) => {
     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, {})] }));
+function DepositFailed({ name }) {
+    return (jsxs(ModalContent, { style: { marginLeft: 24, marginRight: 24 }, children: [jsxs(ModalH1, { children: [name, " unavailable"] }), jsxs(ModalBody, { children: ["We're unable to process ", name, " payments at this time. Please select another payment method."] }), jsx(SelectAnotherMethodButton, {})] }));
 }
 const CopyRow = styled.button `
   display: block;
@@ -11399,6 +11529,7 @@ const CopyRow = styled.button `
   padding: 8px 16px;
 
   cursor: pointer;
+  background-color: var(--ck-body-background);
 
   display: flex;
   align-items: center;
@@ -11437,7 +11568,16 @@ const ValueContainer = styled.div `
 `;
 const SmallText = styled.span `
   font-size: 14px;
-  color: var(--ck-body-color-muted);
+  color: var(--ck-primary-button-color);
+`;
+const ValueText = styled.span `
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--ck-primary-button-color);
+`;
+const LabelText = styled(ModalBody) `
+  margin: 0;
+  text-align: left;
 `;
 const pulse = keyframes `
   0% {
@@ -11472,10 +11612,10 @@ function CopyRowOrThrobber({ title, value, valueText, smallText, disabled, }) {
         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, {}) })] }));
+        return (jsxs(CopyRow, { children: [jsx(LabelRow, { children: jsx(LabelText, { 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 }) })] }));
+    return (jsxs(CopyRow, { as: "button", onClick: handleCopy, disabled: disabled, children: [jsxs("div", { children: [jsx(LabelRow, { children: jsx(LabelText, { children: title }) }), jsx(MainRow, { children: jsxs(ValueContainer, { children: [jsx(ValueText, { 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);
@@ -11893,7 +12033,8 @@ function useDepositAddressOptions({ trpc, usdRequired, mode, }) {
 const DEFAULT_EXTERNAL_PAYMENT_OPTIONS = Object.values(ExternalPaymentOptions).filter((opt) => 
 // Solana and ExternalChains are handled in the SelectMethod component.
 opt !== ExternalPaymentOptions.Solana &&
-    opt !== ExternalPaymentOptions.ExternalChains);
+    opt !== ExternalPaymentOptions.ExternalChains &&
+    opt !== ExternalPaymentOptions.Daimo);
 function useExternalPaymentOptions({ trpc, filterIds, platform, usdRequired, mode, }) {
     const [options, setOptions] = useState(new Map());
     const [loading, setLoading] = useState(false);
@@ -12657,13 +12798,22 @@ const DaimoPayUIProvider = ({ children, theme = "auto", mode = "auto", customThe
         }
     };
     // Watch when the order gets paid and navigate to confirmation
+    // ...if underpaid, go to the deposit addr screen, let the user finish paying.
+    const isUnderpaid = pay.order?.mode === DaimoPayOrderMode.HYDRATED &&
+        pay.order.sourceStatus === DaimoPayOrderStatusSource.WAITING_PAYMENT &&
+        pay.order.sourceTokenAmount != null;
     useEffect(() => {
         if (pay.paymentState === "payment_started" ||
             pay.paymentState === "payment_completed" ||
             pay.paymentState === "payment_bounced") {
             setRoute(ROUTES.CONFIRMATION, { event: "payment-started" });
         }
-    }, [pay.paymentState, setRoute]);
+        else if (isUnderpaid) {
+            paymentState.setSelectedDepositAddressOption(undefined);
+            setRoute(ROUTES.WAITING_DEPOSIT_ADDRESS);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [pay.paymentState, setRoute, isUnderpaid]);
     const value = {
         theme: ckTheme,
         setTheme,