revert some unnecessary changes

Author: collectioneur

Mobile-Expensify

@@ -190,40 +190,42 @@ function getMatchingFullScreenRoute(route: NavigationPartialRoute) {
         };
     }
 
-    const dynamicSuffixMatch = findMatchingDynamicSuffix(route?.path);
     // Handle dynamic routes: find the appropriate full screen route
-    if (route.path && dynamicSuffixMatch) {
-        // Strip the suffix from the URL. For parametric routes we pass both the actual URL
-        // suffix and the registered pattern so query params can be resolved correctly.
-        const pathWithoutDynamicSuffix = getPathWithoutDynamicSuffix(route.path, dynamicSuffixMatch.actualSuffix, dynamicSuffixMatch.pattern);
+    if (route.path) {
+        const suffixMatch = findMatchingDynamicSuffix(route.path);
+        if (suffixMatch) {
+            // Strip the suffix from the URL. For parametric routes we pass both the actual URL
+            // suffix and the registered pattern so query params can be resolved correctly.
+            const pathWithoutDynamicSuffix = getPathWithoutDynamicSuffix(route.path, suffixMatch.actualSuffix, suffixMatch.pattern);
+
+            if (!pathWithoutDynamicSuffix) {
+                return undefined;
+            }
 
-        if (!pathWithoutDynamicSuffix) {
-            return undefined;
-        }
+            // Parse the base path (without dynamic suffix) into a navigation state
+            // to determine which full-screen route should be visible underneath the overlay.
+            const stateUnderDynamicRoute = getStateFromPath(pathWithoutDynamicSuffix);
+            const lastRoute = stateUnderDynamicRoute?.routes.at(-1);
 
-        // Parse the base path (without dynamic suffix) into a navigation state
-        // to determine which full-screen route should be visible underneath the overlay.
-        const stateUnderDynamicRoute = getStateFromPath(pathWithoutDynamicSuffix);
-        const lastRoute = stateUnderDynamicRoute?.routes.at(-1);
+            if (!stateUnderDynamicRoute || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
+                return undefined;
+            }
 
-        if (!stateUnderDynamicRoute || !lastRoute || lastRoute.name === SCREENS.NOT_FOUND) {
-            return undefined;
-        }
+            const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
 
-        const isLastRouteFullScreen = isFullScreenName(lastRoute.name);
+            if (isLastRouteFullScreen) {
+                return lastRoute;
+            }
 
-        if (isLastRouteFullScreen) {
-            return lastRoute;
-        }
+            const focusedRouteUnderDynamicRoute = findFocusedRouteWithOnyxTabGuard(stateUnderDynamicRoute);
 
-        const focusedRouteUnderDynamicRoute = findFocusedRouteWithOnyxTabGuard(stateUnderDynamicRoute);
+            if (!focusedRouteUnderDynamicRoute) {
+                return undefined;
+            }
 
-        if (!focusedRouteUnderDynamicRoute) {
-            return undefined;
+            // Recursively find the matching full screen route for the focused dynamic route
+            return getMatchingFullScreenRoute(focusedRouteUnderDynamicRoute);
         }
-
-        // Recursively find the matching full screen route for the focused dynamic route
-        return getMatchingFullScreenRoute(focusedRouteUnderDynamicRoute);
     }
 
     return undefined;