Merge branch 'dev' into feature/2132-workflow-status

Author: finnar-bin

src/shell/components/Comment/CommentsList.tsx

@@ -73,10 +73,12 @@ export const CommentsList = ({
     }
 
     setTimeout(() => {
-      const { top, bottom } = topOffsetRef.current?.getBoundingClientRect();
+      if (topOffsetRef.current?.getBoundingClientRect()) {
+        const { top, bottom } = topOffsetRef.current.getBoundingClientRect();
 
-      setPopperTopOffset(top);
-      setPopperBottomOffset(bottom);
+        setPopperTopOffset(top);
+        setPopperBottomOffset(bottom);
+      }
     });
 
     // HACK: Prevents UI flicker when popper renders and is temporarily out of bounds

src/shell/components/load-instance/index.js

@@ -46,14 +46,19 @@ export default connect((state) => {
         return;
       }
 
-      props.dispatch(fetchInstance()).then((res) => {
-        if (res.status !== 200) {
-          setError("You do not have permission to access this instance");
-        } else {
-          document.title = `Manager - ${res.data?.name} - Zesty`;
-          CONFIG.URL_PREVIEW_FULL = `${CONFIG.URL_PREVIEW_PROTOCOL}${res.data?.randomHashID}${CONFIG.URL_PREVIEW}`;
-        }
-      });
+      props
+        .dispatch(fetchInstance())
+        .then((res) => {
+          if (res.status !== 200) {
+            setError("You do not have permission to access this instance");
+          } else {
+            document.title = `Manager - ${res.data?.name} - Zesty`;
+            CONFIG.URL_PREVIEW_FULL = `${CONFIG.URL_PREVIEW_PROTOCOL}${res.data?.randomHashID}${CONFIG.URL_PREVIEW}`;
+          }
+        })
+        .catch(() => {
+          setError("Failed to load instance");
+        });
 
       Promise.all([
         props.dispatch(fetchUser(props.user.ZUID)),

src/shell/store/instance.js

@@ -46,6 +46,7 @@ export function fetchInstance() {
       })
       .catch((err) => {
         console.error("fetchInstance failed:", err);
+        return Promise.reject(err);
       });
   };
 }