Merge remote-tracking branch 'origin/master' into react-18

victronenergy · Sep 19, 2024 · d1344a8 · d1344a8
2 parents a48a8e1 + 8a9e5b6
commit d1344a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
-    "@victronenergy/mfd-modules": "^7.0.1",
+    "@victronenergy/mfd-modules": "^7.0.2",
     "axios": "^0.28.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.0",

diff --git a/src/app/Marine2/components/ui/MqttUnavailable/MqttUnavailable.tsx b/src/app/Marine2/components/ui/MqttUnavailable/MqttUnavailable.tsx
@@ -25,7 +25,6 @@ const MqttUnavailable = ({ host }: Props) => {
 
   useEffect(() => {
     if (!error) {
-      clearTimeout((connectTimeout.current as NodeJS.Timeout) || undefined)
       setIsConnecting(false)
       appViewsStore.setView(AppViews.ROOT)
     }
@@ -40,6 +39,7 @@ const MqttUnavailable = ({ host }: Props) => {
       setIsConnecting(false)
     }, 6 * 1000)
     // eslint-disable-next-line react-hooks/exhaustive-deps
+    return () => clearTimeout((connectTimeout.current as NodeJS.Timeout) || undefined)
   }, [])
 
   if (isConnecting) {