diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js index 3684c31b00..a6458db8ae 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js @@ -23,9 +23,10 @@ // All the Product's GUI elements, including illustrations and icon sets, as well as technical writing // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - +import { useMemo } from "react"; import { inject } from "mobx-react"; import { withTranslation } from "react-i18next"; +import { decode } from "he"; import { Avatar } from "@docspace/shared/components/avatar"; import { Text } from "@docspace/shared/components/text"; @@ -39,7 +40,10 @@ const ChangeRoomOwner = ({ onOwnerChange, currentColorScheme, }) => { - const userName = roomOwner.displayName ?? roomOwner.label; + const userName = useMemo( + () => decode(roomOwner.displayName ?? roomOwner.label), + [roomOwner.displayName, roomOwner.label], + ); return ( diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/SessionsTable/TableView/SessionsTableRow.js b/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/SessionsTable/TableView/SessionsTableRow.js index 728f65cbc8..96eb19d890 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/SessionsTable/TableView/SessionsTableRow.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/SessionsTable/TableView/SessionsTableRow.js @@ -75,6 +75,10 @@ const StyledTableRow = styled(TableRow)` margin-left: 8px; `} } + + .remove-cell { + justify-content: flex-end; + } `; StyledTableRow.defaultProps = { theme: Base }; @@ -138,15 +142,13 @@ const SessionsTableRow = (props) => { {showRemoveIcon && ( - - - - + + )} diff --git a/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js b/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js index 2920447d7d..87d0e1a967 100644 --- a/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js +++ b/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js @@ -280,16 +280,27 @@ const VersionRow = (props) => { > {versionDate} - - {title} - + {info.updatedBy?.isAnonim ? ( + + {title} + + ) : ( + + {title} + + )} {/* col.defaultSize && col.enable)?.defaultSize || 0; @@ -368,6 +371,10 @@ class TableHeader extends React.Component< ? storageSize.split(" ") : containerGridTemplateColumns; + const tableInfoContainer = storageInfoSize + ? storageInfoSize.split(" ") + : containerGridTemplateColumns; + const { hideColumns } = this.state; if ( @@ -397,9 +404,17 @@ class TableHeader extends React.Component< .map((column) => getSubstring(column)) .reduce((x, y) => x + y); + const defaultInfoWidth = tableInfoContainer + .map((column) => getSubstring(column)) + .reduce((x, y) => x + y); + const oldWidth = defaultWidth - defaultSize - settingsSize; - if (Math.round(defaultWidth) !== Math.round(containerWidth) && !isResized) { + const isDifferentWindowSize = infoPanelVisible + ? Math.round(defaultInfoWidth) !== Math.round(containerWidth) + : Math.round(defaultWidth) !== Math.round(containerWidth); + + if (isDifferentWindowSize && !isResized) { if (infoPanelVisible) localStorage.removeItem(columnInfoPanelStorageName); else localStorage.removeItem(columnStorageName); this.onResize(true); diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts index 96dace25b0..0df4b00c0e 100644 --- a/packages/shared/themes/dark.ts +++ b/packages/shared/themes/dark.ts @@ -584,9 +584,9 @@ const Dark: TTheme = { }, scrollbar: { - bgColor: "rgba(20, 20, 20, 0.4)", - hoverBgColor: "rgba(20, 20, 20, 0.64)", - pressBgColor: "rgba(20, 20, 20, 0.8)", + bgColor: "rgba(136, 136, 136, 0.4)", + hoverBgColor: "rgba(136, 136, 136, 0.64)", + pressBgColor: "rgba(136, 136, 136, 0.8)", paddingInlineEnd: "17px !important", paddingInlineEndMobile: "8px !important", },