@stokr/components-library 3.0.34 → 3.0.36

package/dist/components/Footer/FooterMenu.js

@@ -67,7 +67,7 @@ const FooterMenu = ({
         /* @__PURE__ */ jsx(Title, { collapse: group.collapse, children: group.name }),
         isMobile && !group.social && /* @__PURE__ */ jsx(ArrowDown, { isOpened: activeGroups[groupKey] })
       ] }),
-      /* @__PURE__ */ jsx(CollapseWrapper, { collapse: isMobile && group.collapse, isOpened: activeGroups[groupKey], children: /* @__PURE__ */ jsx(Items, { social: group.social, children: group.social ? /* @__PURE__ */ jsx(SocialLinksContainer, { children: group.items.map((item) => /* @__PURE__ */ jsx(Item, { social: true, children: /* @__PURE__ */ jsx(SocialLink, { href: item.url, alt: item.name, target: "_blank", rel: "noopener noreferrer", children: socialSvg[item.name] }) }, item.name)) }) : group.items.map((item) => /* @__PURE__ */ jsx(Item, { children: /* @__PURE__ */ jsxs(Link, { target: item.external ? "_blank" : "", href: item.url, rel: "noopener noreferrer", children: [
+      /* @__PURE__ */ jsx(CollapseWrapper, { collapse: isMobile && group.collapse, isOpened: activeGroups[groupKey], children: /* @__PURE__ */ jsx(Items, { social: group.social, children: group.social ? /* @__PURE__ */ jsx(SocialLinksContainer, { children: group.items.map((item) => /* @__PURE__ */ jsx(Item, { social: true, children: /* @__PURE__ */ jsx(SocialLink, { href: item.url, alt: item.name, target: "_blank", rel: "noopener noreferrer", children: socialSvg[item.name] }) }, item.name)) }) : group.items.map((item) => /* @__PURE__ */ jsx(Item, { children: /* @__PURE__ */ jsxs(Link, { target: item.external ? "_blank" : "", to: item.url, rel: "noopener noreferrer", children: [
         item.name,
         item.showNumber && jobOpeningsNumber > 0 && /* @__PURE__ */ jsx(HiringTotalNumber, { style: { marginLeft: "4px" }, children: jobOpeningsNumber })
       ] }) }, item.name)) }) })

package/dist/components/Footer/FooterMenu.styles.js

@@ -1,7 +1,7 @@
 import styled from "styled-components";
 import { colors } from "../../styles/colors.js";
 import theme from "../../styles/theme.js";
-import { Link as Link$1 } from "react-router-dom";
+import stdin_default from "../SmartLink/SmartLink.js";
 const Container = styled.div`
   z-index: 2;
   position: relative;
@@ -186,7 +186,7 @@ const Item = styled.li.withConfig({
     padding-right: 16px;
   }
 `;
-const Link = styled(Link$1)`
+const Link = styled(stdin_default)`
   display: inline-block;
   font-family: 'Open Sans';
   font-weight: bold;

package/dist/components/Header/Header.js

@@ -1,17 +1,17 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { useMemo, useState, useEffect } from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import stdin_default$1 from "../SmartLink/SmartLink.js";
 import { Button } from "../Button/Button.styles.js";
-import stdin_default$1 from "../SvgIcons/LogoSvg.js";
+import stdin_default$2 from "../SvgIcons/LogoSvg.js";
 import "../SvgIcons/SocialInstagram.js";
 import { MenuNav } from "../MenuNav/MenuNav.styles.js";
-import stdin_default$3 from "../MainMenu/MainMenu.js";
+import stdin_default$4 from "../MainMenu/MainMenu.js";
 import { StepsProgressSignup, StepsProgressHeader } from "../StepsProgress/StepsProgress.js";
 import { NotificationCounter } from "../NotificationCounter/NotificationCounter.styles.js";
 import avatarPlaceholder from "../../static/images/avatar-placeholder.png.js";
 import { StyledHeader, SidebarToggle, HamburgerIcon, HeaderInner, MainNavWrap, Logo, HeaderMainNav, ProgressWrap, QuickNavWrap, MobileMenuToggler, HeaderQuickNav, LoginButton, UserAccount, UserButton, SignupButton, MobileMenu, MobileMenuPart, MobileMenuItem, MobileMenuLink, CTAContainer, SocialLinksContainer, UserAvatar, MobileMenuWrapper, StyledSubMenu } from "./Header.styles.js";
-import stdin_default$2 from "../MainMenu/DynamicMainMenu.js";
+import stdin_default$3 from "../MainMenu/DynamicMainMenu.js";
 import { SocialLink, ArrowDown } from "../Footer/FooterMenu.styles.js";
 import { Collapse } from "react-collapse";
 import { usePrevious, useMobileView } from "../../utils/customHooks.js";
@@ -190,10 +190,10 @@ function HeaderView({
     withSidebar && /* @__PURE__ */ jsx(SidebarToggle, { isSidebarExpanded, onClick: sidebarHandler, children: /* @__PURE__ */ jsx(HamburgerIcon, {}) }),
     /* @__PURE__ */ jsxs(HeaderInner, { withSidebar, children: [
       /* @__PURE__ */ jsxs(MainNavWrap, { hasProgress: progress, children: [
-        /* @__PURE__ */ jsx(Logo, { isHighlight: currentActiveMenu === "main", children: useRelativePathForMenu ? /* @__PURE__ */ jsx(Link, { to: "/", "data-cy": "logo-nav-link", children: /* @__PURE__ */ jsx(stdin_default$1, {}) }) : /* @__PURE__ */ jsx("a", { href: platformURL, "data-cy": "logo-nav-link", children: /* @__PURE__ */ jsx(stdin_default$1, {}) }) }),
+        /* @__PURE__ */ jsx(Logo, { isHighlight: currentActiveMenu === "main", children: /* @__PURE__ */ jsx(stdin_default$1, { to: useRelativePathForMenu ? "/" : platformURL, "data-cy": "logo-nav-link", children: /* @__PURE__ */ jsx(stdin_default$2, {}) }) }),
         !progress && /* @__PURE__ */ jsx(HeaderMainNav, { children: /* @__PURE__ */ jsx(MenuNav, { children: /* @__PURE__ */ jsxs("ul", { children: [
           /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
-            Link,
+            stdin_default$1,
             {
               to: newPlatformUrl + "/featured-assets",
               "data-cy": "invest-nav-link",
@@ -224,7 +224,7 @@ function HeaderView({
             }
           ) }),
           /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
-            Link,
+            stdin_default$1,
             {
               to: newPlatformUrl + "/team",
               "data-cy": "team-nav-link",
@@ -327,33 +327,20 @@ function HeaderView({
           /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(MobileMenuLink, { to: newPlatformUrl + "/team", children: "Team" }) })
         ] }) }) }) }),
         hasLoggedInSession(user) ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          !signupFlow && /* @__PURE__ */ jsx(MobileMenuPart, { withPadding: true, flexColumn: true, borderTop: true, children: /* @__PURE__ */ jsx(MenuNav, { mobile: true, children: /* @__PURE__ */ jsx("ul", { children: isAdmin ? /* @__PURE__ */ jsx(Fragment, { children: isVentureDashboard ? /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(Link, { to: "/settings", children: "Settings" }) }) : /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(
-            Link,
-            {
-              to: getConfig("adminUrl"),
-              onClick: (e) => {
-                e.preventDefault();
-                toggleMenu("main");
-              },
-              children: "Dashboard"
-            }
-          ) }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+          !signupFlow && /* @__PURE__ */ jsx(MobileMenuPart, { withPadding: true, flexColumn: true, borderTop: true, children: /* @__PURE__ */ jsx(MenuNav, { mobile: true, children: /* @__PURE__ */ jsx("ul", { children: isAdmin ? /* @__PURE__ */ jsx(Fragment, { children: isVentureDashboard ? /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(stdin_default$1, { to: "/settings", children: "Settings" }) }) : /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(stdin_default$1, { to: getConfig("adminUrl"), onClick: () => toggleMenu("main"), children: "Dashboard" }) }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsxs(MobileMenuItem, { children: [
               /* @__PURE__ */ jsx(
-                Link,
+                stdin_default$1,
                 {
-                  to: newPlatformUrlForUserMenu ? `${newPlatformUrlForUserMenu}/overview` : "/overview",
-                  onClick: (e) => {
-                    e.preventDefault();
-                    toggleMenu("main");
-                  },
+                  to: `${newPlatformUrlForUserMenu}/overview`,
+                  onClick: () => toggleMenu("main"),
                   children: "Dashboard"
                 }
               ),
               checkTodoStatus(user) > 0 && /* @__PURE__ */ jsx(NotificationCounter, { mobileMenu: true, children: checkTodoStatus(user) })
             ] }),
             /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(
-              Link,
+              stdin_default$1,
               {
                 to: `${newPlatformUrlForUserMenu}/settings/profile-and-privacy`,
                 onClick: () => toggleMenu("main"),
@@ -361,7 +348,7 @@ function HeaderView({
               }
             ) }),
             /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(
-              Link,
+              stdin_default$1,
               {
                 to: `${newPlatformUrlForUserMenu}/settings/liquid-address`,
                 onClick: () => toggleMenu("main"),
@@ -369,7 +356,7 @@ function HeaderView({
               }
             ) }),
             /* @__PURE__ */ jsx(MobileMenuItem, { children: /* @__PURE__ */ jsx(
-              Link,
+              stdin_default$1,
               {
                 to: `${newPlatformUrlForUserMenu}/settings/investment-eligibility`,
                 onClick: () => toggleMenu("main"),
@@ -420,10 +407,10 @@ function HeaderView({
           ] })
         ] })
       ] }),
-      /* @__PURE__ */ jsx(stdin_default$2, { isMenuActive: currentActiveMenu === "products", options: productMenuItems }),
-      /* @__PURE__ */ jsx(stdin_default$2, { isMenuActive: currentActiveMenu === "media", options: mediaMenuItems }),
+      /* @__PURE__ */ jsx(stdin_default$3, { isMenuActive: currentActiveMenu === "products", options: productMenuItems }),
+      /* @__PURE__ */ jsx(stdin_default$3, { isMenuActive: currentActiveMenu === "media", options: mediaMenuItems }),
       /* @__PURE__ */ jsx(
-        stdin_default$3,
+        stdin_default$4,
         {
           isMenuActive: currentActiveMenu === "main",
           logoutUser,

package/dist/components/Header/Header.styles.js

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { Link } from "react-router-dom";
+import stdin_default from "../SmartLink/SmartLink.js";
 import rwd, { rwdMax } from "../../styles/rwd.js";
 import { colors } from "../../styles/colors.js";
 import spacing from "../../styles/spacing.js";
@@ -364,7 +364,7 @@ const MobileMenuItem = styled.li.withConfig({
 const MobileMenuWrapper = styled.div`
   cursor: pointer;
 `;
-const MobileMenuLink = styled(Link)`
+const MobileMenuLink = styled(stdin_default)`
   width: 100%;
 `;
 const MobileMenuPart = styled.div.withConfig({

package/dist/components/SmartLink/SmartLink.js

@@ -0,0 +1,24 @@
+import { jsx } from "react/jsx-runtime";
+import "react";
+import PropTypes from "prop-types";
+import { Link } from "react-router-dom";
+const isExternalUrl = (to) => {
+  if (typeof to !== "string" || to === "") return false;
+  return /^([a-z][a-z0-9+.-]*:|\/\/)/i.test(to);
+};
+const SmartLink = ({ to, children, ...rest }) => {
+  if (isExternalUrl(to)) {
+    return /* @__PURE__ */ jsx("a", { href: to, ...rest, children });
+  }
+  return /* @__PURE__ */ jsx(Link, { to, ...rest, children });
+};
+SmartLink.propTypes = {
+  to: PropTypes.string,
+  children: PropTypes.node
+};
+var stdin_default = SmartLink;
+export {
+  SmartLink,
+  stdin_default as default,
+  isExternalUrl
+};

package/dist/context/AuthContext.js

@@ -8,11 +8,12 @@ import { identify, reset } from "../analytics/index.js";
 import { withRouter } from "../utils/withRouter.js";
 import { Text } from "../components/Text/Text.styles.js";
 import { Auth, DEFAULT_TOKEN_EXPIRY_MS } from "./Auth.js";
+import { Button } from "../components/Button/Button.styles.js";
 import { hasLoggedInSession } from "../utils/user-identity.js";
+import { SuccessModal as SuccessModalComponent } from "../components/Modal/SuccessModal/SuccessModal.js";
 import { getConfig, getPlatformURL } from "../runtime-config.js";
-import { ConfirmModal as ConfirmModalComponent } from "../components/ConfirmModal/ConfirmModal.js";
-import { getFirebaseAuth, isValidFirebaseConfig } from "../firebase-config.js";
 import avatarPlaceholder from "../static/images/avatar-placeholder.png.js";
+import { getFirebaseAuth, isValidFirebaseConfig } from "../firebase-config.js";
 import { isAlreadyOnOnboardingFlow } from "../utils/app-urls.js";
 import { multiFactor, TotpMultiFactorGenerator, signOut, getMultiFactorResolver, PhoneMultiFactorGenerator } from "firebase/auth";
 import { navigateToHref } from "../routing/navigate-app.js";
@@ -788,7 +789,7 @@ class AuthProviderClass extends Component {
     }
   };
   render() {
-    const { children } = this.props;
+    const { children, redirectToLogin = true } = this.props;
     return /* @__PURE__ */ jsxs(
       AuthContext.Provider,
       {
@@ -835,16 +836,26 @@ class AuthProviderClass extends Component {
         children: [
           children,
           (this.state.loggedOutDueToInactivity || this.state.loggedOutDueToCookieExpiry || this.state.sessionExpiryPendingReason) && !this.props.hideInactivityModal && /* @__PURE__ */ jsx(
-            ConfirmModalComponent,
+            SuccessModalComponent,
             {
               isOpen: true,
-              maxWidth: "600px",
-              confirmText: "OK",
-              onCancel: this.dismissSessionExpiryModal,
-              onConfirm: this.dismissSessionExpiryModal,
-              showRedBar: true,
+              onClose: this.dismissSessionExpiryModal,
+              variant: "progress",
               title: "Session expired",
-              content: /* @__PURE__ */ jsx(Text, { children: /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: this.state.sessionExpiryPendingReason === "inactivity" || this.state.loggedOutDueToInactivity ? "You have been logged out due to inactivity." : "Your session has expired. Please log in again." }) })
+              content: /* @__PURE__ */ jsxs(Text, { children: [
+                /* @__PURE__ */ jsx("p", { style: { fontSize: 16 }, children: this.state.sessionExpiryPendingReason === "inactivity" || this.state.loggedOutDueToInactivity ? "You have been logged out due to inactivity." : "Your session has expired. Please log in again." }),
+                /* @__PURE__ */ jsx(
+                  Button,
+                  {
+                    onClick: () => {
+                      this.dismissSessionExpiryModal();
+                      if (redirectToLogin) navigateToHref(this.props.navigate, getPlatformURL() + "/login");
+                    },
+                    children: "Log in"
+                  }
+                )
+              ] }),
+              maxWidth: "600px"
             }
           )
         ]
@@ -886,7 +897,9 @@ AuthProviderClass.propTypes = {
   /** When true, the inactivity modal is not shown after auto-logout. Default false. */
   hideInactivityModal: PropTypes.bool,
   /** Override access token cookie lifetime in ms (e.g. for Storybook). Production uses 1 hour. */
-  accessTokenExpiryMs: PropTypes.number
+  accessTokenExpiryMs: PropTypes.number,
+  /** When true, the user will be redirected to the login page after the session expires. Default false. */
+  redirectToLogin: PropTypes.bool
 };
 function resolveFirebaseConfigForGuard(props) {
   if (props.config?.firebase != null) return props.config.firebase;

package/dist/index.js

@@ -88,6 +88,7 @@ import { StepController } from "./components/StepController/StepController.js";
 import { StepControllerConsumer, StepControllerContext, StepControllerProvider } from "./components/StepController/StepControllerContext.js";
 import { StepsProgressHeader, StepsProgressSignup } from "./components/StepsProgress/StepsProgress.js";
 import { Container, Item, Items, Wrap } from "./components/StepsProgress/StepsProgress.styles.js";
+import { SmartLink, isExternalUrl } from "./components/SmartLink/SmartLink.js";
 import { Switch } from "./components/Switch/Switch.js";
 import { Tabs } from "./components/Tabs/Tabs.js";
 import { Breakdown } from "./components/breakdown/Breakdown.js";
@@ -492,6 +493,7 @@ export {
   SideLine,
   SideModal,
   Slider,
+  SmartLink,
   Snackbar,
   SnackbarContext,
   SnackbarProvider,
@@ -610,6 +612,7 @@ export {
   identify,
   initAnalytics,
   isAlreadyOnOnboardingFlow,
+  isExternalUrl,
   isUSInvestor,
   km_ify,
   learnMoreCategoryPropTypes,

package/package.json

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