Merge pull request #33370 from dukenv0307/fix/33001

Add logic in get active route
Expensify · Jan 2, 2024 · 5b02cf0 · 5b02cf0
2 parents b8b675d + 7163807
commit 5b02cf0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
@@ -95,6 +95,10 @@ function getActiveRoute(): string {
         return '';
     }
 
+    if (currentRoute?.path) {
+        return currentRoute.path;
+    }
+
     const routeFromState = getPathFromState(navigationRef.getRootState(), linkingConfig.config);
 
     if (routeFromState) {
@@ -114,8 +118,10 @@ function getActiveRoute(): string {
  * @return is active
  */
 function isActiveRoute(routePath: Route): boolean {
-    // We remove First forward slash from the URL before matching
-    return getActiveRoute().substring(1) === routePath;
+    let activeRoute = getActiveRoute();
+    activeRoute = activeRoute.startsWith('/') ? activeRoute.substring(1) : activeRoute;
+
+    return activeRoute === routePath;
 }
 
 /**