Skip update prompts in invalid situations

wooferzfg · Jun 7, 2024 · ed59380 · ed59380
1 parent 6f8056c
commit ed59380
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/ui/launcher.jsx b/src/ui/launcher.jsx
@@ -15,6 +15,12 @@ import 'react-toggle/style.css';
 
 export default class Launcher extends React.PureComponent {
   static notifyAboutUpdate() {
+    const { serviceWorker } = navigator;
+    if (_.isNil(serviceWorker) || _.isNil(serviceWorker.controller)) {
+      // Don't prompt for update when service worker gets removed
+      return;
+    }
+
     toast.warn(
       'A new version of the tracker is available! Click here to reload.',
       {
@@ -56,15 +62,16 @@ export default class Launcher extends React.PureComponent {
   componentDidMount() {
     const { serviceWorker } = navigator;
 
-    if (serviceWorker) {
+    if (!_.isNil(serviceWorker) && !_.isNil(serviceWorker.controller)) {
+      // Don't prompt for update when there was no service worker previously installed
       serviceWorker.addEventListener('controllerchange', Launcher.notifyAboutUpdate);
     }
   }
 
   componentWillUnmount() {
     const { serviceWorker } = navigator;
 
-    if (serviceWorker) {
+    if (!_.isNil(serviceWorker)) {
       serviceWorker.removeEventListener('controllerchange', Launcher.notifyAboutUpdate);
     }
   }