@superlogic/spree-pay 0.1.20 → 0.1.21

package/build/index.cjs

@@ -747,7 +747,8 @@ async function createAndInit(opts) {
       chain: opts.mocaChain,
       account: address
     }) : null;
-    return { walletReady: true, address, walletClient, air, chain: opts.mocaChain };
+    const walletReady = Boolean(address && walletClient);
+    return { walletReady, address, walletClient, air, chain: opts.mocaChain };
   } catch (e) {
     const msg = e instanceof Error ? e.message : "Unknown error during AirWallet initialization";
     return { walletReady: false, address: null, walletClient: null, air: null, chain: null, error: msg };
@@ -755,6 +756,10 @@ async function createAndInit(opts) {
 }
 async function getAirWallet(options) {
   const key = optionsKey(options);
+  if (cachedKey === key && singletonState && !singletonState.walletReady) {
+    singletonState = null;
+    initPromise = null;
+  }
   if (singletonState && cachedKey === key) return singletonState;
   if (initPromise && cachedKey === key) return initPromise;
   cachedKey = key;
@@ -2282,7 +2287,7 @@ function Slider2({
 // src/components/CreditCardTab/Points/PointsSelector.tsx
 var import_jsx_runtime24 = require("react/jsx-runtime");
 var PointsSelector = (props) => {
-  const { isSelected, onSelect, children } = props;
+  const { isDisabled, isSelected, onSelect, children } = props;
   const { balance } = useSlapiBalance();
   const { selectedPaymentMethod, setSelectedPaymentMethod } = useSpreePaymentMethod();
   const { appProps, staticConfig } = useStaticConfig();
@@ -2297,9 +2302,11 @@ var PointsSelector = (props) => {
   return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
     "button",
     {
+      disabled: isDisabled,
       onClick: onSelect,
       className: cn("bg-primary/8 cursor-pointer overflow-hidden rounded-md border-1 border-transparent", {
-        "border-primary": isSelected
+        "border-primary": isSelected,
+        "cursor-not-allowed opacity-50": isDisabled
       }),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: cn("flex h-11 w-full", { "bg-black/4": isSelected }), children: [
@@ -2350,30 +2357,38 @@ var PointsSelector = (props) => {
 // src/components/CreditCardTab/Points/SplitBlock.tsx
 var import_jsx_runtime25 = require("react/jsx-runtime");
 var SplitBlock = (props) => {
-  const { isSelected, onSelect } = props;
+  const { onToggle, isSelected, onSelect } = props;
   const { balance, isBalanceLoading } = useSlapiBalance();
   const { spreePayConfig } = useSpreePayConfig();
   const [address, setAddress] = (0, import_react11.useState)(null);
+  const [walletReady, setWalletReady] = (0, import_react11.useState)(false);
   const { staticConfig } = useStaticConfig();
   const { pointsConversionRatio, pointsTitle } = staticConfig;
-  const initWallet = (0, import_react11.useCallback)(async (pointsChain) => {
-    if (!pointsChain) {
-      return;
-    }
-    try {
-      const res = await getAirWallet({
-        mocaChain: pointsChain.mocaChain,
-        partnerId: pointsChain.partnerId
-      });
-      setAddress(res.address ?? null);
-    } catch (e) {
-      console.error("Air Wallet init failed:", e);
-    }
-  }, []);
+  const initWallet = (0, import_react11.useCallback)(
+    async (pointsChain) => {
+      if (!pointsChain) return;
+      try {
+        const res = await getAirWallet({
+          mocaChain: pointsChain.mocaChain,
+          partnerId: pointsChain.partnerId
+        });
+        setAddress(res.address ?? null);
+        setWalletReady(res.walletReady);
+        if (!res.walletReady && res.error) {
+          onToggle(false);
+        }
+      } catch (e) {
+        console.error("Air Wallet init failed:", e);
+      }
+    },
+    [onToggle]
+  );
   (0, import_react11.useEffect)(() => {
+    setAddress(null);
+    setWalletReady(false);
     initWallet(spreePayConfig?.pointsChain);
-  }, [spreePayConfig, initWallet]);
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "flex flex-col gap-1", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(PointsSelector, { onSelect: () => onSelect("air"), isSelected, children: [
+  }, [spreePayConfig?.pointsChain, initWallet]);
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "flex flex-col gap-1", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(PointsSelector, { isDisabled: !walletReady, onSelect: () => onSelect("air"), isSelected, children: [
     /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "flex items-center gap-2", children: balance?.availablePoints ? /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("p", { className: "text-sm font-medium text-black", children: [
       /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { className: "text-black/50", children: "Available" }),
       " ",
@@ -2402,7 +2417,14 @@ var Points = () => {
   };
   return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(import_jsx_runtime26.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(PointsSwitch, { disabled: !spreePayConfig?.creditCard.enabled, value: usePoints, onChange: handleTogglePoints }),
-    usePoints && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(SplitBlock, { isSelected: selectedPointsType === "air", onSelect: setSelectedPointsType })
+    usePoints && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+      SplitBlock,
+      {
+        onToggle: handleTogglePoints,
+        isSelected: selectedPointsType === "air",
+        onSelect: setSelectedPointsType
+      }
+    )
   ] });
 };
 

package/build/index.js

@@ -707,7 +707,8 @@ async function createAndInit(opts) {
       chain: opts.mocaChain,
       account: address
     }) : null;
-    return { walletReady: true, address, walletClient, air, chain: opts.mocaChain };
+    const walletReady = Boolean(address && walletClient);
+    return { walletReady, address, walletClient, air, chain: opts.mocaChain };
   } catch (e) {
     const msg = e instanceof Error ? e.message : "Unknown error during AirWallet initialization";
     return { walletReady: false, address: null, walletClient: null, air: null, chain: null, error: msg };
@@ -715,6 +716,10 @@ async function createAndInit(opts) {
 }
 async function getAirWallet(options) {
   const key = optionsKey(options);
+  if (cachedKey === key && singletonState && !singletonState.walletReady) {
+    singletonState = null;
+    initPromise = null;
+  }
   if (singletonState && cachedKey === key) return singletonState;
   if (initPromise && cachedKey === key) return initPromise;
   cachedKey = key;
@@ -2242,7 +2247,7 @@ function Slider2({
 // src/components/CreditCardTab/Points/PointsSelector.tsx
 import { jsx as jsx24, jsxs as jsxs12 } from "react/jsx-runtime";
 var PointsSelector = (props) => {
-  const { isSelected, onSelect, children } = props;
+  const { isDisabled, isSelected, onSelect, children } = props;
   const { balance } = useSlapiBalance();
   const { selectedPaymentMethod, setSelectedPaymentMethod } = useSpreePaymentMethod();
   const { appProps, staticConfig } = useStaticConfig();
@@ -2257,9 +2262,11 @@ var PointsSelector = (props) => {
   return /* @__PURE__ */ jsxs12(
     "button",
     {
+      disabled: isDisabled,
       onClick: onSelect,
       className: cn("bg-primary/8 cursor-pointer overflow-hidden rounded-md border-1 border-transparent", {
-        "border-primary": isSelected
+        "border-primary": isSelected,
+        "cursor-not-allowed opacity-50": isDisabled
       }),
       children: [
         /* @__PURE__ */ jsxs12("div", { className: cn("flex h-11 w-full", { "bg-black/4": isSelected }), children: [
@@ -2310,30 +2317,38 @@ var PointsSelector = (props) => {
 // src/components/CreditCardTab/Points/SplitBlock.tsx
 import { jsx as jsx25, jsxs as jsxs13 } from "react/jsx-runtime";
 var SplitBlock = (props) => {
-  const { isSelected, onSelect } = props;
+  const { onToggle, isSelected, onSelect } = props;
   const { balance, isBalanceLoading } = useSlapiBalance();
   const { spreePayConfig } = useSpreePayConfig();
   const [address, setAddress] = useState9(null);
+  const [walletReady, setWalletReady] = useState9(false);
   const { staticConfig } = useStaticConfig();
   const { pointsConversionRatio, pointsTitle } = staticConfig;
-  const initWallet = useCallback4(async (pointsChain) => {
-    if (!pointsChain) {
-      return;
-    }
-    try {
-      const res = await getAirWallet({
-        mocaChain: pointsChain.mocaChain,
-        partnerId: pointsChain.partnerId
-      });
-      setAddress(res.address ?? null);
-    } catch (e) {
-      console.error("Air Wallet init failed:", e);
-    }
-  }, []);
+  const initWallet = useCallback4(
+    async (pointsChain) => {
+      if (!pointsChain) return;
+      try {
+        const res = await getAirWallet({
+          mocaChain: pointsChain.mocaChain,
+          partnerId: pointsChain.partnerId
+        });
+        setAddress(res.address ?? null);
+        setWalletReady(res.walletReady);
+        if (!res.walletReady && res.error) {
+          onToggle(false);
+        }
+      } catch (e) {
+        console.error("Air Wallet init failed:", e);
+      }
+    },
+    [onToggle]
+  );
   useEffect6(() => {
+    setAddress(null);
+    setWalletReady(false);
     initWallet(spreePayConfig?.pointsChain);
-  }, [spreePayConfig, initWallet]);
-  return /* @__PURE__ */ jsx25("div", { className: "flex flex-col gap-1", children: /* @__PURE__ */ jsxs13(PointsSelector, { onSelect: () => onSelect("air"), isSelected, children: [
+  }, [spreePayConfig?.pointsChain, initWallet]);
+  return /* @__PURE__ */ jsx25("div", { className: "flex flex-col gap-1", children: /* @__PURE__ */ jsxs13(PointsSelector, { isDisabled: !walletReady, onSelect: () => onSelect("air"), isSelected, children: [
     /* @__PURE__ */ jsx25("div", { className: "flex items-center gap-2", children: balance?.availablePoints ? /* @__PURE__ */ jsxs13("p", { className: "text-sm font-medium text-black", children: [
       /* @__PURE__ */ jsx25("span", { className: "text-black/50", children: "Available" }),
       " ",
@@ -2362,7 +2377,14 @@ var Points = () => {
   };
   return /* @__PURE__ */ jsxs14(Fragment3, { children: [
     /* @__PURE__ */ jsx26(PointsSwitch, { disabled: !spreePayConfig?.creditCard.enabled, value: usePoints, onChange: handleTogglePoints }),
-    usePoints && /* @__PURE__ */ jsx26(SplitBlock, { isSelected: selectedPointsType === "air", onSelect: setSelectedPointsType })
+    usePoints && /* @__PURE__ */ jsx26(
+      SplitBlock,
+      {
+        onToggle: handleTogglePoints,
+        isSelected: selectedPointsType === "air",
+        onSelect: setSelectedPointsType
+      }
+    )
   ] });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superlogic/spree-pay",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Spree-pay React component and utilities",
   "private": false,
   "type": "module",