co pilot pr comments

Author: Alessandro100

.github/workflows/web-app-deployer.yml

@@ -227,6 +227,10 @@ jobs:
               echo "REACT_APP_REMOTE_CONFIG_MINIMUM_FETCH_INTERVAL_MILLI=300000" >> $GITHUB_ENV
               echo "REACT_APP_FEED_API_BASE_URL=https://api-qa.mobilitydatabase.org" >> $GITHUB_ENV
               echo "REACT_APP_GBFS_VALIDATOR_API_BASE_URL=https://dev.gbfs.api.mobilitydatabase.org" >> $GITHUB_ENV
+              echo "REACT_APP_SENTRY_DSN=" >> $GITHUB_ENV
+              echo "REACT_APP_SENTRY_REPLAY_SESSION_SAMPLE_RATE=" >> $GITHUB_ENV
+              echo "REACT_APP_SENTRY_REPLAY_ERROR_SAMPLE_RATE=" >> $GITHUB_ENV
+              echo "REACT_APP_SENTRY_TRACES_SAMPLE_RATE=" >> $GITHUB_ENV
           elif [[ ${{ inputs.FIREBASE_PROJECT }} == 'prod' ]]; then
             echo "Setting FIREBASE_PROJECT to 'prod'"
             echo "FIREBASE_PROJECT=prod" >> $GITHUB_ENV
@@ -257,6 +261,10 @@ jobs:
             echo "REACT_APP_REMOTE_CONFIG_MINIMUM_FETCH_INTERVAL_MILLI=300000" >> $GITHUB_ENV
             echo "REACT_APP_FEED_API_BASE_URL=https://api-dev.mobilitydatabase.org" >> $GITHUB_ENV
             echo "REACT_APP_GBFS_VALIDATOR_API_BASE_URL=https://dev.gbfs.api.mobilitydatabase.org" >> $GITHUB_ENV
+            echo "REACT_APP_SENTRY_DSN=" >> $GITHUB_ENV
+            echo "REACT_APP_SENTRY_REPLAY_SESSION_SAMPLE_RATE=" >> $GITHUB_ENV
+            echo "REACT_APP_SENTRY_REPLAY_ERROR_SAMPLE_RATE=" >> $GITHUB_ENV
+            echo "REACT_APP_SENTRY_TRACES_SAMPLE_RATE=" >> $GITHUB_ENV
           fi
 
       - name: Populate Variables

web-app/src/app/store/store.ts

@@ -68,8 +68,7 @@ const makeStore = () =>
       }),
       sagaMiddleware,
     ],
-    enhancers: (existing) =>
-      sentryReduxEnhancer ? [...existing, sentryReduxEnhancer] : existing,
+    enhancers: (existing) => [...existing, sentryReduxEnhancer],
   });
 /* eslint-enable */
 
@@ -84,7 +83,7 @@ if (window.Cypress) {
 
 sagaMiddleware.run(rootSaga);
 
-export type RootState = ReturnType<typeof persistedReducer>;
+export type RootState = ReturnType<typeof store.getState>;
 export type AppDispatch = typeof store.dispatch;
 export type AppThunk<ReturnType = void> = ThunkAction<
   ReturnType,

web-app/src/index.tsx

@@ -39,5 +39,5 @@ root.render(
         </SentryErrorBoundary>
       </ContextProviders>
     </ThemeProvider>
-  </React.StrictMode>,
+  </React.StrictMode>
 );

web-app/src/sentry.ts

@@ -1,10 +1,18 @@
 import * as Sentry from '@sentry/react';
 import packageJson from '../package.json';
 import * as React from 'react';
-import { createRoutesFromChildren, matchRoutes } from 'react-router-dom';
+import {
+  createRoutesFromChildren,
+  matchRoutes,
+  useLocation,
+  useNavigationType,
+} from 'react-router-dom';
 
 // Helper to safely parse Sentry sample rates from environment variables
-const parseSampleRate = (value: string | undefined, defaultValue: number): number => {
+const parseSampleRate = (
+  value: string | undefined,
+  defaultValue: number,
+): number => {
   const parsed = parseFloat(value ?? String(defaultValue));
   if (isNaN(parsed) || parsed < 0 || parsed > 1) {
     return defaultValue;
@@ -14,7 +22,9 @@ const parseSampleRate = (value: string | undefined, defaultValue: number): numbe
 
 const dsn = process.env.REACT_APP_SENTRY_DSN || '';
 const environment =
-  process.env.REACT_APP_FIREBASE_PROJECT_ID || process.env.NODE_ENV || "mobility-feeds-dev";
+  process.env.REACT_APP_FIREBASE_PROJECT_ID ||
+  process.env.NODE_ENV ||
+  'mobility-feeds-dev';
 const release = packageJson.version;
 const tracesSampleRate = parseSampleRate(
   process.env.REACT_APP_SENTRY_TRACES_SAMPLE_RATE,
@@ -30,29 +40,29 @@ const replaysOnErrorSampleRate = parseSampleRate(
 );
 
 if (dsn) {
-  // Prefer dedicated react-router v6 integration if available, else fall back to generic browser tracing with manual routing instrumentation.
   const routerTracingIntegration =
-    (Sentry as any).reactRouterV6BrowserTracingIntegration?.({
+    Sentry.reactRouterV6BrowserTracingIntegration({
       useEffect: React.useEffect,
-      reactRouterV6: { createRoutesFromChildren, matchRoutes },
-    }) ||
-    (Sentry as any).browserTracingIntegration?.({
-      routingInstrumentation: (Sentry as any).reactRouterV6Instrumentation?.(
-        React.useEffect,
-        true,
-        createRoutesFromChildren,
-        matchRoutes,
-      ),
+      useLocation,
+      useNavigationType,
+      createRoutesFromChildren,
+      matchRoutes,
     });
 
+  const integrations = [];
+  if (routerTracingIntegration) {
+    integrations.push(routerTracingIntegration);
+  }
+  const replayIntegration = Sentry.replayIntegration?.();
+  if (replayIntegration) {
+    integrations.push(replayIntegration);
+  }
+
   Sentry.init({
     dsn,
     environment,
     release,
-    integrations: [
-      routerTracingIntegration,
-      (Sentry as any).replayIntegration?.(),
-    ].filter(Boolean),
+    integrations: integrations,
     tracesSampleRate,
     replaysSessionSampleRate,
     replaysOnErrorSampleRate,