chore: Only initialize bugsnag if reporting is enabled (#2339)

* chore: Only initialize bugsnag if reporting is enabled
RocketChat · Mar 17, 2022 · c6da6dc · c6da6dc
1 parent 61c02e7
commit c6da6dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/errors.ts b/src/errors.ts
@@ -26,15 +26,22 @@ const listenToBugsnagEnabledToggle = async (appType: AppType) => {
     throw new Error('app version was not set');
   }
 
-  const bugsnagInstance = initBugsnag(apiKey, appVersion, appType);
+  let bugsnagInstance: ReturnType<typeof initBugsnag>;
+
+  if (isReportEnabled) {
+    bugsnagInstance = initBugsnag(apiKey, appVersion, appType);
+    bugsnagInstance.startSession();
+  }
 
-  isReportEnabled && bugsnagInstance.startSession();
   listen(SETTINGS_SET_REPORT_OPT_IN_CHANGED, async (action) => {
     const isReportEnabled = action.payload;
+
     if (isReportEnabled) {
+      bugsnagInstance =
+        bugsnagInstance || initBugsnag(apiKey, appVersion, appType);
       bugsnagInstance.startSession();
     } else {
-      bugsnagInstance.pauseSession();
+      bugsnagInstance && bugsnagInstance.pauseSession();
     }
   });
 };

diff --git a/src/ui/main/menuBar.ts b/src/ui/main/menuBar.ts
@@ -236,10 +236,6 @@ const createViewMenu = createSelector(
               ? getWebContentsByServerUrl(currentView.url)
               : null;
           guestWebContents?.toggleDevTools();
-          // const windows = BrowserWindow.getAllWindows();
-          // windows.forEach((window) => {
-          //   window.webContents.toggleDevTools();
-          // });
         },
       },
       {