@anker-in/shopify-react 0.1.1-beta.4 → 0.1.1-beta.5

package/dist/index.mjs

@@ -1391,8 +1391,6 @@ var useCartAttributes = ({
     memberSetting,
     cart
   });
-  console.log("memberSetting", memberSetting);
-  console.log("hasPlusMember", hasPlusMember);
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
@@ -2712,15 +2710,14 @@ var usePlusMemberCheckoutCustomAttributes = ({
   }, [deliveryCustomData, product, profile, userType, variant, isShowShippingBenefits]);
 };
 function useAutoRemovePlusMemberInCart({
-  metafields,
-  isMonthlyPlus,
-  isAnnualPlus
+  cart,
+  profile,
+  memberSetting
 }) {
-  const { plus_monthly_product, plus_annual_product } = metafields || {};
-  const { cart } = useCartContext();
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   useEffect(() => {
-    if (!cart) return;
+    if (!cart || !plus_monthly_product || !plus_annual_product) return;
     const removePlusProduct = async (productType) => {
       if (!productType) return;
       const product = cart.lineItems?.find(
@@ -2732,33 +2729,25 @@ function useAutoRemovePlusMemberInCart({
         });
       }
     };
-    if (isMonthlyPlus) {
+    if (profile?.isMonthlyPlus) {
       removePlusProduct(plus_monthly_product);
     }
-    if (isAnnualPlus) {
+    if (profile?.isAnnualPlus) {
       removePlusProduct(plus_annual_product);
     }
-  }, [
-    cart,
-    plus_annual_product,
-    plus_monthly_product,
-    isAnnualPlus,
-    isMonthlyPlus,
-    removeCartLines2
-  ]);
+  }, [cart, plus_annual_product, plus_monthly_product, profile, removeCartLines2]);
 }
 function useAddPlusMemberProductsToCart({
   cart,
-  memberSetting,
-  selectedPlusMemberMode,
-  selectedPlusMemberProduct
+  profile
 }) {
+  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
   const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
-    cart,
-    memberSetting
+    memberSetting: plusMemberMetafields,
+    cart
   });
   const plusMemberProduct = useMemo(() => {
-    if (selectedPlusMemberMode === "free" /* FREE */) {
+    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
       return void 0;
     }
     if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
@@ -2767,7 +2756,10 @@ function useAddPlusMemberProductsToCart({
     if (selectedPlusMemberMode === "annual" /* ANNUAL */ && hasAnnualPlus) {
       return void 0;
     }
-    if (!selectedPlusMemberProduct) {
+    if (profile.isMonthlyPlus && selectedPlusMemberMode === "monthly" /* MONTHLY */) {
+      return void 0;
+    }
+    if (!profile.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
       return void 0;
     }
     return selectedPlusMemberProduct;