Use getActiveRoute in isActiveRoute

Expensify · Apr 4, 2022 · 86050cc · 86050cc
1 parent 3467f88
commit 86050cc
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
@@ -172,6 +172,16 @@ function dismissModal(shouldOpenDrawer = false) {
     }
 }
 
+/**
+ * Returns the current active route
+ * @returns {String}
+ */
+function getActiveRoute() {
+    return navigationRef.current && navigationRef.current.getCurrentRoute().name
+        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config)
+        : '';
+}
+
 /**
  * Check whether the passed route is currently Active or not.
  *
@@ -183,20 +193,7 @@ function dismissModal(shouldOpenDrawer = false) {
  */
 function isActiveRoute(routePath) {
     // We remove First forward slash from the URL before matching
-    const path = navigationRef.current && navigationRef.current.getCurrentRoute().name
-        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config).substring(1)
-        : '';
-    return path === routePath;
-}
-
-/**
- * Returns the current active route
- * @returns {String}
- */
-function getActiveRoute() {
-    return navigationRef.current && navigationRef.current.getCurrentRoute().name
-        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config)
-        : '';
+    return getActiveRoute().substring(1) === routePath;
 }
 
 /**