diff --git a/packages/client/src/pages/AccountsHome/Section/Header/index.js b/packages/client/src/pages/AccountsHome/Section/Header/index.js index 8e212d5811..6403711be2 100644 --- a/packages/client/src/pages/AccountsHome/Section/Header/index.js +++ b/packages/client/src/pages/AccountsHome/Section/Header/index.js @@ -20,6 +20,7 @@ import { mobile, isTablet, isMobile as isMobileUtils, + isSmallTablet, isDesktop, } from "@docspace/components/utils/device"; import TableGroupMenu from "@docspace/components/table-container/TableGroupMenu"; @@ -139,11 +140,6 @@ const StyledInfoPanelToggleWrapper = styled.div` display: none; } - ${isMobile && - css` - display: none; - `} - align-items: center; justify-content: center; @@ -337,12 +333,7 @@ const SectionHeaderContent = (props) => { /> {!isInfoPanelVisible && ( - {!( - isTablet() || - isMobile || - isMobileUtils() || - !isDesktop() - ) && ( + {!(isTablet() || isSmallTablet() || !isDesktop()) && (
{ // selectionParentRoom, } = props; + const [isTablet, setIsTablet] = useState(false); + const isRooms = getIsRooms(); const isGallery = getIsGallery(); const isAccounts = getIsAccounts(); @@ -48,6 +50,19 @@ const InfoPanelHeaderContent = (props) => { const withSubmenu = !isNoItem && !isSeveralItems && !isGallery && !isAccounts && !isTrash; + useEffect(() => { + checkWidth(); + window.addEventListener("resize", checkWidth); + return () => window.removeEventListener("resize", checkWidth); + }, []); + + const checkWidth = () => { + const isTablet = + isTabletUtils() || isSmallTabletUtils() || !isDesktopUtils(); + + setIsTablet(isTablet); + }; + const closeInfoPanel = () => setIsVisible(false); const setMembers = () => setView("info_members"); @@ -84,9 +99,6 @@ const InfoPanelHeaderContent = (props) => { const personalSubmenu = [submenuData[1], submenuData[2]]; - const isTablet = - isTabletUtils() || isMobileUtils() || isMobileRDD || !isDesktopUtils(); - return (
diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js index 2ed4adcea1..aa63d25086 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js @@ -27,16 +27,30 @@ export const MainContainer = styled.div` margin-bottom: 24px; color: ${(props) => props.theme.client.settings.common.descriptionColor}; } +`; - .button { - @media (${smallTablet}) { - position: absolute; - bottom: 16px; - width: calc(100% - 40px); +export const ButtonWrapper = styled.div` + display: flex; + gap: 8px; + align-items: center; - @media (${mobile}) { - width: calc(100% - 32px); - } + .request-again-link { + margin-left: 4px; + } + + @media (${smallTablet}) { + flex-direction: column-reverse; + gap: 16px; + position: absolute; + bottom: 16px; + width: calc(100% - 40px); + + @media (${mobile}) { + width: calc(100% - 32px); + } + + .button { + width: 100%; } } `; diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js index 874e0b602f..04be7ce6e7 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js @@ -5,13 +5,21 @@ import { inject } from "mobx-react"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; import toastr from "@docspace/components/toast/toastr"; -import { MainContainer } from "./StyledDeleteData"; +import Link from "@docspace/components/link"; +import { MainContainer, ButtonWrapper } from "./StyledDeleteData"; import { setDocumentTitle } from "../../../../helpers/utils"; import { sendSuspendPortalEmail } from "@docspace/common/api/portal"; import { isDesktop } from "@docspace/components/utils/device"; +import { EmployeeActivationStatus } from "@docspace/common/constants"; const PortalDeactivation = (props) => { - const { t, getPortalOwner, owner } = props; + const { + t, + getPortalOwner, + owner, + currentColorScheme, + sendActivationLink, + } = props; const [isDesktopView, setIsDesktopView] = useState(false); const fetchData = async () => { @@ -42,6 +50,13 @@ const PortalDeactivation = (props) => { } }; + const requestAgain = () => { + sendActivationLink && sendActivationLink(t); + }; + + const notActivatedEmail = + owner.activationStatus === EmployeeActivationStatus.NotActivated; + return ( @@ -51,21 +66,46 @@ const PortalDeactivation = (props) => { {t("PortalDeactivationDescription")} {t("PortalDeactivationHelper")} -