From 5df25e83d1f43434d21d2721686b37e26720cb30 Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Tue, 25 Jun 2024 10:56:52 +0530 Subject: [PATCH] fix: make the license key check case insensitive (#5331) * fix: make the license key check case insensitive * fix: added safety checks --- frontend/src/container/Header/index.tsx | 9 +++++++-- frontend/src/container/SideNav/SideNav.tsx | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/container/Header/index.tsx b/frontend/src/container/Header/index.tsx index 191f83e38b..af24bdc4eb 100644 --- a/frontend/src/container/Header/index.tsx +++ b/frontend/src/container/Header/index.tsx @@ -27,6 +27,7 @@ import { import { useSelector } from 'react-redux'; import { NavLink } from 'react-router-dom'; import { AppState } from 'store/reducers'; +import { License } from 'types/api/licenses/def'; import AppReducer from 'types/reducer/app'; import { getFormattedDate, getRemainingDays } from 'utils/timeUtils'; @@ -109,9 +110,13 @@ function HeaderContainer(): JSX.Element { const { data: licenseData, isFetching, status: licenseStatus } = useLicense(); + const licensesStatus: string = + licenseData?.payload?.licenses?.find((e: License) => e.isCurrent)?.status || + ''; + const isLicenseActive = - licenseData?.payload?.licenses?.find((e) => e.isCurrent)?.status === - LICENSE_PLAN_STATUS.VALID; + licensesStatus?.toLocaleLowerCase() === + LICENSE_PLAN_STATUS.VALID.toLocaleLowerCase(); useEffect(() => { if ( diff --git a/frontend/src/container/SideNav/SideNav.tsx b/frontend/src/container/SideNav/SideNav.tsx index 6cec0448b2..82697d78b0 100644 --- a/frontend/src/container/SideNav/SideNav.tsx +++ b/frontend/src/container/SideNav/SideNav.tsx @@ -152,9 +152,13 @@ function SideNav({ const { t } = useTranslation(''); + const licenseStatus: string = + licenseData?.payload?.licenses?.find((e: License) => e.isCurrent)?.status || + ''; + const isLicenseActive = - licenseData?.payload?.licenses?.find((e: License) => e.isCurrent)?.status === - LICENSE_PLAN_STATUS.VALID; + licenseStatus?.toLocaleLowerCase() === + LICENSE_PLAN_STATUS.VALID.toLocaleLowerCase(); const isEnterprise = licenseData?.payload?.licenses?.some( (license: License) =>