From 1c6f8fd902082e22e2071427b7279f4f6c9f4a75 Mon Sep 17 00:00:00 2001
From: Kousik Mitra <kousikmitra12@gmail.com>
Date: Tue, 4 Apr 2023 15:16:10 +0530
Subject: [PATCH] Service Accounts: Allow unsetting token expiry date (#65862)

* Fix: toggle to switch between no expiry

* Remove redudant curly brace
---
 .../components/CreateTokenModal.tsx            | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
index 85d78cd940f..a86e578c277 100644
--- a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
+++ b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
@@ -109,16 +109,14 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
               }}
             />
           </Field>
-          {!isWithExpirationDate && (
-            <Field label="Expiration">
-              <RadioButtonGroup
-                options={EXPIRATION_OPTIONS}
-                value={isWithExpirationDate}
-                onChange={setIsWithExpirationDate}
-                size="md"
-              />
-            </Field>
-          )}
+          <Field label="Expiration">
+            <RadioButtonGroup
+              options={EXPIRATION_OPTIONS}
+              value={isWithExpirationDate}
+              onChange={setIsWithExpirationDate}
+              size="md"
+            />
+          </Field>
           {isWithExpirationDate && (
             <Field label="Expiration date">
               <DatePickerWithInput