IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Elyor Djalilov 2024-07-29 18:14:13 +05:00
parent ed344424c0
commit 5561c74cc2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/Shell.jsx
View File

@ -45,7 +45,6 @@ import { DeviceType, IndexedDBStores } from "@docspace/shared/enums";
import indexedDbHelper from "@docspace/shared/utils/indexedDBHelper";
import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
import { sendToastReport } from "@docspace/shared/utils/crashReport";
import { PRODUCT_NAME } from "@docspace/shared/constants";
import Main from "./components/Main";
import Layout from "./components/Layout";

4
packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.tsx
View File

@ -36,7 +36,6 @@ import {
ContextMenuButton,
ContextMenuButtonDisplayType,
} from "@docspace/shared/components/context-menu-button";
import { PRODUCT_NAME } from "@docspace/shared/constants";
import styled, { css } from "styled-components";
import LogoutReactSvgUrl from "PUBLIC_DIR/images/logout.react.svg?url";
import RemoveSvgUrl from "PUBLIC_DIR/images/remove.session.svg?url";
@ -161,7 +160,8 @@ const LastSessionBlock = (props: LastSessionBlockProps) => {
const getUserType = (): string => {
if (isOwner) return t("Common:Owner");
if (isAdmin) return t("Common:PortalAdmin", { productName: PRODUCT_NAME });
if (isAdmin)
return t("Common:PortalAdmin", { productName: t("Common:ProductName") });
if (isRoomAdmin) return t("Common:RoomAdmin");
if (isCollaborator) return t("Common:PowerUser");
return t("Common:User");