@superlogic/spree-pay 0.4.2 → 0.4.8

package/build/index.cjs

@@ -49,10 +49,11 @@ var init_errors = __esm({
 });
 
 // src/types/payments.ts
-var PaymentType;
+var isNewCard, PaymentType;
 var init_payments = __esm({
   "src/types/payments.ts"() {
     "use strict";
+    isNewCard = (card) => !("cardId" in card);
     PaymentType = /* @__PURE__ */ ((PaymentType2) => {
       PaymentType2["CREDIT_CARD"] = "CREDIT_CARD";
       PaymentType2["CRYPTO"] = "CRYPTO";
@@ -68,7 +69,7 @@ var init_payments = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.4.2";
+    version = "0.4.8";
   }
 });
 
@@ -1128,11 +1129,11 @@ var init_InfoBanner = __esm({
 });
 
 // src/components/common/PointsSwitch.tsx
-var import_react5, import_jsx_runtime9, PointsSwitch;
+var import_react6, import_jsx_runtime9, PointsSwitch;
 var init_PointsSwitch = __esm({
   "src/components/common/PointsSwitch.tsx"() {
     "use strict";
-    import_react5 = require("react");
+    import_react6 = require("react");
     init_StaticConfigContext();
     init_useSlapiBalance();
     init_useSpreePayConfig();
@@ -1149,7 +1150,7 @@ var init_PointsSwitch = __esm({
       const { balance } = useSlapiBalance();
       const hasForeignCurrency = !!(currencyCode && exchangeRate && foreignCurrencyAmount);
       const formatPointsValue = (usd) => hasForeignCurrency ? formatCurrency(usd / exchangeRate, currencyCode) : formatCurrency(usd);
-      const id = (0, import_react5.useId)();
+      const id = (0, import_react6.useId)();
       return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex flex-col gap-6", children: [
         /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center justify-between gap-3", children: [
           /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center gap-3", children: [
@@ -1321,14 +1322,63 @@ var init_CheckoutButton = __esm({
 
 // ../ui/src/lib/utils.ts
 function cn2(...inputs) {
-  return (0, import_tailwind_merge2.twMerge)((0, import_clsx2.clsx)(inputs));
+  return twMerge2((0, import_clsx2.clsx)(inputs));
 }
-var import_clsx2, import_tailwind_merge2;
+var import_clsx2, import_tailwind_merge2, isUniversalSpacing, isLayoutToken, isUniversalRadius, isTypography, twMerge2;
 var init_utils2 = __esm({
   "../ui/src/lib/utils.ts"() {
     "use strict";
     import_clsx2 = require("clsx");
     import_tailwind_merge2 = require("tailwind-merge");
+    isUniversalSpacing = (value) => value.startsWith("universal-");
+    isLayoutToken = (value) => value.startsWith("universal-") || value.startsWith("layout-");
+    isUniversalRadius = (value) => value.startsWith("radius-universal-");
+    isTypography = (value) => value.startsWith("heading-") || value.startsWith("body-") || value.startsWith("label-") || value.startsWith("menu-");
+    twMerge2 = (0, import_tailwind_merge2.extendTailwindMerge)({
+      extend: {
+        classGroups: {
+          "font-size": [{ text: [isTypography] }],
+          leading: [{ leading: [isTypography] }],
+          "font-weight": [{ font: [isTypography] }],
+          p: [{ p: [isUniversalSpacing] }],
+          px: [{ px: [isUniversalSpacing] }],
+          py: [{ py: [isUniversalSpacing] }],
+          pt: [{ pt: [isUniversalSpacing] }],
+          pb: [{ pb: [isUniversalSpacing] }],
+          pl: [{ pl: [isUniversalSpacing] }],
+          pr: [{ pr: [isUniversalSpacing] }],
+          m: [{ m: [isUniversalSpacing] }],
+          mx: [{ mx: [isUniversalSpacing] }],
+          my: [{ my: [isUniversalSpacing] }],
+          mt: [{ mt: [isUniversalSpacing] }],
+          mb: [{ mb: [isUniversalSpacing] }],
+          ml: [{ ml: [isUniversalSpacing] }],
+          mr: [{ mr: [isUniversalSpacing] }],
+          gap: [{ gap: [isUniversalSpacing] }],
+          "gap-x": [{ "gap-x": [isUniversalSpacing] }],
+          "gap-y": [{ "gap-y": [isUniversalSpacing] }],
+          "space-x": [{ "space-x": [isUniversalSpacing] }],
+          "space-y": [{ "space-y": [isUniversalSpacing] }],
+          w: [{ w: [isLayoutToken] }],
+          "min-w": [{ "min-w": [isLayoutToken] }],
+          "max-w": [{ "max-w": [isLayoutToken] }],
+          h: [{ h: [isLayoutToken] }],
+          "min-h": [{ "min-h": [isLayoutToken] }],
+          "max-h": [{ "max-h": [isLayoutToken] }],
+          rounded: [{ rounded: [isUniversalRadius] }],
+          "rounded-s": [{ "rounded-s": [isUniversalRadius] }],
+          "rounded-e": [{ "rounded-e": [isUniversalRadius] }],
+          "rounded-t": [{ "rounded-t": [isUniversalRadius] }],
+          "rounded-r": [{ "rounded-r": [isUniversalRadius] }],
+          "rounded-b": [{ "rounded-b": [isUniversalRadius] }],
+          "rounded-l": [{ "rounded-l": [isUniversalRadius] }],
+          "rounded-tl": [{ "rounded-tl": [isUniversalRadius] }],
+          "rounded-tr": [{ "rounded-tr": [isUniversalRadius] }],
+          "rounded-br": [{ "rounded-br": [isUniversalRadius] }],
+          "rounded-bl": [{ "rounded-bl": [isUniversalRadius] }]
+        }
+      }
+    });
   }
 });
 
@@ -1764,7 +1814,7 @@ function Input2({ className, type, ...props }) {
       type,
       "data-slot": "input",
       className: cn2(
-        "file:text-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base text-(--primary) shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-(--tertiary) disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "file:text-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input px-universal-2xs py-universal-6xs rounded-radius-universal-xs text-body-m file:text-label-s file:font-label-primary flex h-9 w-full min-w-0 border bg-transparent text-(--color-text-icons-primary-default) shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent placeholder:text-(--color-text-icons-tertiary-default) disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
         "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
         className
@@ -1874,7 +1924,7 @@ function Separator2({
       decorative,
       orientation,
       className: cn2(
-        "shrink-0 bg-(--b-secondary) data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
+        "shrink-0 bg-(--color-border-default) data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
         className
       ),
       ...props
@@ -2004,11 +2054,11 @@ var init_useBaseTokens = __esm({
 });
 
 // src/modals/CryptoSelectModal.tsx
-var import_react15, import_nice_modal_react5, import_jsx_runtime37, CryptoSelectModal;
+var import_react16, import_nice_modal_react5, import_jsx_runtime37, CryptoSelectModal;
 var init_CryptoSelectModal = __esm({
   "src/modals/CryptoSelectModal.tsx"() {
     "use strict";
-    import_react15 = require("react");
+    import_react16 = require("react");
     import_nice_modal_react5 = __toESM(require("@ebay/nice-modal-react"), 1);
     init_input();
     init_separator();
@@ -2024,8 +2074,8 @@ var init_CryptoSelectModal = __esm({
       const { isLoading, error, erc20Balances } = useBaseERC20Token();
       const { isLoadingNative, nativeError, nativeBalance } = useBaseNativeToken();
       const { tokens, tokensIsLoading } = useBaseTokens();
-      const [search, setSearch] = (0, import_react15.useState)("");
-      const filteredCoins = (0, import_react15.useMemo)(() => {
+      const [search, setSearch] = (0, import_react16.useState)("");
+      const filteredCoins = (0, import_react16.useMemo)(() => {
         return tokens.filter(
           (coin) => coin.name.toLowerCase().includes(search.toLowerCase()) || coin.symbol.toLowerCase().includes(search.toLowerCase())
         );
@@ -2187,11 +2237,11 @@ var init_SelectedCoin = __esm({
 });
 
 // src/components/CryptoTab/Crypto/Crypto.tsx
-var import_react16, import_wagmi4, import_jsx_runtime40, Crypto;
+var import_react17, import_wagmi4, import_jsx_runtime40, Crypto;
 var init_Crypto = __esm({
   "src/components/CryptoTab/Crypto/Crypto.tsx"() {
     "use strict";
-    import_react16 = require("react");
+    import_react17 = require("react");
     import_wagmi4 = require("wagmi");
     init_SpreePayActionsContext();
     init_useCryptoPayment();
@@ -2210,7 +2260,7 @@ var init_Crypto = __esm({
       const { spreePayConfig } = useSpreePayConfig();
       const isWalletConnected = Boolean(address);
       const { register } = useSpreePayRegister();
-      const handlePay = (0, import_react16.useCallback)(
+      const handlePay = (0, import_react17.useCallback)(
         async (data) => {
           try {
             const res = await cryptoPayment(data);
@@ -2224,7 +2274,7 @@ var init_Crypto = __esm({
         },
         [cryptoPayment]
       );
-      (0, import_react16.useEffect)(() => {
+      (0, import_react17.useEffect)(() => {
         register(handlePay);
       }, [register, handlePay]);
       return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: "flex flex-col items-baseline gap-4", children: [
@@ -2260,11 +2310,11 @@ function getCachedWagmiConfig(projectId, appName) {
   }
   return cfg2;
 }
-var import_react17, import_react_query, import_nice_modal_react7, import_rainbowkit2, import_styles, import_wagmi5, import_chains, import_jsx_runtime41, queryClient, CHAINS, wagmiConfigCache, CryptoWrapper;
+var import_react18, import_react_query, import_nice_modal_react7, import_rainbowkit2, import_styles, import_wagmi5, import_chains, import_jsx_runtime41, queryClient, CHAINS, wagmiConfigCache, CryptoWrapper;
 var init_CryptoWrapper = __esm({
   "src/components/CryptoTab/Crypto/CryptoWrapper.tsx"() {
     "use strict";
-    import_react17 = require("react");
+    import_react18 = require("react");
     import_react_query = require("@tanstack/react-query");
     import_nice_modal_react7 = __toESM(require("@ebay/nice-modal-react"), 1);
     import_rainbowkit2 = require("@rainbow-me/rainbowkit");
@@ -2279,7 +2329,7 @@ var init_CryptoWrapper = __esm({
     wagmiConfigCache = /* @__PURE__ */ new Map();
     CryptoWrapper = () => {
       const { spreePayConfig, configIsLoading } = useSpreePayConfig();
-      const wagmiConfig = (0, import_react17.useMemo)(() => {
+      const wagmiConfig = (0, import_react18.useMemo)(() => {
         if (!spreePayConfig) return null;
         return getCachedWagmiConfig(spreePayConfig.rainbowProjectId, spreePayConfig.rainbowAppName);
       }, [spreePayConfig]);
@@ -2466,11 +2516,11 @@ var init_Checkout = __esm({
 });
 
 // src/components/CryptoComTab/CryptoComTab.tsx
-var import_react18, import_jsx_runtime44, CryptoComTab;
+var import_react19, import_jsx_runtime44, CryptoComTab;
 var init_CryptoComTab = __esm({
   "src/components/CryptoComTab/CryptoComTab.tsx"() {
     "use strict";
-    import_react18 = require("react");
+    import_react19 = require("react");
     init_SpreePayActionsContext();
     init_useCryptoComPayment();
     init_useSpreePayConfig();
@@ -2482,7 +2532,7 @@ var init_CryptoComTab = __esm({
       const { register } = useSpreePayRegister();
       const { cryptoComPayment } = useCryptoComPayment();
       const { spreePayConfig } = useSpreePayConfig();
-      const handlePay = (0, import_react18.useCallback)(
+      const handlePay = (0, import_react19.useCallback)(
         async (data) => {
           try {
             const res = await cryptoComPayment(data);
@@ -2496,7 +2546,7 @@ var init_CryptoComTab = __esm({
         },
         [cryptoComPayment]
       );
-      (0, import_react18.useEffect)(() => {
+      (0, import_react19.useEffect)(() => {
         register(handlePay);
       }, [register, handlePay]);
       return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)("div", { className: "flex w-full flex-col gap-4 border-b border-b-(--border-component-specific-card) px-5 py-5 md:px-7 md:py-6", children: [
@@ -2535,15 +2585,15 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/SpreePay.tsx
-var import_react22 = require("react");
+var import_react23 = require("react");
 var import_nice_modal_react9 = __toESM(require("@ebay/nice-modal-react"), 1);
 var import_swr5 = require("swr");
 
 // src/SpreePayContent.tsx
-var import_react19 = require("react");
+var import_react20 = require("react");
 
 // src/components/CreditCardTab/CreditCardTab.tsx
-var import_react14 = require("react");
+var import_react15 = require("react");
 init_SpreePayActionsContext();
 init_StaticConfigContext();
 
@@ -3068,14 +3118,16 @@ var useSplitCardPayments = (mode = "web2") => {
 };
 
 // src/hooks/useCards.ts
+var import_react5 = require("react");
 var import_swr2 = __toESM(require("swr"), 1);
 init_SpreePayActionsContext();
 var URL2 = "/v1/payments/cards";
 var useCards = () => {
   const { origin } = useSpreePayEnv();
   const { data, isLoading, mutate } = (0, import_swr2.default)(origin ? `${URL2}?origin=${origin}` : URL2);
+  const cards = (0, import_react5.useMemo)(() => data?.data.filter((c) => c.active) ?? [], [data]);
   return {
-    cards: data?.data.filter((c) => c.active) || [],
+    cards,
     cardsIsLoading: isLoading,
     mutateCards: mutate
   };
@@ -3085,11 +3137,12 @@ var useCards = () => {
 init_useSlapiBalance();
 init_useSpreePayConfig();
 init_errors();
+init_payments();
 init_split();
 init_CheckoutButton();
 
 // src/components/CreditCardTab/CreditCard/CreditCard.tsx
-var import_react8 = require("react");
+var import_react9 = require("react");
 var import_react_stripe_js2 = require("@stripe/react-stripe-js");
 var import_stripe_js = require("@stripe/stripe-js");
 init_SpreePayActionsContext();
@@ -3097,12 +3150,13 @@ init_useSpreePayConfig();
 init_InfoBanner();
 
 // src/components/CreditCardTab/CreditCard/CardsList.tsx
-var import_react6 = require("react");
+var import_react7 = require("react");
 init_utils();
 init_slapi();
+init_payments();
 var import_jsx_runtime12 = require("react/jsx-runtime");
 var CardListItem = ({ card, isSelected, onSelect, onRemove }) => {
-  const [isRemoving, setIsRemoving] = (0, import_react6.useState)(false);
+  const [isRemoving, setIsRemoving] = (0, import_react7.useState)(false);
   const removeDisabled = isSelected || isRemoving;
   const handleRemove = async (e) => {
     e.stopPropagation();
@@ -3165,19 +3219,22 @@ var CardListItem = ({ card, isSelected, onSelect, onRemove }) => {
     }
   );
 };
-var CardsList = ({ selectedCard, setCard }) => {
+var CardsList = ({ selectedCard, setCard, newCards, onRemoveNewCard }) => {
   const { cards, cardsIsLoading, mutateCards } = useCards();
+  const allCards = (0, import_react7.useMemo)(() => [...cards, ...newCards], [cards, newCards]);
   const handleRemove = async (card) => {
-    if ("cardId" in card) {
+    if (isNewCard(card)) {
+      onRemoveNewCard(card);
+    } else {
       await SlapiPaymentService.removeCard({ cardId: card.id });
+      mutateCards((data) => ({ ...data, data: (data?.data ?? []).filter((c) => c.id !== card.id) }));
     }
-    mutateCards((data) => ({ ...data, data: (data?.data ?? []).filter((c) => c.id !== card.id) }));
   };
   if (cardsIsLoading) {
     return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "h-11 animate-pulse rounded-sm bg-(--s-primary)" }) });
   }
-  if (cards.length === 0) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "flex w-full flex-col gap-4", children: cards.map((card) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+  if (allCards.length === 0) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "flex w-full flex-col gap-4", children: allCards.map((card) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
     CardListItem,
     {
       isSelected: selectedCard?.id === card.id,
@@ -3190,7 +3247,7 @@ var CardsList = ({ selectedCard, setCard }) => {
 };
 
 // src/components/CreditCardTab/CreditCard/CreditCardForm.tsx
-var import_react7 = require("react");
+var import_react8 = require("react");
 var import_react_stripe_js = require("@stripe/react-stripe-js");
 
 // src/ui/button.tsx
@@ -3246,7 +3303,7 @@ function Checkbox({ className, ...props }) {
     {
       "data-slot": "checkbox",
       className: cn(
-        "peer border-input dark:bg-input/30 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-sm border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-(--primary) data-[state=checked]:bg-(--primary) data-[state=checked]:text-(--inverse) dark:data-[state=checked]:bg-(--primary)",
+        "peer border-input dark:bg-input/30 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-sm border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-(--s-brand) data-[state=checked]:bg-(--s-brand) data-[state=checked]:text-(--inverse)",
         className
       ),
       ...props,
@@ -3273,14 +3330,14 @@ var stripeElementClasses = {
   focus: "border-ring ring-ring/50 ring-2"
 };
 var CreditCardForm = ({ cancel, saveCard }) => {
-  const [cardError, setCardError] = (0, import_react7.useState)(void 0);
-  const [stripeStyles, setStripeStyles] = (0, import_react7.useState)({});
-  const [shouldSaveCard, setShouldSaveCard] = (0, import_react7.useState)(true);
-  const formRef = (0, import_react7.useRef)(null);
+  const [cardError, setCardError] = (0, import_react8.useState)(void 0);
+  const [stripeStyles, setStripeStyles] = (0, import_react8.useState)({});
+  const [shouldSaveCard, setShouldSaveCard] = (0, import_react8.useState)(true);
+  const formRef = (0, import_react8.useRef)(null);
   const elements = (0, import_react_stripe_js.useElements)();
   const stripe = (0, import_react_stripe_js.useStripe)();
-  const id = (0, import_react7.useId)();
-  const computeStripeStyles = (0, import_react7.useCallback)(() => {
+  const [id] = (0, import_react8.useState)(() => crypto.randomUUID());
+  const computeStripeStyles = (0, import_react8.useCallback)(() => {
     const formRefCurrent = formRef.current;
     if (typeof window === "undefined" || !formRefCurrent) return {};
     const container = formRefCurrent.closest(".sl-spreepay");
@@ -3301,7 +3358,7 @@ var CreditCardForm = ({ cancel, saveCard }) => {
       }
     };
   }, []);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     setStripeStyles(computeStripeStyles());
   }, [computeStripeStyles]);
   const handleSaveCard = async () => {
@@ -3404,13 +3461,12 @@ var CreditCardForm = ({ cancel, saveCard }) => {
 // src/components/CreditCardTab/CreditCard/CreditCard.tsx
 var import_jsx_runtime16 = require("react/jsx-runtime");
 var StripeWrapper = ({ onCancel, saveNewCard, publicKey }) => {
-  const stripePromise = (0, import_react8.useMemo)(() => (0, import_stripe_js.loadStripe)(publicKey), [publicKey]);
+  const stripePromise = (0, import_react9.useMemo)(() => (0, import_stripe_js.loadStripe)(publicKey), [publicKey]);
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_stripe_js2.Elements, { stripe: stripePromise, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(CreditCardForm, { cancel: onCancel, saveCard: saveNewCard }) });
 };
-var CreditCard = () => {
-  const [showForm, setShowForm] = (0, import_react8.useState)(false);
+var CreditCard = ({ newCards, setNewCards }) => {
+  const [showForm, setShowForm] = (0, import_react9.useState)(false);
   const { selectedPaymentMethod, setSelectedPaymentMethod } = useSpreePaymentMethod();
-  const { mutateCards } = useCards();
   const { spreePayConfig } = useSpreePayConfig();
   const setCard = (card) => {
     const isAlreadySelected = selectedPaymentMethod?.type === "CREDIT_CARD" /* CREDIT_CARD */ && selectedPaymentMethod.method?.id === card.id;
@@ -3421,10 +3477,16 @@ var CreditCard = () => {
     });
   };
   const saveNewCard = (newCard) => {
-    mutateCards((data) => ({ ...data, data: [...data?.data ?? [], newCard] }), { revalidate: false });
+    setNewCards((prev) => [...prev, newCard]);
     setCard(newCard);
     setShowForm(false);
   };
+  const removeNewCard = (0, import_react9.useCallback)(
+    (card) => {
+      setNewCards((prev) => prev.filter((c) => c.id !== card.id));
+    },
+    [setNewCards]
+  );
   const handleCancel = () => {
     setShowForm(false);
   };
@@ -3435,7 +3497,9 @@ var CreditCard = () => {
         CardsList,
         {
           selectedCard: selectedPaymentMethod?.type === "CREDIT_CARD" /* CREDIT_CARD */ ? selectedPaymentMethod.method : null,
-          setCard
+          setCard,
+          newCards,
+          onRemoveNewCard: removeNewCard
         }
       ),
       spreePayConfig?.creditCard.infoMessage && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(InfoBanner, { message: spreePayConfig.creditCard.infoMessage }),
@@ -3454,14 +3518,14 @@ var CreditCard = () => {
 };
 
 // src/components/CreditCardTab/Points/Points.tsx
-var import_react13 = require("react");
+var import_react14 = require("react");
 init_SpreePayActionsContext();
 init_StaticConfigContext();
 init_useSpreePayConfig();
 init_common();
 
 // src/components/CreditCardTab/Points/SplitBlock.tsx
-var import_react12 = require("react");
+var import_react13 = require("react");
 var import_airkit2 = require("@mocanetwork/airkit");
 init_SpreePayActionsContext();
 init_StaticConfigContext();
@@ -3471,7 +3535,7 @@ init_format();
 init_logger();
 
 // src/components/CreditCardTab/Points/PointsSelector.tsx
-var import_react11 = require("react");
+var import_react12 = require("react");
 init_SpreePayActionsContext();
 init_StaticConfigContext();
 init_useSlapiBalance();
@@ -3791,10 +3855,10 @@ var Primitive = NODES.reduce((primitive, node) => {
 }, {});
 
 // ../../node_modules/@radix-ui/react-collection/dist/index.mjs
-var import_react9 = __toESM(require("react"), 1);
+var import_react10 = __toESM(require("react"), 1);
 var import_react_slot3 = require("@radix-ui/react-slot");
 var import_jsx_runtime21 = require("react/jsx-runtime");
-var import_react10 = __toESM(require("react"), 1);
+var import_react11 = __toESM(require("react"), 1);
 var import_react_slot4 = require("@radix-ui/react-slot");
 var import_jsx_runtime22 = require("react/jsx-runtime");
 function createCollection(name) {
@@ -3806,14 +3870,14 @@ function createCollection(name) {
   );
   const CollectionProvider = (props) => {
     const { scope, children } = props;
-    const ref = import_react9.default.useRef(null);
-    const itemMap = import_react9.default.useRef(/* @__PURE__ */ new Map()).current;
+    const ref = import_react10.default.useRef(null);
+    const itemMap = import_react10.default.useRef(/* @__PURE__ */ new Map()).current;
     return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(CollectionProviderImpl, { scope, itemMap, collectionRef: ref, children });
   };
   CollectionProvider.displayName = PROVIDER_NAME;
   const COLLECTION_SLOT_NAME = name + "CollectionSlot";
   const CollectionSlotImpl = (0, import_react_slot3.createSlot)(COLLECTION_SLOT_NAME);
-  const CollectionSlot = import_react9.default.forwardRef(
+  const CollectionSlot = import_react10.default.forwardRef(
     (props, forwardedRef) => {
       const { scope, children } = props;
       const context = useCollectionContext(COLLECTION_SLOT_NAME, scope);
@@ -3825,13 +3889,13 @@ function createCollection(name) {
   const ITEM_SLOT_NAME = name + "CollectionItemSlot";
   const ITEM_DATA_ATTR = "data-radix-collection-item";
   const CollectionItemSlotImpl = (0, import_react_slot3.createSlot)(ITEM_SLOT_NAME);
-  const CollectionItemSlot = import_react9.default.forwardRef(
+  const CollectionItemSlot = import_react10.default.forwardRef(
     (props, forwardedRef) => {
       const { scope, children, ...itemData } = props;
-      const ref = import_react9.default.useRef(null);
+      const ref = import_react10.default.useRef(null);
       const composedRefs = useComposedRefs(forwardedRef, ref);
       const context = useCollectionContext(ITEM_SLOT_NAME, scope);
-      import_react9.default.useEffect(() => {
+      import_react10.default.useEffect(() => {
         context.itemMap.set(ref, { ref, ...itemData });
         return () => void context.itemMap.delete(ref);
       });
@@ -3841,7 +3905,7 @@ function createCollection(name) {
   CollectionItemSlot.displayName = ITEM_SLOT_NAME;
   function useCollection2(scope) {
     const context = useCollectionContext(name + "CollectionConsumer", scope);
-    const getItems = import_react9.default.useCallback(() => {
+    const getItems = import_react10.default.useCallback(() => {
       const collectionNode = context.collectionRef.current;
       if (!collectionNode) return [];
       const orderedNodes = Array.from(collectionNode.querySelectorAll(`[${ITEM_DATA_ATTR}]`));
@@ -4474,7 +4538,7 @@ var PointsSelector = (props) => {
   const maxByAmount = pointsConversionRatio && pointsConversionRatio > 0 ? (amount ?? 0) / pointsConversionRatio : 0;
   const max = Math.min(maxByAmount, balance?.availablePoints ?? 0);
   const step = 10;
-  const [splitTokens, setSplitTokens] = (0, import_react11.useState)(0);
+  const [splitTokens, setSplitTokens] = (0, import_react12.useState)(0);
   const usdAmount = getSplitAmount(amount ?? 0, splitTokens, pointsConversionRatio);
   const pointsValue = String(Math.round(splitTokens));
   const usdWithFee = usdAmount + getTransactionFee(usdAmount, transactionFeePercentage);
@@ -4572,14 +4636,14 @@ var SplitBlock = (props) => {
   const { spreePayConfig } = useSpreePayConfig();
   const { appProps } = useStaticConfig();
   const { currencyCode, exchangeRate, foreignCurrencyAmount } = appProps;
-  const [address, setAddress] = (0, import_react12.useState)(null);
-  const [walletReady, setWalletReady] = (0, import_react12.useState)(false);
+  const [address, setAddress] = (0, import_react13.useState)(null);
+  const [walletReady, setWalletReady] = (0, import_react13.useState)(false);
   const { pointsConversionRatio, pointsTitle } = spreePayConfig || {};
   const { useWeb3Points, environment } = useSpreePayEnv();
   const hasForeignCurrency = !!(currencyCode && exchangeRate && foreignCurrencyAmount);
   const formatPointsValue = (usd) => hasForeignCurrency ? formatCurrency(usd / exchangeRate, currencyCode) : formatCurrency(usd);
-  const prevPointsChainRef = (0, import_react12.useRef)(spreePayConfig?.pointsChain);
-  const initWallet = (0, import_react12.useCallback)(
+  const prevPointsChainRef = (0, import_react13.useRef)(spreePayConfig?.pointsChain);
+  const initWallet = (0, import_react13.useCallback)(
     async (pointsChain) => {
       if (!pointsChain) return;
       try {
@@ -4602,7 +4666,7 @@ var SplitBlock = (props) => {
     },
     [onToggle, environment]
   );
-  (0, import_react12.useEffect)(() => {
+  (0, import_react13.useEffect)(() => {
     if (!useWeb3Points) return;
     const pointsChainChanged = prevPointsChainRef.current !== spreePayConfig?.pointsChain;
     prevPointsChainRef.current = spreePayConfig?.pointsChain;
@@ -4632,8 +4696,8 @@ var SplitBlock = (props) => {
 // src/components/CreditCardTab/Points/Points.tsx
 var import_jsx_runtime27 = require("react/jsx-runtime");
 var Points = () => {
-  const [usePoints, setUsePoints] = (0, import_react13.useState)(false);
-  const [selectedPointsType, setSelectedPointsType] = (0, import_react13.useState)(null);
+  const [usePoints, setUsePoints] = (0, import_react14.useState)(false);
+  const [selectedPointsType, setSelectedPointsType] = (0, import_react14.useState)(null);
   const { setSelectedPaymentMethod, selectedPaymentMethod } = useSpreePaymentMethod();
   const { spreePayConfig } = useSpreePayConfig();
   const { appProps } = useStaticConfig();
@@ -4673,13 +4737,14 @@ var CreditCardTab = ({ isLoggedIn }) => {
   const { appProps } = useStaticConfig();
   const { spreePayConfig } = useSpreePayConfig();
   const { register } = useSpreePayRegister();
-  const { mutateCards } = useCards();
+  const { cards, mutateCards } = useCards();
   const { mutateBalance } = useSlapiBalance();
+  const [newCards, setNewCards] = (0, import_react15.useState)([]);
   const isWeb3Enabled = Boolean(useWeb3Points);
   const { cardPayment } = useCardPayment();
   const { splitPayment } = useSplitCardPayments(isWeb3Enabled ? "web3" : "web2");
   const { pointsPayment } = usePointsPayment(isWeb3Enabled ? "web3" : "web2");
-  const handlePay = (0, import_react14.useCallback)(
+  const handlePay = (0, import_react15.useCallback)(
     async (data) => {
       try {
         let res = null;
@@ -4699,14 +4764,24 @@ var CreditCardTab = ({ isLoggedIn }) => {
       } catch (_) {
         return Promise.reject(new PaymentError("Payment failed", "FAILED" /* FAILED */));
       } finally {
-        if ("token" in (selectedPaymentMethod.method || {})) {
-          setSelectedPaymentMethod({ ...selectedPaymentMethod, type: "CREDIT_CARD" /* CREDIT_CARD */, method: null });
-        }
-        mutateCards();
         mutateBalance();
+        if (selectedPaymentMethod.type === "CREDIT_CARD" /* CREDIT_CARD */ && selectedPaymentMethod.method && isNewCard(selectedPaymentMethod.method)) {
+          const knownIds = new Set(cards.map((c) => c.id));
+          const updated = await mutateCards();
+          const newSavedCard = (updated?.data ?? []).find((c) => c.active && !knownIds.has(c.id));
+          setSelectedPaymentMethod({
+            ...selectedPaymentMethod,
+            type: "CREDIT_CARD" /* CREDIT_CARD */,
+            method: newSavedCard ?? null
+          });
+          setNewCards([]);
+        } else {
+          mutateCards();
+        }
       }
     },
     [
+      cards,
       mutateCards,
       selectedPaymentMethod,
       pointsPayment,
@@ -4718,11 +4793,11 @@ var CreditCardTab = ({ isLoggedIn }) => {
       mutateBalance
     ]
   );
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     register(handlePay);
   }, [register, handlePay]);
   return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: "border-b border-b-(--border-component-specific-card) px-5 py-5 md:px-7 md:py-6", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(CreditCard, {}) }),
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: "border-b border-b-(--border-component-specific-card) px-5 py-5 md:px-7 md:py-6", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(CreditCard, { newCards, setNewCards }) }),
     !spreePayConfig?.creditCard.hidePoints && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: "flex flex-col gap-4 border-b border-b-(--border-component-specific-card) px-5 pt-5 pb-5 md:px-7 md:pt-6 md:pb-7", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Points, {}) }),
     /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(CheckoutButton, { isLoggedIn })
   ] });
@@ -4803,8 +4878,8 @@ var TabButtons = (props) => {
 // src/SpreePayContent.tsx
 init_SpreePayActionsContext();
 var import_jsx_runtime45 = require("react/jsx-runtime");
-var CryptoTab2 = (0, import_react19.lazy)(() => Promise.resolve().then(() => (init_CryptoTab2(), CryptoTab_exports)).then((module2) => ({ default: module2.CryptoTab })));
-var CryptoComTab2 = (0, import_react19.lazy)(
+var CryptoTab2 = (0, import_react20.lazy)(() => Promise.resolve().then(() => (init_CryptoTab2(), CryptoTab_exports)).then((module2) => ({ default: module2.CryptoTab })));
+var CryptoComTab2 = (0, import_react20.lazy)(
   () => Promise.resolve().then(() => (init_CryptoComTab2(), CryptoComTab_exports)).then((module2) => ({ default: module2.CryptoComTab }))
 );
 var TabLoadingFallback = () => /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "flex items-center justify-center px-5 py-8 md:px-7", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "flex flex-col items-center gap-3", children: [
@@ -4819,7 +4894,7 @@ var SpreePayContent = ({ isLoggedIn }) => {
       /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(TabButtons, { value: selectedPaymentMethod.type, onChange: setSelectedPaymentMethod })
     ] }),
     selectedPaymentMethod.type === "CREDIT_CARD" /* CREDIT_CARD */ && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CreditCardTab, { isLoggedIn }),
-    /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(import_react19.Suspense, { fallback: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(TabLoadingFallback, {}), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(import_react20.Suspense, { fallback: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(TabLoadingFallback, {}), children: [
       selectedPaymentMethod.type === "CRYPTO" /* CRYPTO */ && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CryptoTab2, { isLoggedIn }),
       selectedPaymentMethod.type === "CDC" /* CDC */ && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CryptoComTab2, {})
     ] })
@@ -4827,10 +4902,11 @@ var SpreePayContent = ({ isLoggedIn }) => {
 };
 
 // src/components/ErrorBoundary.tsx
-var import_react20 = require("react");
+var import_react21 = require("react");
+init_utils();
 init_logger();
 var import_jsx_runtime46 = require("react/jsx-runtime");
-var ErrorBoundary = class extends import_react20.Component {
+var ErrorBoundary = class extends import_react21.Component {
   constructor(props) {
     super(props);
     this.state = { hasError: false, error: null };
@@ -4848,8 +4924,8 @@ var ErrorBoundary = class extends import_react20.Component {
       if (this.props.fallback) {
         return this.props.fallback;
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("div", { className: "flex w-full flex-col items-center justify-center rounded-3xl border border-(--b-inverse) bg-(--s-primary) p-8", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "mb-4 flex size-12 items-center justify-center rounded-full bg-(--s-secondary)", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
+      return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: cn("sl-spreepay", this.props.className), children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("div", { className: "flex w-full flex-col items-center justify-center rounded-3xl border border-(--border-component-specific-card) bg-(--surface-component-specific-card-default-card) p-8 shadow-[0_6.25px_25px_0_var(--shadow-component-specific-card)]", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "mb-4 flex size-12 items-center justify-center rounded-full bg-(--s-warning-subtle)", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
           "svg",
           {
             xmlns: "http://www.w3.org/2000/svg",
@@ -4867,9 +4943,9 @@ var ErrorBoundary = class extends import_react20.Component {
             ]
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("h3", { className: "mb-2 text-lg font-semibold text-(--primary)", children: "Payment Widget Error" }),
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("p", { className: "text-center text-sm text-(--secondary)", children: "Something went wrong loading the payment widget. Please refresh the page and try again." })
-      ] });
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("h3", { className: "mb-2 text-lg font-semibold text-(--brand-primary)", children: "Payment Widget Error" }),
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("p", { className: "text-center text-sm text-(--text-tertiary)", children: "Something went wrong loading the payment widget. Please refresh the page and try again." })
+      ] }) });
     }
     return this.props.children;
   }
@@ -4881,22 +4957,22 @@ init_StaticConfigContext();
 init_client();
 
 // src/hooks/useKeycloakSSO.ts
-var import_react21 = require("react");
+var import_react22 = require("react");
 var import_keycloak_js = __toESM(require("keycloak-js"), 1);
 init_logger();
 var refreshAheadSeconds = 60;
 var keycloakLogger = logger.child("keycloak");
 function useKeycloakSSO(config2) {
   const { url, realm, clientId, ssoPageURI, enabled } = config2;
-  const initRef = (0, import_react21.useRef)(false);
-  const kcRef = (0, import_react21.useRef)(null);
-  const refreshTimerRef = (0, import_react21.useRef)(null);
-  const scheduleRefreshRef = (0, import_react21.useRef)(() => {
+  const initRef = (0, import_react22.useRef)(false);
+  const kcRef = (0, import_react22.useRef)(null);
+  const refreshTimerRef = (0, import_react22.useRef)(null);
+  const scheduleRefreshRef = (0, import_react22.useRef)(() => {
   });
-  const [error, setError] = (0, import_react21.useState)(null);
-  const [isChecking, setIsChecking] = (0, import_react21.useState)(enabled);
-  const [accessToken, setAccessToken] = (0, import_react21.useState)(null);
-  const scheduleRefresh = (0, import_react21.useCallback)(() => {
+  const [error, setError] = (0, import_react22.useState)(null);
+  const [isChecking, setIsChecking] = (0, import_react22.useState)(enabled);
+  const [accessToken, setAccessToken] = (0, import_react22.useState)(null);
+  const scheduleRefresh = (0, import_react22.useCallback)(() => {
     const kc = kcRef.current;
     if (!kc || !kc.tokenParsed || !kc.tokenParsed.exp) {
       return;
@@ -4920,10 +4996,10 @@ function useKeycloakSSO(config2) {
       });
     }, delayMs);
   }, []);
-  (0, import_react21.useEffect)(() => {
+  (0, import_react22.useEffect)(() => {
     scheduleRefreshRef.current = scheduleRefresh;
   }, [scheduleRefresh]);
-  (0, import_react21.useEffect)(() => {
+  (0, import_react22.useEffect)(() => {
     if (initRef.current || !enabled) return;
     initRef.current = true;
     const kc = new import_keycloak_js.default({ url, realm, clientId });
@@ -4960,30 +5036,44 @@ function useKeycloakSSO(config2) {
 init_utils();
 init_portal();
 init_logger();
+
+// src/utils/token.ts
+var import_jwt_decode = require("jwt-decode");
+var isTokenExpired = (token) => {
+  try {
+    const { exp } = (0, import_jwt_decode.jwtDecode)(token);
+    return typeof exp === "number" && exp < Math.floor(Date.now() / 1e3);
+  } catch {
+    return true;
+  }
+};
+
+// src/SpreePay.tsx
 var import_jsx_runtime47 = require("react/jsx-runtime");
 var SpreePayInner = () => {
-  const [portalEl, setPortalEl] = (0, import_react22.useState)(null);
-  const rootRef = (0, import_react22.useCallback)((node) => {
+  const [portalEl, setPortalEl] = (0, import_react23.useState)(null);
+  const rootRef = (0, import_react23.useCallback)((node) => {
     if (!node) return;
     const el = node.querySelector(":scope > .sl-spreepay__portal");
     setPortalEl(el ?? null);
   }, []);
   const { environment, tenantId, keycloakClientId, accessToken: envAccessToken, ssoPageURI } = useSpreePayEnv();
-  (0, import_react22.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     configureLogger({ environment });
     logger.logVersion();
   }, [environment]);
   const { staticConfig, appProps } = useStaticConfig();
+  const envTokenValid = Boolean(envAccessToken && !isTokenExpired(envAccessToken));
   const { isChecking, accessToken } = useKeycloakSSO({
     realm: tenantId,
     url: staticConfig.keycloakUrl,
     clientId: keycloakClientId ?? "oneof-next",
     ssoPageURI,
-    enabled: !envAccessToken
+    enabled: !envTokenValid
   });
-  const _accessToken = envAccessToken ?? accessToken;
-  const unauthenticatedFetcher = (0, import_react22.useCallback)(() => Promise.resolve(null), []);
-  const slapiFetcher = (0, import_react22.useMemo)(() => {
+  const _accessToken = envTokenValid ? envAccessToken : accessToken;
+  const unauthenticatedFetcher = (0, import_react23.useCallback)(() => Promise.resolve(null), []);
+  const slapiFetcher = (0, import_react23.useMemo)(() => {
     if (_accessToken) {
       return registerApi({
         accessToken: _accessToken,
@@ -5019,13 +5109,13 @@ var SpreePayInner = () => {
   ] });
 };
 var SpreePay = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(ErrorBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(StaticConfigProvider, { props, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SpreePayInner, {}) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(ErrorBoundary, { className: props.className, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(StaticConfigProvider, { props, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SpreePayInner, {}) }) });
 };
 
 // src/hooks/useCapture3DS.ts
-var import_react23 = require("react");
+var import_react24 = require("react");
 var useCapture3DS = (searchParams) => {
-  (0, import_react23.useEffect)(() => {
+  (0, import_react24.useEffect)(() => {
     if (typeof window !== "undefined" && window.parent && searchParams?.paymentIntent) {
       window.parent.SP_EVENT_BUS?.emit("paymentIntent", { paymentIntent: searchParams.paymentIntent });
     }