diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js
index 873f3a9492..2e81f3b8ac 100644
--- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js
+++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js
@@ -49,10 +49,14 @@ const SessionsRowContent = ({ sectionWidth, item }) => {
{platform}
{` ${browser}`}
-
- {country}
- {` ${city}`}
-
+
+ {(country || city) && (
+
+ {country}
+ {country && city && ` ${city}`}
+
+ )}
+
{ip}
diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableHeader.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableHeader.js
index 98540ac25a..ed8f72b714 100644
--- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableHeader.js
+++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableHeader.js
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { TableHeader } from "@docspace/shared/components/table";
-const TABLE_VERSION = "5";
+const TABLE_VERSION = "4";
const TABLE_COLUMNS = `SecuritySessionsColumns_ver-${TABLE_VERSION}`;
const getColumns = (defaultColumns, userId) => {
@@ -62,19 +62,12 @@ const SessionsTableHeader = (props) => {
onChange: onColumnChange,
},
{
- key: "Country",
- title: t("Common:Country"),
+ key: "Location",
+ title: t("Common:Location"),
enable: true,
resizable: true,
onChange: onColumnChange,
},
- {
- key: "IpAddress",
- title: t("Common:IpAddress"),
- enable: false,
- resizable: true,
- onChange: onColumnChange,
- },
];
const [columns, setColumns] = useState(getColumns(defaultColumns, userId));
diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js
index d526a6a645..494284684c 100644
--- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js
+++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js
@@ -117,6 +117,15 @@ const StyledTableRow = styled(TableRow)`
color: ${(props) => props.theme.profile.activeSessions.tableCellColor};
}
+ .divider {
+ display: inline-block;
+ height: 12px;
+ width: 2px;
+ background-color: ${(props) =>
+ props.theme.profile.activeSessions.dividerColor};
+ margin: -2px 5px;
+ }
+
.online {
font-weight: 600;
color: ${(props) => props.theme.profile.activeSessions.textOnlineColor};
@@ -282,15 +291,14 @@ const SessionsTableRow = (props) => {
- {country},
-
-
- {city}
-
-
-
-
-
+ {(country || city) && (
+ <>
+ {country}
+ {country && city && ", "}
+ {city}
+
+ >
+ )}
{ip}
diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/index.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/index.js
index c56b748406..388794985f 100644
--- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/index.js
@@ -9,7 +9,7 @@ import SessionsTableRow from "./SessionsTableRow";
import { TableContainer } from "@docspace/shared/components/table";
import { TableBody } from "@docspace/shared/components/table";
-const TABLE_VERSION = "5";
+const TABLE_VERSION = "4";
const COLUMNS_SIZE = `securitySessionsColumnsSize_ver-${TABLE_VERSION}`;
const INFO_PANEL_COLUMNS_SIZE = `infoPanelSessionsColumnsSize_ver-${TABLE_VERSION}`;
diff --git a/packages/shared/themes/base.ts b/packages/shared/themes/base.ts
index c999e45c33..c698f9fbc0 100644
--- a/packages/shared/themes/base.ts
+++ b/packages/shared/themes/base.ts
@@ -3229,13 +3229,17 @@ export const getBaseTheme = () => {
textDescriptionColor: "#A3A9AE",
},
activeSessions: {
- color: "#333",
+ color: "#333333",
borderColor: "#eceef1",
tickIconColor: "#35AD17",
removeIconColor: "#A3A9AE",
sortHeaderColor: "#d0d5da",
+ textOnlineColor: "#35ad17",
+ boxShadowColor: "rgba(4, 15, 27, 0.07) 0px 5px 20px",
tableCellColor: "#a3a9ae",
dividerColor: "#D0D5DA",
+ iconColor: "#657077",
+ subtitleColor: "#657077",
},
},
diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts
index 363891c81f..e535685d17 100644
--- a/packages/shared/themes/dark.ts
+++ b/packages/shared/themes/dark.ts
@@ -3211,8 +3211,12 @@ const Dark: TTheme = {
tickIconColor: "#3BA420",
removeIconColor: "#A3A9AE",
sortHeaderColor: "#474747",
+ textOnlineColor: "#3BA420",
+ boxShadowColor: "rgba(0, 0, 0, 0.12) 0px 40px 60px",
tableCellColor: "#858585",
dividerColor: "#474747",
+ iconColor: "#858585",
+ subtitleColor: "#858585",
},
},