diff --git a/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountDeleteDialog/ServiceAccountDeleteDialog.tsx b/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountDeleteDialog/ServiceAccountDeleteDialog.tsx
index a72ceb6322..2974ca2a49 100644
--- a/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountDeleteDialog/ServiceAccountDeleteDialog.tsx
+++ b/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountDeleteDialog/ServiceAccountDeleteDialog.tsx
@@ -1,6 +1,11 @@
import { Alert, styled } from '@mui/material';
import { Dialogue } from 'component/common/Dialogue/Dialogue';
import { IUser } from 'interfaces/user';
+import { ServiceAccountTokens } from '../ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens';
+
+const StyledTableContainer = styled('div')(({ theme }) => ({
+ marginTop: theme.spacing(1.5),
+}));
const StyledLabel = styled('p')(({ theme }) => ({
marginTop: theme.spacing(3),
@@ -34,6 +39,13 @@ export const ServiceAccountDeleteDialog = ({
Deleting this service account may break any existing
implementations currently using it.
+ Service account tokens
+
+
+
You are about to delete service account:{' '}
{serviceAccount?.name}
diff --git a/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens.tsx b/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens.tsx
index b7047ea0c2..31bd839d44 100644
--- a/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens.tsx
+++ b/frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens.tsx
@@ -105,7 +105,7 @@ export const ServiceAccountTokens = ({
usePersonalAPITokensApi();
const [initialState] = useState(() => ({
- sortBy: [defaultSort],
+ sortBy: readOnly ? [{ id: 'seenAt' }] : [defaultSort],
}));
const [searchValue, setSearchValue] = useState('');