From 5d2c8a49ba24a5b087a16346c34e9bb5f6f1d800 Mon Sep 17 00:00:00 2001
From: Eunjae Lee <hey@eunjae.dev>
Date: Fri, 7 Feb 2025 16:19:15 +0100
Subject: [PATCH] fix: null check for useSearchParams() (#19175)

---
 example-apps/credential-sync/pages/index.tsx              | 4 ++--
 packages/features/filters/components/StartTimeFilters.tsx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/example-apps/credential-sync/pages/index.tsx b/example-apps/credential-sync/pages/index.tsx
index 824b1af04d..38a9772533 100644
--- a/example-apps/credential-sync/pages/index.tsx
+++ b/example-apps/credential-sync/pages/index.tsx
@@ -6,8 +6,8 @@ export default function Index() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const pathname = usePathname();
-  const appSlug = searchParams.get("appSlug");
-  const userId = searchParams.get("userId");
+  const appSlug = searchParams?.get("appSlug");
+  const userId = searchParams?.get("userId");
 
   useEffect(() => {
     let isRedirectNeeded = false;
diff --git a/packages/features/filters/components/StartTimeFilters.tsx b/packages/features/filters/components/StartTimeFilters.tsx
index c438cf7625..514c14b895 100644
--- a/packages/features/filters/components/StartTimeFilters.tsx
+++ b/packages/features/filters/components/StartTimeFilters.tsx
@@ -15,7 +15,7 @@ export const StartTimeFilters = () => {
   const { data: query } = useFilterQuery();
 
   const getQueryDate = (param: string) =>
-    searchParams.get(param) ? dayjs(searchParams.get(param)) : undefined;
+    searchParams?.get(param) ? dayjs(searchParams?.get(param)) : undefined;
 
   const [afterStartDate, setAfterStartDate] = useState<Dayjs | undefined>(() =>
     getQueryDate("afterStartDate")
@@ -26,7 +26,7 @@ export const StartTimeFilters = () => {
   const endValue = beforeEndDate?.toDate();
 
   const updateUrlParams = (newStartDate: Dayjs, newEndDate: Dayjs) => {
-    const search = new URLSearchParams(searchParams.toString());
+    const search = new URLSearchParams(searchParams?.toString());
 
     Object.entries(query).forEach(([key, value]) => {
       if (key !== "afterStartDate" && key !== "beforeEndDate") {
@@ -46,7 +46,7 @@ export const StartTimeFilters = () => {
 
   useEffect(() => {
     //if params has date range
-    if (searchParams.has("afterStartDate") && searchParams.has("beforeEndDate")) {
+    if (searchParams?.has("afterStartDate") && searchParams?.has("beforeEndDate")) {
       setAfterStartDate(getQueryDate("afterStartDate"));
       setBeforeEndDate(getQueryDate("beforeEndDate"));
     }