@stokr/components-library 3.0.18 → 3.0.19

package/dist/components/ConfirmModal/ConfirmModal.js

@@ -91,15 +91,6 @@ const ConfirmModalComponent = ({
           }) }) : /* @__PURE__ */ jsxs(ComponentWrapper, { noPaddingHorizontal: true, flex: true, style: { gap: 16 }, children: [
             showCancel && /* @__PURE__ */ jsx(Button, { outlineBlack: true, minWidth: "120px", onClick: handleCancel, ...cancelButtonProps, children: cancelText }),
             /* @__PURE__ */ jsx(Button, { minWidth: "120px", onClick: () => handleConfirm(true), ...buttonProps, children: confirmText })
-          ] }),
-          message && /* @__PURE__ */ jsx("p", { children: message }),
-          content && /* @__PURE__ */ jsx("div", { style: { marginTop: "16px" }, children: content }),
-          renderFooter ? /* @__PURE__ */ jsx(ComponentWrapper, { children: renderFooter({
-            onConfirm: handleConfirm,
-            onCancel: handleCancel
-          }) }) : /* @__PURE__ */ jsxs(ComponentWrapper, { noPaddingHorizontal: true, flex: true, style: { gap: 16 }, children: [
-            showCancel && /* @__PURE__ */ jsx(Button, { outlineBlack: true, minWidth: "120px", onClick: handleCancel, ...cancelButtonProps, children: cancelText }),
-            /* @__PURE__ */ jsx(Button, { minWidth: "120px", onClick: () => handleConfirm(true), ...buttonProps, children: confirmText })
           ] })
         ] }) }),
         showRedBar && /* @__PURE__ */ jsx(RedBar, { barColor, style: barStyle })

package/dist/context/AuthContext.js

@@ -280,6 +280,7 @@ class AuthProviderClass extends Component {
   logoutUser = async (redirect = false, options = {}) => {
     console.log("🚀 ~ file: AuthContext.js:303 ~ logoutUser ~ redirect:", redirect);
     this.clearCookieExpiryTimer();
+    this.clearInactivityTimer();
     try {
       const auth = getFirebaseAuth();
       if (auth) signOut(auth).then(() => {
@@ -712,30 +713,23 @@ class AuthProviderClass extends Component {
         },
         children: [
           children,
-          this.state.loggedOutDueToInactivity && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
-            ConfirmModalComponent,
-            {
-              isOpen: true,
-              maxWidth: "600px",
-              confirmText: "OK",
-              onCancel: this.clearLoggedOutDueToInactivity,
-              onConfirm: this.clearLoggedOutDueToInactivity,
-              showRedBar: true,
-              title: "Session expired",
-              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: "You have been logged out due to inactivity." }) })
-            }
-          ),
-          this.state.loggedOutDueToCookieExpiry && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
+          (this.state.loggedOutDueToInactivity || this.state.loggedOutDueToCookieExpiry) && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
             ConfirmModalComponent,
             {
               isOpen: true,
               maxWidth: "600px",
               confirmText: "OK",
-              onCancel: this.clearLoggedOutDueToCookieExpiry,
-              onConfirm: this.clearLoggedOutDueToCookieExpiry,
+              onCancel: () => {
+                this.clearLoggedOutDueToInactivity();
+                this.clearLoggedOutDueToCookieExpiry();
+              },
+              onConfirm: () => {
+                this.clearLoggedOutDueToInactivity();
+                this.clearLoggedOutDueToCookieExpiry();
+              },
               showRedBar: true,
               title: "Session expired",
-              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: "Your session has expired. Please log in again." }) })
+              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: this.state.loggedOutDueToInactivity ? "You have been logged out due to inactivity." : "Your session has expired. Please log in again." }) })
             }
           )
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stokr/components-library",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "description": "STOKR - Components Library",
   "author": "Bilal Hodzic <bilal@stokr.io>",
   "license": "MIT",