@pelcro/react-pelcro-js 2.7.0-beta.13 → 2.7.0-beta.14

package/dist/index.cjs.js

@@ -5984,13 +5984,8 @@ class PelcroActions {
     });
 
     _defineProperty$3(this, "switchView", view => {
-      var _window$Pelcro$site$r, _window$Pelcro$site$r2, _window$Pelcro$user$r, _window$Pelcro$user$r2;
-
-      const isEmailVerificationEnabled = (_window$Pelcro$site$r = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.email_verify_enabled) !== null && _window$Pelcro$site$r !== void 0 ? _window$Pelcro$site$r : false;
-      const isUserEmailVerified = (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.email_confirm) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : false;
-      const userMustVerifyEmail = this.get().isAuthenticated() && isEmailVerificationEnabled && !isUserEmailVerified; // view switching guards
-
-      if (userMustVerifyEmail && !["dashboard", "meter", "login", null].includes(view)) {
+      // view switching guards
+      if (userMustVerifyEmail() && !["dashboard", "meter", "login", null].includes(view)) {
         return this.set({
           view: "email-verify"
         });
@@ -6656,6 +6651,13 @@ function getDateWithoutTime(dateObject) {
   date.setHours(0, 0, 0, 0);
   return date;
 }
+function userMustVerifyEmail() {
+  var _window$Pelcro$site$r3, _window$Pelcro$site$r4, _window$Pelcro$user$r9, _window$Pelcro$user$r10;
+
+  const isEmailVerificationEnabled = (_window$Pelcro$site$r3 = (_window$Pelcro$site$r4 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r4 === void 0 ? void 0 : _window$Pelcro$site$r4.email_verify_enabled) !== null && _window$Pelcro$site$r3 !== void 0 ? _window$Pelcro$site$r3 : false;
+  const isUserEmailVerified = (_window$Pelcro$user$r9 = (_window$Pelcro$user$r10 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r10 === void 0 ? void 0 : _window$Pelcro$user$r10.email_confirm) !== null && _window$Pelcro$user$r9 !== void 0 ? _window$Pelcro$user$r9 : false;
+  return window.Pelcro.user.isAuthenticated() && isEmailVerificationEnabled && !isUserEmailVerified;
+}
 
 const resources = {
   en: {
@@ -6859,11 +6861,18 @@ class SaveToMetadataButtonClass {
 
         const button = event.currentTarget;
         const user = window.Pelcro.user.read();
+        const {
+          switchView
+        } = usePelcro.getStore();
         const {
           key,
           ...buttonMetadata
         } = button.dataset;
 
+        if (userMustVerifyEmail()) {
+          return switchView("email-verify");
+        }
+
         if (_classPrivateFieldGet(this, _isAlreadySaved).call(this, button)) {
           _classPrivateFieldGet(this, _removeMetaData).call(this, event);
 
@@ -10941,15 +10950,21 @@ function RegisterModal(props) {
   };
 
   const handleAfterRegistrationLogic = () => {
-    var _ReactGA$event;
+    var _ReactGA$event, _window$Pelcro$site$r, _window$Pelcro$site$r2;
 
     ReactGA === null || ReactGA === void 0 ? void 0 : (_ReactGA$event = ReactGA.event) === null || _ReactGA$event === void 0 ? void 0 : _ReactGA$event.call(ReactGA, {
       category: "ACTIONS",
       action: "Registered",
       nonInteraction: true
-    }); // If product and plan are not selected
+    });
+    const isEmailVerificationEnabled = (_window$Pelcro$site$r = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.email_verify_enabled) !== null && _window$Pelcro$site$r !== void 0 ? _window$Pelcro$site$r : false;
+
+    if (isEmailVerificationEnabled) {
+      return switchView("email-verify");
+    }
 
     if (!product && !order && !giftCode) {
+      // If product and plan are not selected
       return resetView();
     } // If this is a redeem gift
 
@@ -21450,12 +21465,20 @@ const SubscriptionsItems = ({
   const {
     t
   } = useTranslation("dashboard");
+  const {
+    switchView,
+    isAuthenticated
+  } = usePelcro();
   const subs = getNonDonationSubs();
   if (subs.length === 0) return null;
   return subs.sort((a, b) => a.expires_at - b.expires_at).sort((a, b) => a.renews_at - b.renews_at).map(sub => {
     const isActive = activeMenu === sub.id; // Cancel button click handlers
 
     const onCancelClick = () => {
+      if (userMustVerifyEmail()) {
+        return switchView("email-verify");
+      }
+
       onClose === null || onClose === void 0 ? void 0 : onClose();
       notify.confirm((onSuccess, onFailure) => {
         cancelSubscription(sub.id, onSuccess, onFailure);
@@ -21471,6 +21494,10 @@ const SubscriptionsItems = ({
 
 
     const onReactivateClick = () => {
+      if (userMustVerifyEmail()) {
+        return switchView("email-verify");
+      }
+
       reactivateSubscription(sub.id);
     }; // Renew click
 

package/dist/index.esm.js

@@ -5954,13 +5954,8 @@ class PelcroActions {
     });
 
     _defineProperty$3(this, "switchView", view => {
-      var _window$Pelcro$site$r, _window$Pelcro$site$r2, _window$Pelcro$user$r, _window$Pelcro$user$r2;
-
-      const isEmailVerificationEnabled = (_window$Pelcro$site$r = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.email_verify_enabled) !== null && _window$Pelcro$site$r !== void 0 ? _window$Pelcro$site$r : false;
-      const isUserEmailVerified = (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.email_confirm) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : false;
-      const userMustVerifyEmail = this.get().isAuthenticated() && isEmailVerificationEnabled && !isUserEmailVerified; // view switching guards
-
-      if (userMustVerifyEmail && !["dashboard", "meter", "login", null].includes(view)) {
+      // view switching guards
+      if (userMustVerifyEmail() && !["dashboard", "meter", "login", null].includes(view)) {
         return this.set({
           view: "email-verify"
         });
@@ -6626,6 +6621,13 @@ function getDateWithoutTime(dateObject) {
   date.setHours(0, 0, 0, 0);
   return date;
 }
+function userMustVerifyEmail() {
+  var _window$Pelcro$site$r3, _window$Pelcro$site$r4, _window$Pelcro$user$r9, _window$Pelcro$user$r10;
+
+  const isEmailVerificationEnabled = (_window$Pelcro$site$r3 = (_window$Pelcro$site$r4 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r4 === void 0 ? void 0 : _window$Pelcro$site$r4.email_verify_enabled) !== null && _window$Pelcro$site$r3 !== void 0 ? _window$Pelcro$site$r3 : false;
+  const isUserEmailVerified = (_window$Pelcro$user$r9 = (_window$Pelcro$user$r10 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r10 === void 0 ? void 0 : _window$Pelcro$user$r10.email_confirm) !== null && _window$Pelcro$user$r9 !== void 0 ? _window$Pelcro$user$r9 : false;
+  return window.Pelcro.user.isAuthenticated() && isEmailVerificationEnabled && !isUserEmailVerified;
+}
 
 const resources = {
   en: {
@@ -6829,11 +6831,18 @@ class SaveToMetadataButtonClass {
 
         const button = event.currentTarget;
         const user = window.Pelcro.user.read();
+        const {
+          switchView
+        } = usePelcro.getStore();
         const {
           key,
           ...buttonMetadata
         } = button.dataset;
 
+        if (userMustVerifyEmail()) {
+          return switchView("email-verify");
+        }
+
         if (_classPrivateFieldGet(this, _isAlreadySaved).call(this, button)) {
           _classPrivateFieldGet(this, _removeMetaData).call(this, event);
 
@@ -10911,15 +10920,21 @@ function RegisterModal(props) {
   };
 
   const handleAfterRegistrationLogic = () => {
-    var _ReactGA$event;
+    var _ReactGA$event, _window$Pelcro$site$r, _window$Pelcro$site$r2;
 
     ReactGA === null || ReactGA === void 0 ? void 0 : (_ReactGA$event = ReactGA.event) === null || _ReactGA$event === void 0 ? void 0 : _ReactGA$event.call(ReactGA, {
       category: "ACTIONS",
       action: "Registered",
       nonInteraction: true
-    }); // If product and plan are not selected
+    });
+    const isEmailVerificationEnabled = (_window$Pelcro$site$r = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.email_verify_enabled) !== null && _window$Pelcro$site$r !== void 0 ? _window$Pelcro$site$r : false;
+
+    if (isEmailVerificationEnabled) {
+      return switchView("email-verify");
+    }
 
     if (!product && !order && !giftCode) {
+      // If product and plan are not selected
       return resetView();
     } // If this is a redeem gift
 
@@ -21420,12 +21435,20 @@ const SubscriptionsItems = ({
   const {
     t
   } = useTranslation("dashboard");
+  const {
+    switchView,
+    isAuthenticated
+  } = usePelcro();
   const subs = getNonDonationSubs();
   if (subs.length === 0) return null;
   return subs.sort((a, b) => a.expires_at - b.expires_at).sort((a, b) => a.renews_at - b.renews_at).map(sub => {
     const isActive = activeMenu === sub.id; // Cancel button click handlers
 
     const onCancelClick = () => {
+      if (userMustVerifyEmail()) {
+        return switchView("email-verify");
+      }
+
       onClose === null || onClose === void 0 ? void 0 : onClose();
       notify.confirm((onSuccess, onFailure) => {
         cancelSubscription(sub.id, onSuccess, onFailure);
@@ -21441,6 +21464,10 @@ const SubscriptionsItems = ({
 
 
     const onReactivateClick = () => {
+      if (userMustVerifyEmail()) {
+        return switchView("email-verify");
+      }
+
       reactivateSubscription(sub.id);
     }; // Renew click
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pelcro/react-pelcro-js",
   "description": "Pelcro's React UI Elements",
-  "version": "2.7.0-beta.13",
+  "version": "2.7.0-beta.14",
   "license": "MIT",
   "private": false,
   "main": "dist/index.cjs.js",