Merge branch 'master' of https://github.com/layer5io/layer5

Author: naikmubashir

src/components/Pricing/PricingAddons/index.js

@@ -20,7 +20,7 @@ import {
   TextField,
   useTheme,
   SistentThemeProvider
-} from  "@sistent/sistent";
+} from "@sistent/sistent";
 import { Calculate, CheckCircle, Cloud, Group } from "@mui/icons-material";
 import { useStyledDarkMode } from "../../../theme/app/useStyledDarkMode";
 import { getAddOns } from "./pricingData";
@@ -149,14 +149,11 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
     }
 
     let targetSubAddon = null;
-    let targetSubAddonName = "";
 
     if (selectedSubAddOns["academy-practical"]) {
       targetSubAddon = selectedAddon.subAddOns?.find(sub => sub.id === "academy-practical");
-      targetSubAddonName = "with Practical Learning";
     } else {
       targetSubAddon = selectedAddon.subAddOns?.find(sub => sub.id === "academy-theory");
-      targetSubAddonName = "";
     }
 
     if (!targetSubAddon?.planLink || !targetSubAddon.pricing?.[quantityIndex]) {
@@ -171,7 +168,6 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
     );
 
     if (matchingPlanLink) {
-      const enterpriseUserSeats = enterpriseUsers > 0 ? ` and ${enterpriseUsers} enterprise user${enterpriseUsers > 1 ? "s" : ""}` : "";
       return {
         link: matchingPlanLink.link,
         name: "Subscribe"
@@ -253,9 +249,9 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                                   {addon.id === "academy"
                                     ? addon.description
                                     : (() => {
-                                        const period = isYearly ? "/year" : "/month";
-                                        return `${formatPrice(isYearly ? addon.yearlyPrice : addon.monthlyPrice)} per ${addon.unitLabel.slice(0, -1)}${period}`;
-                                      })()
+                                      const period = isYearly ? "/year" : "/month";
+                                      return `${formatPrice(isYearly ? addon.yearlyPrice : addon.monthlyPrice)} per ${addon.unitLabel.slice(0, -1)}${period}`;
+                                    })()
                                   }
                                 </Typography>
                               </Box>
@@ -379,17 +375,17 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                                 <Box sx={{ textAlign: "center", fontSize: "1.25rem", fontWeight: "bold" }}>
                                   <Box>{option.learners === "2500+" ? "2,500+" : option.learners}</Box>
                                   {isYearly && (
-                                      <Box
-                                        sx={{
-                                          fontSize: {
-                                            xs: "0.75rem",
-                                            sm: "0.9rem",
-                                          }
-                                        }}
-                                      >
-                                        {formatSliderPrice((option.yearlyPerUser / 12) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/month
-                                      </Box>
-                                    )}
+                                    <Box
+                                      sx={{
+                                        fontSize: {
+                                          xs: "0.75rem",
+                                          sm: "0.9rem",
+                                        }
+                                      }}
+                                    >
+                                      {formatSliderPrice((option.yearlyPerUser / 12) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br />{targetSubAddon.unitLabelSingular}/month
+                                    </Box>
+                                  )}
                                   <Box
                                     sx={{
                                       color: "text.secondary",
@@ -399,7 +395,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
                                         sm: "0.9rem",
                                       }
                                     }}>
-                                    {formatSliderPrice((isYearly ? option.yearlyPerUser : option.monthlyPerUser) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
+                                    {formatSliderPrice((isYearly ? option.yearlyPerUser : option.monthlyPerUser) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br />{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
                                   </Box>
                                 </Box>
                               ),

src/sections/Company/Legal/code-of-conduct/index.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Container, Row, Col } from "../../../../reusecore/Layout";
-import PageHeader from "../../../../reusecore/PageHeader";
 import TOC from "../../../../components/legal-navigation/index";
 import TocPagination from "../../../../components/legal-navigation/TocPagination";
 import TermsWrapper from "../terms.style";

src/sections/Company/Legal/cookie-notice/index.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Container, Row, Col } from "../../../../reusecore/Layout";
-import PageHeader from "../../../../reusecore/PageHeader";
 import TermsWrapper from "../terms.style";
 import { useStyledDarkMode } from "../../../../theme/app/useStyledDarkMode";
 import {

src/sections/Company/Legal/privacy/index.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Container, Row, Col } from "../../../../reusecore/Layout";
-import PageHeader from "../../../../reusecore/PageHeader";
 import TermsWrapper from "../terms.style";
 import { useStyledDarkMode } from "../../../../theme/app/useStyledDarkMode";
 import {

src/sections/Company/Legal/sub-processors/index.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Container, Row, Col } from "../../../../reusecore/Layout";
-import PageHeader from "../../../../reusecore/PageHeader";
 import TermsWrapper from "../terms.style";
 import { useStyledDarkMode } from "../../../../theme/app/useStyledDarkMode";
 import {

src/sections/Company/Legal/terms-of-service/index.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { Container, Row, Col } from "../../../../reusecore/Layout";
-import PageHeader from "../../../../reusecore/PageHeader";
 import TermsWrapper from "../terms.style";
 import TOC from "../../../../components/legal-navigation/index";
 import TocPagination from "../../../../components/legal-navigation/TocPagination";

src/sections/Projects/Sistent/components/grid/index.js

@@ -5,7 +5,7 @@ import { useLocation } from "@reach/router";
 import { SistentThemeProvider, Grid2, Box } from "@sistent/sistent";
 import TabButton from "../../../../../reusecore/Button";
 import { SistentLayout } from "../../sistent-layout";
-import { Col, Row } from "../../../../../reusecore/Layout";
+import { Row } from "../../../../../reusecore/Layout";
 import { useStyledDarkMode } from "../../../../../theme/app/useStyledDarkMode";
 
 // Demo Item component for examples