@daimo/pay 1.1.2 → 1.1.4

package/build/index.d.ts

@@ -9,8 +9,8 @@ import { CreateTRPCClient } from '@trpc/client';
 import * as abitype from 'abitype';
 import { WalletName } from '@solana/wallet-adapter-base';
 import { CreateConfigParameters } from '@wagmi/core';
-import { CoinbaseWalletParameters } from 'wagmi/connectors';
 import { CreateConnectorFn } from 'wagmi';
+import { CoinbaseWalletParameters } from 'wagmi/connectors';
 
 type Hash = `0x${string}`;
 type CustomAvatarProps = {
@@ -385,9 +385,10 @@ type DefaultConfigProps = {
      * WalletConnect project ID by default. */
     walletConnectProjectId?: string;
     coinbaseWalletPreference?: CoinbaseWalletParameters<"4">["preference"];
+    additionalConnectors?: CreateConnectorFn[];
 } & Partial<CreateConfigParameters>;
 /** Daimo Pay recommended config, for use with wagmi's createConfig(). */
-declare const defaultConfig: ({ appName, appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, chains, client, ...props }: DefaultConfigProps) => CreateConfigParameters;
+declare const defaultConfig: ({ appName, appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, additionalConnectors, chains, client, ...props }: DefaultConfigProps) => CreateConfigParameters;
 
 type PayButtonPaymentProps = {
     /**

package/build/package.json.js

@@ -1,5 +1,5 @@
 var name = "@daimo/pay";
-var version = "1.1.2";
+var version = "1.1.4";
 var author = "Daimo";
 var homepage = "https://pay.daimo.com";
 var license = "BSD-2-Clause license";
@@ -38,8 +38,8 @@ var keywords = [
 	"crypto"
 ];
 var dependencies = {
-	"@daimo/common": "0.3.17",
-	"@daimo/contract": "0.3.17",
+	"@daimo/common": "0.3.18",
+	"@daimo/contract": "0.3.18",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
 	"@solana/web3.js": "^1.95.4",
@@ -60,7 +60,7 @@ var peerDependencies = {
 	"@tanstack/react-query": ">=5.0.0",
 	react: "17.x || 18.x || 19.x",
 	"react-dom": "17.x || 18.x || 19.x",
-	viem: "2.x",
+	viem: ">=2.22.0",
 	wagmi: "2.x"
 };
 var devDependencies = {

package/build/src/components/Common/OptionsList/index.js

@@ -69,7 +69,7 @@ const OptionItem = ({ option }) => {
             return (jsx(IconStackContainer, { children: hydratedIcons.map((icon, index) => (jsx(IconStackItem, { "$marginRight": index !== hydratedIcons.length - 1 ? -12 : 0, "$zIndex": hydratedIcons.length - index, children: icon }, index))) }));
         }
     })();
-    return (jsxs(OptionButton, { type: "button", onClick: option.onClick, children: [iconContent, jsxs(OptionLabel, { children: [jsx(OptionTitle, { children: option.title }), option.subtitle && jsx(OptionSubtitle, { children: option.subtitle })] })] }));
+    return (jsxs(OptionButton, { type: "button", onClick: option.onClick, disabled: option.disabled, children: [iconContent, jsxs(OptionLabel, { children: [jsx(OptionTitle, { children: option.title }), option.subtitle && jsx(OptionSubtitle, { children: option.subtitle })] })] }));
 };
 const IconStackContainer = styled(motion.div) `
   position: absolute;

package/build/src/components/Common/PoweredByFooter/index.js

@@ -1,18 +1,34 @@
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { motion } from 'framer-motion';
+import { useState, useEffect } from 'react';
+import { keyframes } from 'styled-components';
 import CrepeIcon from '../../../assets/crepe.js';
 import styled from '../../../styles/styled/index.js';
 
-const PoweredByFooter = () => {
+const PoweredByFooter = ({ supportUrl } = {}) => {
+    const [supportVisible, setSupportVisible] = useState(false);
+    useEffect(() => {
+        if (supportUrl == null)
+            return;
+        // Show the support link after delay
+        const timer = setTimeout(() => {
+            setSupportVisible(true);
+        }, 2500);
+        return () => clearTimeout(timer);
+    }, []);
     return (jsx(Container, { children: jsxs(TextButton, { onClick: () => {
-                window.open("https://pay.daimo.com?ref=paykit", "_blank");
-            }, children: [jsx(CrepeIcon, {}), "Powered by Daimo Pay"] }) }));
+                window.open(supportVisible ? supportUrl : "https://pay.daimo.com?ref=paykit", "_blank");
+            }, className: supportVisible ? "support" : "", children: [!supportVisible && jsx(CrepeIcon, {}), jsx("span", { children: supportVisible ? (jsxs(Fragment, { children: ["Need help? ", jsx(Underline, { children: "Contact support" })] })) : (jsx(Fragment, { children: "Powered by Daimo Pay" })) })] }) }));
 };
 const Container = styled(motion.div) `
   text-align: center;
   margin-top: 16px;
   margin-bottom: -4px;
 `;
+const fadeIn = keyframes `
+0%{ opacity:0; }
+100%{ opacity:1; }
+`;
 const TextButton = styled(motion.button) `
   appearance: none;
   user-select: none;
@@ -26,18 +42,34 @@ const TextButton = styled(motion.button) `
   border-radius: 6px;
   background: none;
   color: var(--ck-body-color-muted);
+  text-decoration-color: var(--ck-body-color-muted);
   font-size: 15px;
   line-height: 18px;
   font-weight: 500;
+
   transition:
     color 200ms ease,
     transform 100ms ease;
   &:hover {
     color: var(--ck-body-color-muted-hover);
+    text-decoration-color: var(--ck-body-color-muted-hover);
   }
   &:active {
     transform: scale(0.96);
   }
+
+  span {
+    opacity: 1;
+    transition: opacity 300ms ease;
+  }
+
+  &.support span {
+    animation: ${fadeIn} 300ms ease both;
+  }
+`;
+const Underline = styled(motion.span) `
+  text-underline-offset: 2px;
+  text-decoration: underline;
 `;
 
 export { PoweredByFooter as default };

package/build/src/components/Common/PoweredByFooter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/src/components/DaimoPay.js

@@ -160,9 +160,9 @@ const DaimoPayProviderWithoutSolana = ({ children, theme = "auto", mode = "auto"
         setTimeout(() => retryBackoff("refreshOrder", () => paymentState.refreshOrder()), intervalMs);
     }, [daimoPayOrder]);
     const showPayment = async (modalOptions) => {
-        const { daimoPayOrder, payParams } = paymentState;
+        const { daimoPayOrder } = paymentState;
         const id = daimoPayOrder?.id;
-        log(`[PAY] showing payment ${debugJson({ id, payParams, modalOptions })}`);
+        log(`[PAY] showing payment ${debugJson({ id, modalOptions })}`);
         paymentState.setModalOptions(modalOptions);
         if (daimoPayOrder &&
             daimoPayOrder.mode === DaimoPayOrderMode.HYDRATED &&

package/build/src/components/Pages/Confirmation/index.js

@@ -6,6 +6,7 @@ import { getChainExplorerTxUrl } from '@daimo/contract';
 import { motion } from 'framer-motion';
 import { TickIcon, LoadingCircleIcon } from '../../../assets/icons.js';
 import styled from '../../../styles/styled/index.js';
+import { getSupportUrl } from '../../../utils/supportUrl.js';
 import PoweredByFooter from '../../Common/PoweredByFooter/index.js';
 
 const Confirmation = () => {
@@ -43,7 +44,7 @@ const Confirmation = () => {
                 justifyContent: "center",
                 alignItems: "center",
                 paddingBottom: 0,
-            }, children: [jsx(AnimationContainer, { children: jsxs(InsetContainer, { children: [jsx(Spinner, { "$status": done }), jsx(SuccessIcon, { "$status": done })] }) }), !done ? (jsx(ModalH1, { children: "Confirming..." })) : (jsxs(Fragment, { children: [jsx(ModalH1, { children: jsx(Link, { href: txURL, target: "_blank", rel: "noopener noreferrer", children: "Payment completed" }) }), confirmationMessage && (jsx(ModalBody, { children: confirmationMessage }))] })), jsx(PoweredByFooter, {})] }) }));
+            }, children: [jsx(AnimationContainer, { children: jsxs(InsetContainer, { children: [jsx(Spinner, { "$status": done }), jsx(SuccessIcon, { "$status": done })] }) }), !done ? (jsx(ModalH1, { children: "Confirming..." })) : (jsxs(Fragment, { children: [jsx(ModalH1, { children: jsx(Link, { href: txURL, target: "_blank", rel: "noopener noreferrer", children: "Payment completed" }) }), confirmationMessage && (jsx(ModalBody, { children: confirmationMessage }))] })), jsx(PoweredByFooter, { supportUrl: getSupportUrl(daimoPayOrder, done ? "Confirmed" : "Confirming") })] }) }));
 };
 const AnimationContainer = styled(motion.div) `
   position: relative;

package/build/src/components/Pages/Confirmation/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/src/components/Pages/SelectMethod/index.js

@@ -103,6 +103,8 @@ const SelectMethod = () => {
                 setSelectedExternalOption(option);
                 setRoute(ROUTES.WAITING_OTHER);
             },
+            disabled: option.disabled,
+            subtitle: option.message,
         })),
         ...(depositAddressOption ? [depositAddressOption] : []),
     ];

package/build/src/components/Pages/SelectMethod/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/src/defaultConfig.js

@@ -19,7 +19,7 @@ const REQUIRED_CHAINS = [
     blast,
 ];
 /** Daimo Pay recommended config, for use with wagmi's createConfig(). */
-const defaultConfig = ({ appName = "Daimo Pay", appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, chains = REQUIRED_CHAINS, client, ...props }) => {
+const defaultConfig = ({ appName = "Daimo Pay", appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, additionalConnectors, chains = REQUIRED_CHAINS, client, ...props }) => {
     globalAppName = appName;
     const paddedChains = [...chains];
     for (const chain of REQUIRED_CHAINS) {
@@ -47,6 +47,7 @@ const defaultConfig = ({ appName = "Daimo Pay", appIcon, appDescription, appUrl,
             },
             walletConnectProjectId: walletConnectProjectId ?? "ea6c5b36001c18b96e06128f14c06f40",
             coinbaseWalletPreference,
+            additionalConnectors,
         });
     const config = {
         ...props,

package/build/src/defaultConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultConfig.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"defaultConfig.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/src/defaultConnectors.js

@@ -1,9 +1,9 @@
 import { safe, injected, coinbaseWallet, walletConnect } from '@wagmi/connectors';
 
-const defaultConnectors = ({ app, walletConnectProjectId, coinbaseWalletPreference, }) => {
+const defaultConnectors = ({ app, walletConnectProjectId, coinbaseWalletPreference, additionalConnectors, }) => {
     const hasAllAppData = app.name && app.icon && app.description && app.url;
     const shouldUseSafeConnector = !(typeof window === "undefined") && window?.parent !== window;
-    const connectors = [];
+    const connectors = additionalConnectors ?? [];
     // If we're in an iframe, include the SafeConnector
     if (shouldUseSafeConnector) {
         connectors.push(safe({

package/build/src/hooks/usePaymentState.js

@@ -1,4 +1,4 @@
-import { readDaimoPayOrderID, assert, assertNotNull, debugJson } from '@daimo/common';
+import { readDaimoPayOrderID, assert, assertNotNull } from '@daimo/common';
 import { ethereum } from '@daimo/contract';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { useState, useEffect, useCallback } from 'react';
@@ -178,7 +178,6 @@ function usePaymentState({ trpc, daimoPayOrder, setDaimoPayOrder, setOpen, log,
     }, [daimoPayOrder]);
     /** Called whenever params change. */
     const setPayParams = async (payParams) => {
-        console.log(`[CHECKOUT] setting payParams: ${debugJson(payParams)}`);
         assert(payParams != null);
         setPayParamsState(payParams);
         const newPayId = generatePayId();

package/build/src/hooks/usePaymentState.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePaymentState.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"usePaymentState.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/src/utils/supportUrl.js

@@ -0,0 +1,19 @@
+import { writeDaimoPayOrderID } from '@daimo/common';
+
+function getSupportUrl(daimoPayOrder, screen) {
+    const encodedOrderId = daimoPayOrder == null ? null : writeDaimoPayOrderID(daimoPayOrder.id);
+    const email = "support@daimo.com";
+    const subject = `Support with Daimo Pay Id ${encodedOrderId}`;
+    let body = "";
+    if (daimoPayOrder != null) {
+        body += `Id: ${encodedOrderId}\n`;
+        body += `Org Id: ${daimoPayOrder.orgId}\n`;
+    }
+    body += `Support requested on ${screen} screen at ${new Date().toISOString()}\n\n`;
+    body += "Please explain the issue you are experiencing:\n\n";
+    const mailtoUrl = `mailto:${email}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
+    return mailtoUrl;
+}
+
+export { getSupportUrl };
+//# sourceMappingURL=supportUrl.js.map

package/build/src/utils/supportUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supportUrl.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;"}

package/build/src/wallets/useWallets.js

@@ -30,6 +30,7 @@ const useWallets = () => {
             iconShape: "squircle",
             isInstalled: connector.type === "mock" ||
                 (connector.type === "injected" && connector.id !== "metaMask") ||
+                connector.type === "farcasterFrame" ||
                 isCoinbaseWalletConnector(connector.id), // always run coinbase wallet SDK
         };
         if (walletId) {
@@ -62,6 +63,9 @@ const useWallets = () => {
         // remove wallet with id io.metamask if wallet with id 'metaMask' exists
         .filter((wallet, index, self) => !((wallet.id === "metaMaskSDK" || wallet.id === "metaMask") &&
         self.find((w) => w.id === "io.metamask" || w.id === "io.metamask.mobile")))
+        // remove wallet with id 'com.warpcast.mobile' if wallet with id 'farcaster' exists
+        .filter((wallet, index, self) => !(wallet.id === "com.warpcast.mobile" &&
+        self.find((w) => w.id === "farcaster")))
         // order by isInstalled injected connectors first
         .sort((a, b) => {
         const AisInstalled = a.isInstalled && isInjectedConnector(a.connector.type);

package/build/src/wallets/useWallets.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWallets.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"useWallets.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@daimo/pay",
   "private": false,
-  "version": "1.1.2",
+  "version": "1.1.4",
   "author": "Daimo",
   "homepage": "https://pay.daimo.com",
   "license": "BSD-2-Clause license",
@@ -40,8 +40,8 @@
     "crypto"
   ],
   "dependencies": {
-    "@daimo/common": "0.3.17",
-    "@daimo/contract": "0.3.17",
+    "@daimo/common": "0.3.18",
+    "@daimo/contract": "0.3.18",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/web3.js": "^1.95.4",
@@ -62,7 +62,7 @@
     "@tanstack/react-query": ">=5.0.0",
     "react": "17.x || 18.x || 19.x",
     "react-dom": "17.x || 18.x || 19.x",
-    "viem": "2.x",
+    "viem": ">=2.22.0",
     "wagmi": "2.x"
   },
   "devDependencies": {
@@ -80,4 +80,4 @@
     "rollup-plugin-visualizer": "^5.5.4",
     "typescript-plugin-styled-components": "^3.0.0"
   }
-}
+}