@daimo/pay 1.8.2 → 1.8.4

package/build/index.js

@@ -22,7 +22,7 @@ import { WalletSignTransactionError, WalletSendTransactionError } from '@solana/
 import { normalize } from 'viem/ens';
 
 var name = "@daimo/pay";
-var version = "1.8.2";
+var version = "1.8.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.8.2",
+	"@daimo/pay-common": "1.8.4",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -1439,6 +1439,7 @@ function usePaymentState({ trpc, lockPayParams, daimoPayOrder, setDaimoPayOrder,
         assert(!!platform, "[PAY EXTERNAL] platform cannot be null");
         const { hydratedOrder, externalPaymentOptionData } = await createOrHydrate({
             order: daimoPayOrder,
+            refundAddress: payParams?.refundAddress,
             externalPaymentOption: option,
         });
         assert(!!externalPaymentOptionData, "[PAY EXTERNAL] missing externalPaymentOptionData");
@@ -1451,6 +1452,7 @@ function usePaymentState({ trpc, lockPayParams, daimoPayOrder, setDaimoPayOrder,
         assert(!!daimoPayOrder, "[PAY DEPOSIT ADDRESS] missing daimoPayOrder");
         const { hydratedOrder } = await createOrHydrate({
             order: daimoPayOrder,
+            refundAddress: payParams?.refundAddress,
         });
         setDaimoPayOrder(hydratedOrder);
         log(`[PAY DEPOSIT ADDRESS] hydrated order: ${JSON.stringify(hydratedOrder)}, checking out with deposit address: ${option}`);
@@ -1475,7 +1477,10 @@ function usePaymentState({ trpc, lockPayParams, daimoPayOrder, setDaimoPayOrder,
         }
         // Hydrate the order
         log(`payWithWallet: hydrating order ${order.id}${amountUsd && ` for $${amountUsd}`}`);
-        const { hydratedOrder } = await createOrHydrate({ order });
+        const { hydratedOrder } = await createOrHydrate({
+            order,
+            refundAddress: payParams?.refundAddress,
+        });
         setDaimoPayOrder(hydratedOrder);
         // If we already picked a wallet, open in that wallet.
         if (wallet == null)
@@ -10825,7 +10830,8 @@ function SelectMethod() {
     const { connected: isSolanaConnected, wallet: solanaWallet, wallets: solanaWallets, disconnect: disconnectSolana, publicKey, } = useWallet$1();
     const { setRoute, paymentState, wcWallet, log } = usePayContext();
     const { disconnectAsync } = useDisconnect();
-    const { setSelectedExternalOption, externalPaymentOptions, showSolanaPaymentMethod, depositAddressOptions, senderEnsName, } = paymentState;
+    const { daimoPayOrder, setSelectedExternalOption, externalPaymentOptions, showSolanaPaymentMethod, depositAddressOptions, senderEnsName, } = paymentState;
+    const paymentOptions = daimoPayOrder?.metadata.payer?.paymentOptions;
     // Decide whether to show the connected eth account, solana account, or both.
     const showConnectedEth = isEthConnected;
     const showConnectedSolana = isSolanaConnected && showSolanaPaymentMethod;
@@ -10888,9 +10894,8 @@ function SelectMethod() {
     };
     // Deposit address options, e.g. Bitcoin, Tron, Zcash, etc.
     // Include by default if paymentOptions not provided
-    const showDepositAddressMethod = externalPaymentOptions.options
-        .get("external")
-        ?.some((o) => o.id == ExternalPaymentOptions.ExternalChains);
+    const showDepositAddressMethod = paymentOptions == null ||
+        paymentOptions.includes(ExternalPaymentOptions.ExternalChains);
     const connectedWalletOptions = getConnectedWalletOptions();
     const unconnectedWalletOption = {
         id: "unconnectedWallet",