From 582c9c9acff600a4f98284a30acb99d66eb1a0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Tue, 28 May 2024 08:45:34 +0200
Subject: [PATCH] fix: api key details section (#7488)

---
 .../dashboard/src/i18n/translations/en.json   |  1 +
 .../api-key-general-section.tsx               | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/admin-next/dashboard/src/i18n/translations/en.json b/packages/admin-next/dashboard/src/i18n/translations/en.json
index 37bec18794..5e0a9a774f 100644
--- a/packages/admin-next/dashboard/src/i18n/translations/en.json
+++ b/packages/admin-next/dashboard/src/i18n/translations/en.json
@@ -1452,6 +1452,7 @@
     "fields": {
       "lastUsedAtLabel": "Last used at",
       "revokedByLabel": "Revoked by",
+      "revokedAtLabel": "Revoked at",
       "createdByLabel": "Created by"
     }
   },
diff --git a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-detail/components/api-key-general-section/api-key-general-section.tsx b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-detail/components/api-key-general-section/api-key-general-section.tsx
index 2808dc5a5b..112184d8be 100644
--- a/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-detail/components/api-key-general-section/api-key-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/api-key-management/api-key-management-detail/components/api-key-general-section/api-key-general-section.tsx
@@ -195,12 +195,22 @@ export const ApiKeyGeneralSection = ({ apiKey }: ApiKeyGeneralSectionProps) => {
         <ActionBy userId={apiKey.created_by} />
       </div>
       {apiKey.revoked_at && (
-        <div className="grid grid-cols-2 items-center px-6 py-4">
-          <Text size="small" leading="compact" weight="plus">
-            {t("apiKeyManagement.fields.revokedByLabel")}
-          </Text>
-          <ActionBy userId={apiKey.revoked_by} />
-        </div>
+        <>
+          <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
+            <Text size="small" leading="compact" weight="plus">
+              {t("apiKeyManagement.fields.revokedAtLabel")}
+            </Text>
+            <Text size="small" leading="compact">
+              {getFullDate({ date: apiKey.revoked_at, includeTime: true })}
+            </Text>
+          </div>
+          <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">
+            <Text size="small" leading="compact" weight="plus">
+              {t("apiKeyManagement.fields.revokedByLabel")}
+            </Text>
+            <ActionBy userId={apiKey.revoked_by} />
+          </div>
+        </>
       )}
     </Container>
   )