fix the fix with matchPath (sigh)

hackforla · Nov 28, 2023 · 58e8d0d · 58e8d0d
1 parent ee540a5
commit 58e8d0d
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/client/src/components/ProjectWizard/TdmCalculationWizard.js b/client/src/components/ProjectWizard/TdmCalculationWizard.js
@@ -73,14 +73,20 @@ const TdmCalculationWizard = props => {
   */
   const calculationPath = "/calculation/:page/:projectId?/*";
   const isSameProject = (currentLocation, nextLocation) => {
-    const currentMatch = matchPath(currentLocation.pathname, {
-      path: calculationPath,
-      exact: true
-    });
-    const nextMatch = matchPath(nextLocation.pathname, {
-      path: calculationPath,
-      exact: true
-    });
+    const currentMatch = matchPath(
+      {
+        path: calculationPath,
+        exact: true
+      },
+      currentLocation.pathname
+    );
+    const nextMatch = matchPath(
+      {
+        path: calculationPath,
+        exact: true
+      },
+      nextLocation.pathname
+    );
     return (
       currentMatch &&
       nextMatch &&