@daimo/pay 1.7.5 → 1.7.7

package/build/index.d.ts

@@ -4,8 +4,8 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import { CreateConfigParameters } from '@wagmi/core';
 import { CreateConnectorFn } from 'wagmi';
 import { CoinbaseWalletParameters } from 'wagmi/connectors';
-import { DaimoPayOrderView, DaimoPayUserMetadata, DaimoPayIntentStatus, DaimoPayOrderMode, DepositAddressPaymentOptionMetadata, PlatformType, ExternalPaymentOptionMetadata, WalletPaymentOption, DaimoPayOrder, ExternalPaymentOptions, DepositAddressPaymentOptions, DepositAddressPaymentOptionData, SolanaPublicKey } from '@daimo/pay-common';
-import { Hex, Address } from 'viem';
+import { DaimoPayOrderView, PaymentStartedEvent, PaymentCompletedEvent, PaymentBouncedEvent, DaimoPayUserMetadata, DaimoPayIntentStatus, DaimoPayOrderMode, DepositAddressPaymentOptionMetadata, PlatformType, ExternalPaymentOptionMetadata, WalletPaymentOption, DaimoPayOrderWithOrg, ExternalPaymentOptions, DepositAddressPaymentOptions, DepositAddressPaymentOptionData, SolanaPublicKey } 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';
@@ -133,48 +133,6 @@ declare const defaultConfig: ({ appName, appIcon, appDescription, appUrl, wallet
 
 /** Payment details and status. */
 type DaimoPayment = DaimoPayOrderView;
-/** Passed to both `onPayment*` event handlers and webhooks. */
-type DaimoPayEvent = {
-    /**
-     * A payment is started once the user has sent payment. Completed means
-     * the payment was sent on the destination chain and custom contract call,
-     * if any, was successful. Bounced means that a destination contract call
-     * reverted and funds were refunded.
-     */
-    type: "payment_started" | "payment_completed" | "payment_bounced";
-    /**
-     * The unique ID for this payment.
-     */
-    paymentId: string;
-    /**
-     * The chain for this event--source chain for payment_started, destination
-     * chain for payment_completed/payment_bounced.
-     */
-    chainId: number;
-    /**
-     * Payment details.
-     */
-    payment: DaimoPayment;
-};
-type DaimoPayStartedEvent = DaimoPayEvent & {
-    type: "payment_started";
-    /**
-     * The transaction hash sent by the user, if found. (There are rare edge cases
-     * where a payment can be paid without a txhash.) Hex for all EVM events,
-     * Base58 for payment_started on Solana.
-     */
-    txHash: Hex | string | null;
-};
-type DaimoPayCompletedEvent = DaimoPayEvent & {
-    type: "payment_completed";
-    /** The transaction hash completing this payment. */
-    txHash: Hex;
-};
-type DaimoPayBouncedEvent = DaimoPayEvent & {
-    type: "payment_bounced";
-    /** The transaction hash containing the reverted final call and refund. */
-    txHash: Hex;
-};
 /** Props for DaimoPayButton. */
 type PayButtonPaymentProps = {
     /**
@@ -244,11 +202,11 @@ type PayButtonPaymentProps = {
 };
 type PayButtonCommonProps = PayButtonPaymentProps & {
     /** Called when user sends payment and transaction is seen on chain */
-    onPaymentStarted?: (event: DaimoPayStartedEvent) => void;
+    onPaymentStarted?: (event: PaymentStartedEvent) => void;
     /** Called when destination transfer or call completes successfully */
-    onPaymentCompleted?: (event: DaimoPayCompletedEvent) => void;
+    onPaymentCompleted?: (event: PaymentCompletedEvent) => void;
     /** Called when destination call reverts and funds are refunded */
-    onPaymentBounced?: (event: DaimoPayBouncedEvent) => void;
+    onPaymentBounced?: (event: PaymentBouncedEvent) => void;
     /** Called when the modal is opened. */
     onOpen?: () => void;
     /** Called when the modal is closed. */
@@ -479,7 +437,7 @@ interface PaymentState {
     payParams: PayParams | undefined;
     generatePreviewOrder: (payParams: PayParams) => void;
     resetOrder: () => void;
-    daimoPayOrder: DaimoPayOrder | undefined;
+    daimoPayOrder: DaimoPayOrderWithOrg | undefined;
     isDepositFlow: boolean;
     paymentWaitingMessage: string | undefined;
     externalPaymentOptions: ReturnType<typeof useExternalPaymentOptions>;
@@ -562,4 +520,4 @@ type PayContextValue = {
 } & useConnectCallbackProps;
 
 export { Avatar, Chain as ChainIcon, DaimoPayButton, PayContext as DaimoPayContext, DaimoPayProvider, types as Types, daimoPayVersion, defaultConfig as getDefaultConfig, useDaimoPayStatus, usePayContext, wallets };
-export type { All, CustomAvatarProps, CustomTheme, DaimoPayBouncedEvent, DaimoPayButtonCustomProps, DaimoPayButtonProps, DaimoPayCompletedEvent, DaimoPayContextOptions, DaimoPayEvent, DaimoPayModalOptions, DaimoPayStartedEvent, DaimoPayment, Languages, Mode, PaymentOption, Theme };
+export type { All, CustomAvatarProps, CustomTheme, DaimoPayButtonCustomProps, DaimoPayButtonProps, DaimoPayContextOptions, DaimoPayModalOptions, DaimoPayment, Languages, Mode, PaymentOption, Theme };

package/build/index.js

@@ -1,5 +1,5 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import { ExternalPaymentOptions, assert, assertNotNull, debugJson, supportedChains, ethereum, isCCTPV1Chain, getOrderDestChainId, readDaimoPayOrderID, getChainName, arbitrum as arbitrum$1, base as base$2, blast as blast$1, bsc as bsc$1, linea as linea$1, mantle as mantle$1, optimism as optimism$1, polygon as polygon$1, worldchain as worldchain$1, getAddressContraction, writeDaimoPayOrderID, DaimoPayOrderMode, DaimoPayOrderStatusDest, getChainExplorerTxUrl, DaimoPayIntentStatus, retryBackoff, DaimoPayOrderStatusSource, getDaimoPayOrderView } from '@daimo/pay-common';
+import { ExternalPaymentOptions, assert, assertNotNull, debugJson, supportedChains, ethereum, isCCTPV1Chain, getOrderDestChainId, readDaimoPayOrderID, getChainName, arbitrum as arbitrum$1, base as base$2, blast as blast$1, bsc as bsc$1, linea as linea$1, mantle as mantle$1, optimism as optimism$1, polygon as polygon$1, worldchain as worldchain$1, getAddressContraction, writeDaimoPayOrderID, DaimoPayOrderMode, DaimoPayOrderStatusDest, getChainExplorerTxUrl, DaimoPayIntentStatus, retryBackoff, DaimoPayOrderStatusSource, DaimoPayEventType, getDaimoPayOrderView } from '@daimo/pay-common';
 import { Buffer } from 'buffer';
 import React, { useState, useEffect, createContext, useRef, useCallback, useLayoutEffect, useMemo, createElement } from 'react';
 import styled$1, { css, keyframes, ThemeProvider } from 'styled-components';
@@ -22,7 +22,7 @@ import { WalletSignTransactionError, WalletSendTransactionError } from '@solana/
 import { normalize } from 'viem/ens';
 
 var name = "@daimo/pay";
-var version = "1.7.5";
+var version = "1.7.7";
 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.7.5",
+	"@daimo/pay-common": "1.7.7",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -536,6 +536,7 @@ const walletConfigs = {
     },
     "metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK": {
         name: "MetaMask",
+        shortName: "MetaMask",
         icon: jsx(Logos$1.MetaMask, {}),
         iconConnector: jsx(Logos$1.MetaMask, {}),
         iconShouldShrink: true,
@@ -4874,32 +4875,42 @@ const useWallets = (isMobile) => {
     const context = usePayContext();
     if (isMobile) {
         const mobileWallets = [];
-        // Add Rainbow first
-        mobileWallets.push({
-            id: "me.rainbow",
-            ...walletConfigs["me.rainbow"],
-        });
-        // Add MetaMask second
-        const metaMaskConnector = connectors.find((c) => c.id === "metaMask");
-        if (metaMaskConnector) {
-            mobileWallets.push({
-                id: metaMaskConnector.id,
-                connector: metaMaskConnector,
-                ...walletConfigs["metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK"],
-            });
-        }
-        // Add WalletConnect and other wallets
+        // Add injected wallet (if any) first
         connectors.forEach((connector) => {
             if (connector.id === "metaMask")
                 return;
+            if (connector.id === "walletConnect")
+                return;
             if (isCoinbaseWalletConnector(connector.id))
                 return;
             mobileWallets.push({
                 id: connector.id,
                 connector,
-                ...walletConfigs[connector.id],
+                shortName: connector.name,
+                iconConnector: jsx("img", { src: connector.icon, alt: connector.name }),
+                iconShape: "squircle",
             });
         });
+        function addIfNotPresent(idList) {
+            if (mobileWallets.find((w) => idList.includes(w.id)))
+                return;
+            const wallet = assertNotNull(walletConfigs[idList], () => `missing ${idList}`);
+            mobileWallets.push({
+                id: idList,
+                ...wallet,
+            });
+        }
+        addIfNotPresent("me.rainbow");
+        addIfNotPresent("metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK");
+        // Add WalletConnect last
+        const walletConnectConnector = connectors.find((c) => c.id === "walletConnect");
+        if (walletConnectConnector) {
+            mobileWallets.push({
+                id: walletConnectConnector.id,
+                connector: walletConnectConnector,
+                ...walletConfigs[walletConnectConnector.id],
+            });
+        }
         return mobileWallets;
     }
     const wallets = connectors.map((connector) => {
@@ -7477,8 +7488,9 @@ const OrderHeader = ({ minified = false, showEth = false, showSolana = false, })
         }
     })();
     const renderIcon = (icon, name, size = 32) => {
-        if (!icon)
-            return jsx(MetaMask, {});
+        if (!icon) {
+            return null;
+        }
         return (jsx(LogoContainer$4, { "$size": size, "$zIndex": 1, style: { borderRadius: "22.5%" }, children: typeof icon === "string" ? (jsx("img", { src: icon, alt: name || "wallet", style: { maxWidth: "100%", maxHeight: "100%" } })) : (icon) }));
     };
     let walletIcon = renderIcon(connector?.icon || wcWallet?.icon, wcWallet?.name);
@@ -11995,7 +12007,7 @@ function DaimoPayButtonCustom(props) {
         if (!sentStart.current && hydOrder.sourceTokenAmount) {
             sentStart.current = true;
             onPaymentStarted?.({
-                type: DaimoPayIntentStatus.STARTED,
+                type: DaimoPayEventType.PaymentStarted,
                 paymentId: writeDaimoPayOrderID(hydOrder.id),
                 chainId: hydOrder.sourceTokenAmount?.token.chainId,
                 txHash: hydOrder.sourceInitiateTxHash ?? null,
@@ -12004,8 +12016,11 @@ function DaimoPayButtonCustom(props) {
         }
         if (intentStatus === DaimoPayIntentStatus.COMPLETED ||
             intentStatus === DaimoPayIntentStatus.BOUNCED) {
+            const eventType = intentStatus === DaimoPayIntentStatus.COMPLETED
+                ? DaimoPayEventType.PaymentCompleted
+                : DaimoPayEventType.PaymentBounced;
             const event = {
-                type: intentStatus,
+                type: eventType,
                 paymentId: writeDaimoPayOrderID(hydOrder.id),
                 chainId: hydOrder.destFinalCallTokenAmount.token.chainId,
                 txHash: assertNotNull(hydOrder.destFastFinishTxHash ?? hydOrder.destClaimTxHash, `[PAY BUTTON] dest tx hash null on order ${hydOrder.id} when intent status is ${intentStatus}`),