@daimo/pay 1.3.4 → 1.4.0

package/build/index.d.ts

@@ -287,6 +287,9 @@ type ContextValue = {
     /** Custom message to display on confirmation page. */
     confirmationMessage?: string;
     setConfirmationMessage: React$1.Dispatch<React$1.SetStateAction<string | undefined>>;
+    /** Redirect URL to return to the app. E.g. after Coinbase, Binance, RampNetwork. */
+    redirectReturnUrl?: string;
+    setRedirectReturnUrl: React$1.Dispatch<React$1.SetStateAction<string | undefined>>;
 } & useConnectCallbackProps;
 /** Meant for internal use. This will be non-exported in a future SDK version. */
 declare const Context: React$1.Context<ContextValue | null>;
@@ -404,6 +407,8 @@ type PayButtonCommonProps = PayButtonPaymentProps & {
     defaultOpen?: boolean;
     /** Custom message to display on confirmation page. */
     confirmationMessage?: string;
+    /** Redirect URL to return to the app. E.g. after Coinbase, Binance, RampNetwork. */
+    redirectReturnUrl?: string;
 };
 type DaimoPayButtonProps = PayButtonCommonProps & {
     /** Light mode, dark mode, or auto. */

package/build/package.json.js

@@ -1,5 +1,5 @@
 var name = "@daimo/pay";
-var version = "1.3.4";
+var version = "1.4.0";
 var author = "Daimo";
 var homepage = "https://pay.daimo.com";
 var license = "BSD-2-Clause license";

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

@@ -4,6 +4,7 @@ import { useState, useEffect } from 'react';
 import { keyframes } from 'styled-components';
 import CrepeIcon from '../../../assets/crepe.js';
 import styled from '../../../styles/styled/index.js';
+import { daimoPayVersion } from '../../../utils/exports.js';
 
 const PoweredByFooter = ({ supportUrl } = {}) => {
     const [supportVisible, setSupportVisible] = useState(false);
@@ -17,7 +18,9 @@ const PoweredByFooter = ({ supportUrl } = {}) => {
         return () => clearTimeout(timer);
     }, []);
     return (jsx(Container, { children: jsxs(TextButton, { onClick: () => {
-                window.open(supportVisible ? supportUrl : "https://pay.daimo.com?ref=paykit", "_blank");
+                window.open(supportVisible
+                    ? supportUrl
+                    : `https://pay.daimo.com?ref=paykit-v${daimoPayVersion}`, "_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) `

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

@@ -129,6 +129,7 @@ const DaimoPayProviderWithoutSolana = ({ children, theme = "auto", mode = "auto"
     };
     const [errorMessage, setErrorMessage] = useState("");
     const [confirmationMessage, setConfirmationMessage] = useState(undefined);
+    const [redirectReturnUrl, setRedirectReturnUrl] = useState(undefined);
     const [resize, onResize] = useState(0);
     // Include Google Font that is needed for a themes
     if (opts.embedGoogleFonts)
@@ -170,6 +171,7 @@ const DaimoPayProviderWithoutSolana = ({ children, theme = "auto", mode = "auto"
         setDaimoPayOrder,
         setOpen,
         log,
+        redirectReturnUrl,
     });
     // When a payment is in progress, poll for status updates. Do this regardless
     // of whether the modal is still being displayed for useDaimoPayStatus().
@@ -235,6 +237,8 @@ const DaimoPayProviderWithoutSolana = ({ children, theme = "auto", mode = "auto"
         errorMessage,
         confirmationMessage,
         setConfirmationMessage,
+        redirectReturnUrl,
+        setRedirectReturnUrl,
         debugMode,
         log,
         displayError: (message, code) => {

package/build/src/components/DaimoPay.js.map

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

package/build/src/components/DaimoPayButton/index.js

@@ -55,6 +55,12 @@ function DaimoPayButtonCustom(props) {
             setConfirmationMessage(props.confirmationMessage);
         }
     }, [props.confirmationMessage, setConfirmationMessage]);
+    const { setRedirectReturnUrl } = context;
+    useEffect(() => {
+        if (props.redirectReturnUrl) {
+            setRedirectReturnUrl(props.redirectReturnUrl);
+        }
+    }, [props.redirectReturnUrl, setRedirectReturnUrl]);
     // Payment events: call these three event handlers.
     const { onPaymentStarted, onPaymentCompleted, onPaymentBounced } = props;
     const order = paymentState.daimoPayOrder;

package/build/src/components/DaimoPayButton/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/DaimoPayModal/ConnectWithInjector/index.js

@@ -7,7 +7,7 @@ import Button from '../../Common/Button/index.js';
 import { PageContent, ModalHeading, ModalContent, ModalContentContainer, ModalH1, ModalBody } from '../../Common/Modal/styles.js';
 import Tooltip from '../../Common/Tooltip/index.js';
 import SquircleSpinner from '../../Spinners/SquircleSpinner/index.js';
-import { RetryIconCircle, AlertIcon, TickIcon } from '../../../assets/icons.js';
+import { RetryIconCircle, AlertIcon, ExternalLinkIcon, TickIcon } from '../../../assets/icons.js';
 import { useConnect } from '../../../hooks/useConnect.js';
 import useLocales from '../../../hooks/useLocales.js';
 import { detectBrowser, isWalletConnectConnector } from '../../../utils/index.js';
@@ -195,7 +195,7 @@ const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
                                                 ? locales.injectionScreen_connecting_injected_h1
                                                 : locales.injectionScreen_connecting_h1 }), jsx(ModalBody, { children: wallet.connector.id === "injected"
                                                 ? locales.injectionScreen_connecting_injected_p
-                                                : locales.injectionScreen_connecting_p })] }) }, states.CONNECTING)), status === states.CONNECTED && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: jsxs(ModalContent, { children: [jsxs(ModalH1, { "$valid": true, children: [jsx(TickIcon, {}), " ", locales.injectionScreen_connected_h1] }), jsx(ModalBody, { children: locales.injectionScreen_connected_p })] }) }, states.CONNECTED)), status === states.NOTCONNECTED && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: jsxs(ModalContent, { children: [jsx(ModalH1, { children: locales.injectionScreen_notconnected_h1 }), jsx(ModalBody, { children: locales.injectionScreen_notconnected_p })] }) }, states.NOTCONNECTED)), status === states.UNAVAILABLE && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: !extensionUrl ? (jsxs(Fragment, { children: [jsxs(ModalContent, { style: { paddingBottom: 12 }, children: [jsx(ModalH1, { children: locales.injectionScreen_unavailable_h1 }), jsx(ModalBody, { children: locales.injectionScreen_unavailable_p })] }), !wallet.isInstalled && suggestedExtension && (jsxs(Button, { href: suggestedExtension?.url, icon: jsx(BrowserIcon, { browser: suggestedExtension?.name }), children: ["Install on ", suggestedExtension?.label] }))] })) : (jsxs(Fragment, { children: [jsxs(ModalContent, { style: { paddingBottom: 18 }, children: [jsx(ModalH1, { children: locales.injectionScreen_install_h1 }), jsx(ModalBody, { children: locales.injectionScreen_install_p })] }), !wallet.isInstalled && extensionUrl && (jsx(Button, { href: extensionUrl, icon: jsx(BrowserIcon, {}), children: locales.installTheExtension }))] })) }, states.UNAVAILABLE))] }) })] }) }));
+                                                : locales.injectionScreen_connecting_p }), jsxs(Button, { icon: jsx(ExternalLinkIcon, {}), onClick: runConnect, children: ["Connect ", walletInfo.name] })] }) }, states.CONNECTING)), status === states.CONNECTED && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: jsxs(ModalContent, { children: [jsxs(ModalH1, { "$valid": true, children: [jsx(TickIcon, {}), " ", locales.injectionScreen_connected_h1] }), jsx(ModalBody, { children: locales.injectionScreen_connected_p })] }) }, states.CONNECTED)), status === states.NOTCONNECTED && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: jsxs(ModalContent, { children: [jsx(ModalH1, { children: locales.injectionScreen_notconnected_h1 }), jsx(ModalBody, { children: locales.injectionScreen_notconnected_p })] }) }, states.NOTCONNECTED)), status === states.UNAVAILABLE && (jsx(Content, { initial: "initial", animate: "animate", exit: "exit", variants: contentVariants, children: !extensionUrl ? (jsxs(Fragment, { children: [jsxs(ModalContent, { style: { paddingBottom: 12 }, children: [jsx(ModalH1, { children: locales.injectionScreen_unavailable_h1 }), jsx(ModalBody, { children: locales.injectionScreen_unavailable_p })] }), !wallet.isInstalled && suggestedExtension && (jsxs(Button, { href: suggestedExtension?.url, icon: jsx(BrowserIcon, { browser: suggestedExtension?.name }), children: ["Install on ", suggestedExtension?.label] }))] })) : (jsxs(Fragment, { children: [jsxs(ModalContent, { style: { paddingBottom: 18 }, children: [jsx(ModalH1, { children: locales.injectionScreen_install_h1 }), jsx(ModalBody, { children: locales.injectionScreen_install_p })] }), !wallet.isInstalled && extensionUrl && (jsx(Button, { href: extensionUrl, icon: jsx(BrowserIcon, {}), children: locales.installTheExtension }))] })) }, states.UNAVAILABLE))] }) })] }) }));
 };
 
 export { ConnectWithInjector as default, states };

package/build/src/hooks/usePaymentState.js

@@ -13,7 +13,7 @@ import { usePayWithToken } from './usePayWithToken.js';
 import { useSolanaPaymentOptions } from './useSolanaPaymentOptions.js';
 import { useWalletPaymentOptions } from './useWalletPaymentOptions.js';
 
-function usePaymentState({ trpc, daimoPayOrder, setDaimoPayOrder, setOpen, log, }) {
+function usePaymentState({ trpc, daimoPayOrder, setDaimoPayOrder, setOpen, log, redirectReturnUrl, }) {
     // Browser state.
     const [platform, setPlatform] = useState();
     useEffect(() => {
@@ -76,6 +76,7 @@ function usePaymentState({ trpc, daimoPayOrder, setDaimoPayOrder, setOpen, log,
                 platform,
                 refundAddress,
                 externalPaymentOption,
+                redirectReturnUrl,
             });
         }
         log(`[CREATE/HYDRATE] creating+hydrating new order ${order.id}`);
@@ -94,6 +95,7 @@ function usePaymentState({ trpc, daimoPayOrder, setDaimoPayOrder, setOpen, log,
             platform,
             refundAddress,
             externalPaymentOption,
+            redirectReturnUrl,
         });
     };
     const { payWithToken } = usePayWithToken({

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

@@ -1,18 +1,17 @@
 import { writeDaimoPayOrderID } from '@daimo/common';
+import { daimoPayVersion } from './exports.js';
 
 function getSupportUrl(daimoPayOrder, screen) {
-    const encodedOrderId = daimoPayOrder == null ? null : writeDaimoPayOrderID(daimoPayOrder.id);
+    const payId = 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;
+    const subject = `Support${payId ? ` #${payId}` : ""}`;
+    let body = [
+        `Transaction: ${screen}`,
+        `Version: ${daimoPayVersion}`,
+        ``,
+        `Tell us how we can help`,
+    ].join("\n");
+    return `mailto:${email}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
 }
 
 export { getSupportUrl };

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@daimo/pay",
   "private": false,
-  "version": "1.3.4",
+  "version": "1.4.0",
   "author": "Daimo",
   "homepage": "https://pay.daimo.com",
   "license": "BSD-2-Clause license",