From d4234f0837ad5e2ca9e7b3b319b27ce78ec6df6b Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Wed, 21 Jul 2021 10:15:29 +0530
Subject: [PATCH] fix: nullable analytic events

---
 helpers/fb/analytics.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/helpers/fb/analytics.ts b/helpers/fb/analytics.ts
index d3471aac..6926d408 100644
--- a/helpers/fb/analytics.ts
+++ b/helpers/fb/analytics.ts
@@ -7,7 +7,7 @@ import {
   settingsStore,
 } from "~/newstore/settings"
 
-let analytics: firebase.analytics.Analytics
+let analytics: firebase.analytics.Analytics | null
 
 type SettingsCustomDimensions = {
   usesProxy: boolean
@@ -39,15 +39,15 @@ function initLoginListeners() {
   authEvents$.subscribe((ev) => {
     if (ev.event === "login") {
       if (settingsStore.value.TELEMETRY_ENABLED) {
-        analytics.setUserId(ev.user.uid)
+        analytics?.setUserId(ev.user.uid)
 
-        analytics.logEvent("login", {
+        analytics?.logEvent("login", {
           method: ev.user.providerData[0]?.providerId, // Assume the first provider is the login provider
         })
       }
     } else if (ev.event === "logout") {
       if (settingsStore.value.TELEMETRY_ENABLED) {
-        analytics.logEvent("logout")
+        analytics?.logEvent("logout")
       }
     }
   })
@@ -75,26 +75,26 @@ function initSettingsListeners() {
       (telemetryStatus && !settings.TELEMETRY_ENABLED) ||
       settings.TELEMETRY_ENABLED
     ) {
-      analytics.setUserProperties(conf)
+      analytics?.setUserProperties(conf)
     }
 
     telemetryStatus = settings.TELEMETRY_ENABLED
 
-    analytics.setAnalyticsCollectionEnabled(telemetryStatus)
+    analytics?.setAnalyticsCollectionEnabled(telemetryStatus)
   })
 
-  analytics.setAnalyticsCollectionEnabled(telemetryStatus)
+  analytics?.setAnalyticsCollectionEnabled(telemetryStatus)
 }
 
 export function logHoppRequestRunToAnalytics(ev: HoppRequestEvent) {
   if (settingsStore.value.TELEMETRY_ENABLED) {
-    analytics.logEvent("hopp-request", ev)
+    analytics?.logEvent("hopp-request", ev)
   }
 }
 
 export function logPageView(pagePath: string) {
   if (settingsStore.value.TELEMETRY_ENABLED) {
-    analytics.logEvent("page_view", {
+    analytics?.logEvent("page_view", {
       page_path: pagePath,
     })
   }