From f40e1417239ea0ca9f12a4058e6e162ebb5e86c1 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 23 Nov 2022 20:20:21 +0100
Subject: [PATCH 1/2] fix: env fallback

---
 src/lib/actions/analytics.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 7495b191c..168def408 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -5,11 +5,18 @@ import { page } from '$app/stores';
 import { user } from '$lib/stores/user';
 import { Mode } from '$lib/constants';
 
+const project = import.meta.env.VITE_GA_PROJECT
+    ? import.meta.env.VITE_GA_PROJECT?.toString()
+    : 'G-R4YJ9JN8L4';
+const mode = import.meta.env.VITE_CONSOLE_MODE
+    ? import.meta.env.VITE_CONSOLE_MODE?.toString()
+    : Mode.SELF_HOSTED;
+
 const analytics = Analytics({
     app: 'appwrite',
     plugins: [
         googleAnalytics({
-            measurementIds: [import.meta.env.VITE_GA_PROJECT?.toString() ?? 'G-R4YJ9JN8L4']
+            measurementIds: [project]
         })
     ]
 });
@@ -49,7 +56,7 @@ function sendEventToGrowth(event: string, path: string, data: object = null): vo
             action: event,
             label: event,
             url: window.location.origin + path,
-            account: import.meta.env.VITE_CONSOLE_MODE?.toString() ?? Mode.SELF_HOSTED,
+            account: mode,
             data: {
                 email,
                 name,

From d301664afd34fbec561f767e7fedad4a5f4b4865 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 23 Nov 2022 20:42:22 +0100
Subject: [PATCH 2/2] fix: simplify conditions

---
 src/lib/actions/analytics.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 168def408..d169790ac 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -5,18 +5,11 @@ import { page } from '$app/stores';
 import { user } from '$lib/stores/user';
 import { Mode } from '$lib/constants';
 
-const project = import.meta.env.VITE_GA_PROJECT
-    ? import.meta.env.VITE_GA_PROJECT?.toString()
-    : 'G-R4YJ9JN8L4';
-const mode = import.meta.env.VITE_CONSOLE_MODE
-    ? import.meta.env.VITE_CONSOLE_MODE?.toString()
-    : Mode.SELF_HOSTED;
-
 const analytics = Analytics({
     app: 'appwrite',
     plugins: [
         googleAnalytics({
-            measurementIds: [project]
+            measurementIds: [import.meta.env.VITE_GA_PROJECT?.toString() || 'G-R4YJ9JN8L4']
         })
     ]
 });
@@ -56,7 +49,7 @@ function sendEventToGrowth(event: string, path: string, data: object = null): vo
             action: event,
             label: event,
             url: window.location.origin + path,
-            account: mode,
+            account: import.meta.env.VITE_CONSOLE_MODE?.toString() || Mode.SELF_HOSTED,
             data: {
                 email,
                 name,