diff --git a/src/features/profile/routes/ActiveDevicesPage.tsx b/src/features/profile/routes/ActiveDevicesPage.tsx index 037f2d8..03452f1 100644 --- a/src/features/profile/routes/ActiveDevicesPage.tsx +++ b/src/features/profile/routes/ActiveDevicesPage.tsx @@ -7,7 +7,7 @@ import { Stack, } from '@mui/material'; import { useTranslation } from 'react-i18next'; -import { DeviceMessage, Logout } from 'iconsax-react'; +import { DeviceMessage, Logout, Mobile } from 'iconsax-react'; import { CardContainer } from '@/components/CardContainer'; import { PageWrapper } from '../components/PageWrapper'; import { Icon } from '@rkheftan/harmony-ui'; @@ -43,7 +43,8 @@ export function ActiveDevicesPage() { const formattedDevices = sessions.map((session: ApiSession) => ({ id: session.key, timeAndDate: formatDate(session.created, i18n.language, t), - deviceModel: `${session.deviceOs} ${session.deviceName}`, + deviceOs: session.deviceOs, + deviceName: session.deviceName, ip: session.ipAddress, current: session.key === currentKey, })); @@ -199,12 +200,16 @@ export function ActiveDevicesPage() { }} > - {device.deviceModel} + {`${device.deviceOs} ${device.deviceName}`} @@ -253,6 +258,7 @@ export function ActiveDevicesPage() { } loading={loadingDeleteIds.includes(device.id)} onClick={() => handleDeleteDevice(device.id)} + fullWidth={false} sx={{ color: 'error.main', borderRadius: 1, diff --git a/src/features/profile/types/settingsType.ts b/src/features/profile/types/settingsType.ts index 26dea18..3b411d2 100644 --- a/src/features/profile/types/settingsType.ts +++ b/src/features/profile/types/settingsType.ts @@ -19,7 +19,8 @@ export interface InfoRowData { export interface Device { id: string; timeAndDate: string; - deviceModel: string; + deviceName: 'smartphone' | 'desktop' | string; + deviceOs: string; ip: string; current: boolean; }