revert: Rollback the helpr changes

Author: mananjadhav

src/libs/Navigation/helpers/dynamicRoutesUtils/combineDynamicRoutePathAndSuffix.ts

@@ -1,9 +1,28 @@
+import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import type {Route} from '@src/ROUTES';
-import combineDynamicRoutePathAndSuffix from './combineDynamicRoutePathAndSuffix';
 import isDynamicRouteSuffix from './isDynamicRouteSuffix';
 import splitPathAndQuery from './splitPathAndQuery';
 
+/**
+ * Merges two query strings into one. If both contain the same key, an error is thrown.
+ */
+const mergeQueryStrings = (baseQuery = '', suffixQuery = ''): string => {
+    if (!baseQuery && !suffixQuery) {
+        return '';
+    }
+    const params = new URLSearchParams(baseQuery);
+    const suffixParams = new URLSearchParams(suffixQuery);
+    for (const [key, value] of suffixParams.entries()) {
+        if (params.has(key)) {
+            throw new Error(`[createDynamicRoute] Query param "${key}" exists in both base path and dynamic suffix. This is not allowed.`);
+        }
+        params.set(key, value);
+    }
+    const result = params.toString();
+    return result ? `?${result}` : '';
+};
+
 /** Adds dynamic route name (with optional query params) to the current URL and returns it */
 const createDynamicRoute = (dynamicRouteSuffixWithParams: string, basePath?: string): Route => {
     const [suffixPath] = splitPathAndQuery(dynamicRouteSuffixWithParams);
@@ -13,6 +32,17 @@ const createDynamicRoute = (dynamicRouteSuffixWithParams: string, basePath?: str
     }
 
     const routePath = basePath ?? Navigation.getActiveRoute();
-    return combineDynamicRoutePathAndSuffix(routePath, dynamicRouteSuffixWithParams);
+    const [normalizedBasePath, baseQuery] = splitPathAndQuery(routePath);
+    const [normalizedSuffixPath, suffixQuery] = splitPathAndQuery(dynamicRouteSuffixWithParams);
+
+    if (!normalizedBasePath) {
+        Log.warn('[createDynamicRoute.ts] Path is undefined or empty, returning suffix only', {basePath: routePath, suffixWithQuery: dynamicRouteSuffixWithParams});
+        return dynamicRouteSuffixWithParams as Route;
+    }
+
+    const combinedPath = normalizedBasePath === '/' ? `/${normalizedSuffixPath}` : `${normalizedBasePath}/${normalizedSuffixPath}`;
+    const mergedQuery = mergeQueryStrings(baseQuery, suffixQuery);
+
+    return `${combinedPath}${mergedQuery}` as Route;
 };
 export default createDynamicRoute;