fix: Fixes an error with configuration without analytics.

Fixes an error `Cannot convert undefined or null to object` on load.
e4basil · Aug 17, 2021 · 9525ce3 · 9525ce3
1 parent 3cc588b
commit 9525ce3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/react/features/base/conference/functions.js b/react/features/base/conference/functions.js
@@ -234,11 +234,11 @@ export function getConferenceOptions(stateful: Function | Object) {
     options.applicationName = getName();
     options.transcriptionLanguage = determineTranscriptionLanguage(options);
 
-    // Disable analytics, if requessted.
+    // Disable analytics, if requested.
     if (options.disableThirdPartyRequests) {
-        delete config.analytics.scriptURLs;
-        delete config.analytics.amplitudeAPPKey;
-        delete config.analytics.googleAnalyticsTrackingId;
+        delete config.analytics?.scriptURLs;
+        delete config.analytics?.amplitudeAPPKey;
+        delete config.analytics?.googleAnalyticsTrackingId;
         delete options.callStatsID;
         delete options.callStatsSecret;
     } else {

diff --git a/react/features/base/config/functions.native.js b/react/features/base/config/functions.native.js
@@ -15,8 +15,8 @@ export * from './functions.any';
 export function _cleanupConfig(config: Object) {
     config.analytics.scriptURLs = [];
     if (NativeModules.AppInfo.LIBRE_BUILD) {
-        delete config.analytics.amplitudeAPPKey;
-        delete config.analytics.googleAnalyticsTrackingId;
+        delete config.analytics?.amplitudeAPPKey;
+        delete config.analytics?.googleAnalyticsTrackingId;
         delete config.callStatsID;
         delete config.callStatsSecret;
     }