@seamly/web-ui 24.0.0-beta.2 → 24.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seamly/web-ui",
-  "version": "24.0.0-beta.2",
+  "version": "24.0.0-beta.4",
   "main": "build/dist/lib/index.js",
   "types": "build/src/javascripts/index.d.ts",
   "exports": {

package/src/javascripts/ui/components/core/seamly-event-subscriber.ts

@@ -45,30 +45,6 @@ const SeamlyEventSubscriber = () => {
   const { initCountdown, endCountdown } = useSeamlyIdleDetachCountdown()
   const { emitEvent } = useSeamlyCommands()
 
-  useEffect(() => {
-    if (conversation.socket) {
-      const { onError, onOpen } = conversation
-      onError((err) => {
-        const seamlyOfflineError = new SeamlyOfflineError(err)
-        dispatch(
-          setInterrupt({
-            name: seamlyOfflineError.name,
-            message: seamlyOfflineError.message,
-            langKey: seamlyOfflineError.langKey,
-            originalEvent: seamlyOfflineError.originalEvent,
-            originalError: seamlyOfflineError.originalError,
-          }),
-        )
-
-        dispatch(clearEvents())
-      })
-
-      onOpen(() => {
-        dispatch(clearInterrupt())
-      })
-    }
-  }, [conversation, conversation.socket, dispatch])
-
   useEffect(() => {
     if (conversation.socket) {
       conversation.onConnection(({ currentState }) => {
@@ -87,8 +63,28 @@ const SeamlyEventSubscriber = () => {
 
           return true
         }
+
         return false
       })
+
+      conversation.onError((err) => {
+        const seamlyOfflineError = new SeamlyOfflineError(err)
+        dispatch(
+          setInterrupt({
+            name: seamlyOfflineError.name,
+            message: seamlyOfflineError.message,
+            langKey: seamlyOfflineError.langKey,
+            originalEvent: seamlyOfflineError.originalEvent,
+            originalError: seamlyOfflineError.originalError,
+          }),
+        )
+
+        dispatch(clearEvents())
+      })
+
+      conversation.onOpen(() => {
+        dispatch(clearInterrupt())
+      })
     }
   }, [conversation, conversation.socket, dispatch])
 

package/src/javascripts/ui/hooks/use-seamly-chat.ts

@@ -45,7 +45,8 @@ const useSeamlyChat = () => {
   useEffect(() => {
     // This is needed to reset the ref to allow connect and start to happen again.
     // Mostly due to Interrupt situations and a reset being called.
-    if (!apiConfigReady || !apiConnected) {
+    // Only do this in case both are `false` (reset does this), because the websocket itself will automatically try to reconnect.
+    if (!apiConfigReady && !apiConnected) {
       connectCalled.current = false
     }
   }, [apiConfigReady, apiConnected])