diff --git a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx index 53fd5269d6..6c817a41da 100644 --- a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx +++ b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx @@ -561,10 +561,11 @@ function MultiIngestionSettings(): JSX.Element { APIKey.created_at, formatTimezoneAdjustedTimestamp, ); - const formattedDateAndTime = - APIKey && - APIKey?.expires_at && - getFormattedTime(APIKey?.expires_at, formatTimezoneAdjustedTimestamp); + + const expiresOn = + !APIKey?.expires_at || APIKey?.expires_at === '0001-01-01T00:00:00Z' + ? 'No Expiry' + : getFormattedTime(APIKey?.expires_at, formatTimezoneAdjustedTimestamp); const updatedOn = getFormattedTime( APIKey?.updated_at, @@ -987,7 +988,7 @@ function MultiIngestionSettings(): JSX.Element {
Expires on - {formattedDateAndTime} + {expiresOn}