Merge branch 'main' into cirrus-types

mozilla · Jan 17, 2025 · 41554bd · 41554bd
2 parents 2b7d8d7 + 47ea9a7
commit 41554bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app/functions/server/getExperiments.ts b/src/app/functions/server/getExperiments.ts
@@ -101,7 +101,7 @@ export async function getExperiments(params: {
       };
     }
 
-    return experimentData ?? defaultExperimentData;
+    return (experimentData as ExperimentData) ?? defaultExperimentData;
   } catch (ex) {
     logger.error("Could not connect to Cirrus", {
       serverUrl,

diff --git a/src/app/hooks/useGlean.ts b/src/app/hooks/useGlean.ts
@@ -44,6 +44,7 @@ export const useGlean = () => {
       // Record the `nimbus_*` keys on all events.
       // `nimbus_*` is set on every metric, but it's too much work for TypeScript
       // to infer that — hence the type assertion.
+
       if (
         experimentData &&
         typeof experimentData["Enrollments"] !== "undefined"