@daimo/pay 1.8.5 → 1.8.6

package/build/index.d.ts

@@ -6,9 +6,9 @@ import { CoinbaseWalletParameters } from 'wagmi/connectors';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { DaimoPayOrderView, PaymentStartedEvent, PaymentCompletedEvent, PaymentBouncedEvent, ExternalPaymentOptionsString, DaimoPayUserMetadata, DaimoPayOrderWithOrg, DaimoPayHydratedOrderWithOrg, DaimoPayOrder, DaimoPayOrderID, SolanaPublicKey, DaimoPayIntentStatus, DaimoPayOrderMode, DepositAddressPaymentOptionMetadata, PlatformType, ExternalPaymentOptionMetadata, WalletPaymentOption, ExternalPaymentOptions, DepositAddressPaymentOptions, DepositAddressPaymentOptionData } from '@daimo/pay-common';
 import { Address, Hex } from 'viem';
-import { WalletName } from '@solana/wallet-adapter-base';
 import { AppRouter } from '@daimo/pay-api';
 import { CreateTRPCClient } from '@trpc/client';
+import { WalletName } from '@solana/wallet-adapter-base';
 
 type Hash = `0x${string}`;
 type CustomAvatarProps = {
@@ -420,6 +420,11 @@ declare function useDaimoPayStatus(): {
     status: DaimoPayIntentStatus;
 } | undefined;
 
+type UseDaimoPayUI = {
+    resetPayment: (payParams?: Partial<PayParams>) => Promise<void>;
+};
+declare function useDaimoPayUI(): UseDaimoPayUI;
+
 /** Icon for an EVM chain, given chain ID. No ID shows a loading spinner. */
 declare const Chain: React$1.FC<{
     id?: number;
@@ -435,8 +440,6 @@ declare const wallets: {
 
 declare const daimoPayVersion: string;
 
-type SolanaWalletName = WalletName<string>;
-
 declare enum ROUTES {
     SELECT_METHOD = "daimoPaySelectMethod",
     SELECT_TOKEN = "daimoPaySelectToken",
@@ -464,6 +467,8 @@ declare enum ROUTES {
     SWITCHNETWORKS = "switchNetworks"
 }
 
+type TrpcClient = CreateTRPCClient<AppRouter>;
+
 type WalletConfigProps = {
     name?: string;
     shortName?: string;
@@ -492,8 +497,6 @@ type WalletConfigProps = {
     isSolanaOnly?: boolean;
 };
 
-type TrpcClient = CreateTRPCClient<AppRouter>;
-
 declare function useDepositAddressOptions({ trpc, usdRequired, mode, }: {
     trpc: TrpcClient;
     usdRequired: number | undefined;
@@ -547,11 +550,11 @@ declare function useWalletPaymentOptions({ trpc, address, usdRequired, destChain
 /** Creates (or loads) a payment and manages the corresponding modal. */
 interface PaymentState {
     generatePreviewOrder: () => void;
-    resetOrder: () => void;
+    resetOrder: (payParams?: Partial<PayParams>) => Promise<void>;
     buttonProps: PayButtonPaymentProps | undefined;
     setButtonProps: (props: PayButtonPaymentProps | undefined) => void;
     setPayId: (id: string | undefined) => void;
-    setPayParams: (payParams: PayParams | undefined) => void;
+    setPayParams: (payParams: PayParams | undefined) => Promise<void>;
     isDepositFlow: boolean;
     paymentWaitingMessage: string | undefined;
     externalPaymentOptions: ReturnType<typeof useExternalPaymentOptions>;
@@ -584,8 +587,8 @@ interface PaymentState {
     senderEnsName: string | undefined;
 }
 
-/** Daimo Pay internal context. */
-declare const usePayContext: () => PayContextValue;
+type SolanaWalletName = WalletName<string>;
+
 /** Meant for internal use. This will be non-exported in a future SDK version. */
 declare const PayContext: React$1.Context<PayContextValue | null>;
 type PayLogFn = (message: string, ...props: any[]) => void;
@@ -597,8 +600,8 @@ type PayContextValue = {
     setMode: React$1.Dispatch<React$1.SetStateAction<Mode>>;
     customTheme: CustomTheme | undefined;
     setCustomTheme: React$1.Dispatch<React$1.SetStateAction<CustomTheme | undefined>>;
-    lang: Languages$1;
-    setLang: React$1.Dispatch<React$1.SetStateAction<Languages$1>>;
+    lang: Languages;
+    setLang: React$1.Dispatch<React$1.SetStateAction<Languages>>;
     setOnOpen: (fn?: () => void) => void;
     setOnClose: (fn?: () => void) => void;
     open: boolean;
@@ -639,5 +642,8 @@ type PayContextValue = {
     setRedirectReturnUrl: React$1.Dispatch<React$1.SetStateAction<string | undefined>>;
 } & useConnectCallbackProps;
 
-export { Avatar, Chain as ChainIcon, DaimoPayButton, PayContext as DaimoPayContext, DaimoPayProvider, types as Types, daimoPayVersion, defaultConfig as getDefaultConfig, useDaimoPay, useDaimoPayStatus, usePayContext, wallets };
+/** Daimo Pay internal context. */
+declare const usePayContext: () => PayContextValue;
+
+export { Avatar, Chain as ChainIcon, DaimoPayButton, PayContext as DaimoPayContext, DaimoPayProvider, types as Types, daimoPayVersion, defaultConfig as getDefaultConfig, useDaimoPay, useDaimoPayStatus, useDaimoPayUI, usePayContext, wallets };
 export type { All, CustomAvatarProps, CustomTheme, DaimoPayButtonCustomProps, DaimoPayButtonProps, DaimoPayContextOptions, DaimoPayModalOptions, DaimoPayment, Languages, Mode, Theme };

package/build/index.js

@@ -22,7 +22,7 @@ import { VersionedTransaction } from '@solana/web3.js';
 import { normalize } from 'viem/ens';
 
 var name = "@daimo/pay";
-var version = "1.8.5";
+var version = "1.8.6";
 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.5",
+	"@daimo/pay-common": "1.8.6",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -247,6 +247,9 @@ var ROUTES;
     ROUTES["SWITCHNETWORKS"] = "switchNetworks";
 })(ROUTES || (ROUTES = {}));
 
+/** Meant for internal use. This will be non-exported in a future SDK version. */
+const PayContext = createContext(null);
+
 /** Daimo Pay internal context. */
 const usePayContext = () => {
     const context = React.useContext(PayContext);
@@ -254,8 +257,6 @@ const usePayContext = () => {
         throw Error("DaimoPay Hook must be inside a Provider.");
     return context;
 };
-/** Meant for internal use. This will be non-exported in a future SDK version. */
-const PayContext = createContext(null);
 
 const hexToP3 = (hex) => {
     const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
@@ -11899,10 +11900,6 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         paymentOptions.includes(ExternalPaymentOptions.Solana)) &&
         pay.order != null &&
         isCCTPV1Chain(getOrderDestChainId(pay.order));
-    // Refs the survive re-renders and stores any updated param values while
-    // lockPayParams is true
-    const latestPayParamsRef = useRef();
-    const latestPayIdRef = useRef();
     // From DaimoPayButton props
     const [buttonProps, setButtonProps] = useState();
     const [currPayParams, setCurrPayParams] = useState();
@@ -12102,7 +12099,6 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         pay.setChosenUsd(usd);
     };
     const setPayId = useCallback(async (payId) => {
-        latestPayIdRef.current = payId;
         if (lockPayParams || payId == null)
             return;
         const id = readDaimoPayOrderID(payId).toString();
@@ -12115,7 +12111,6 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
     }, [lockPayParams, pay]);
     /** Called whenever params change. */
     const setPayParams = async (payParams) => {
-        latestPayParamsRef.current = payParams;
         if (lockPayParams)
             return;
         assert(payParams != null, "[SET PAY PARAMS] payParams cannot be null");
@@ -12131,20 +12126,27 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
         pay.reset();
         await pay.createPreviewOrder(currPayParams);
     };
-    const resetOrder = useCallback(() => {
-        // Clear the old order & UI
+    const resetOrder = useCallback(async (payParams) => {
+        const mergedPayParams = payParams != null && currPayParams != null
+            ? { ...currPayParams, ...payParams }
+            : currPayParams;
+        // Clear the old order & state
         pay.reset();
-        setRoute(ROUTES.SELECT_METHOD);
-        // Prefer an explicit payId, otherwise use the queued payParams
-        if (latestPayIdRef.current) {
-            pay.setPayId(latestPayIdRef.current);
-            latestPayIdRef.current = undefined;
-        }
-        else if (latestPayParamsRef.current) {
-            pay.createPreviewOrder(latestPayParamsRef.current);
-            latestPayParamsRef.current = undefined;
+        setSelectedExternalOption(undefined);
+        setSelectedTokenOption(undefined);
+        setSelectedSolanaTokenOption(undefined);
+        setSelectedDepositAddressOption(undefined);
+        setSelectedWallet(undefined);
+        setSelectedWalletDeepLink(undefined);
+        setPaymentWaitingMessage(undefined);
+        // Set the new payParams
+        if (mergedPayParams) {
+            await pay.createPreviewOrder(mergedPayParams);
+            setCurrPayParams(mergedPayParams);
+            setIsDepositFlow(mergedPayParams.toUnits == null);
         }
-    }, [setRoute, pay]);
+        setRoute(ROUTES.SELECT_METHOD);
+    }, [setRoute, pay, currPayParams]);
     const [tokenMode, setTokenMode] = useState("evm");
     return {
         buttonProps,
@@ -12938,6 +12940,16 @@ function useDaimoPayStatus() {
     return { paymentId, status: order.intentStatus };
 }
 
+function useDaimoPayUI() {
+    const context = useContext(PayContext);
+    if (!context) {
+        throw new Error("useDaimoPayUI must be used within a DaimoPayUIProvider");
+    }
+    return {
+        resetPayment: context.paymentState.resetOrder,
+    };
+}
+
 function addressToNumber(address) {
     return ((address
         .split("")
@@ -13193,5 +13205,5 @@ const wallets = Object.keys(walletConfigs).reduce((acc, key) => {
     return acc;
 }, {});
 
-export { Avatar, Chain as ChainIcon, DaimoPayButton, PayContext as DaimoPayContext, DaimoPayProvider, daimoPayVersion, defaultConfig as getDefaultConfig, useDaimoPay, useDaimoPayStatus, usePayContext, version, wallets };
+export { Avatar, Chain as ChainIcon, DaimoPayButton, PayContext as DaimoPayContext, DaimoPayProvider, daimoPayVersion, defaultConfig as getDefaultConfig, useDaimoPay, useDaimoPayStatus, useDaimoPayUI, usePayContext, version, wallets };
 //# sourceMappingURL=index.js.map