From c483ca32a0b5686d9d4ec97906ece6028d27e82c Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Jun 2023 16:11:09 +0200
Subject: [PATCH 1/4] Fix scene url form

---
 src/react-components/room/SceneUrlModal.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/react-components/room/SceneUrlModal.js b/src/react-components/room/SceneUrlModal.js
index 97fd707613..56f244fc47 100644
--- a/src/react-components/room/SceneUrlModal.js
+++ b/src/react-components/room/SceneUrlModal.js
@@ -56,12 +56,10 @@ export function SceneUrlModal({ enableSpoke, editorName, onValidateUrl, onSubmit
           )}
         </p>
         <TextInputField
-          name="url"
           label={<FormattedMessage id="scene-url-modal.url-input" defaultMessage="Scene URL" />}
           placeholder="https://example.com/scene.glb"
           type="url"
-          required
-          ref={register({ validate: onValidateUrl })}
+          {...register("url", { validate: onValidateUrl, required: true })}
           error={errors?.url?.message}
         />
         <Button type="submit" preset="accept" disabled={isSubmitting}>
@@ -95,5 +93,5 @@ SceneUrlModal.propTypes = {
   editorName: PropTypes.string,
   onSubmit: PropTypes.func,
   onClose: PropTypes.func,
-  onValidateUrl: PropTypes.isRequired
+  onValidateUrl: PropTypes.func.isRequired
 };

From 608ec91ef59f31b37bf0f59f9cba40ac70cc84fb Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Jun 2023 16:11:21 +0200
Subject: [PATCH 2/4] Fix types for scene info

---
 src/react-components/room/RoomSidebar.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/react-components/room/RoomSidebar.js b/src/react-components/room/RoomSidebar.js
index e4749679f9..98438a0b1c 100644
--- a/src/react-components/room/RoomSidebar.js
+++ b/src/react-components/room/RoomSidebar.js
@@ -148,15 +148,15 @@ SceneInfo.propTypes = {
   showAttributions: PropTypes.bool,
   canChangeScene: PropTypes.bool,
   onChangeScene: PropTypes.func,
-  scene: {
-    attributions: {
-      content: PropTypes.string,
+  scene: PropTypes.shape({
+    attributions: PropTypes.shape({
+      content: PropTypes.array,
       creator: PropTypes.string
-    },
+    }),
     url: PropTypes.string,
     screenshot_url: PropTypes.string,
     name: PropTypes.string
-  }
+  })
 };
 
 export function RoomSidebar({ room, accountId, onClose, canEdit, onEdit, onChangeScene }) {

From 20f0f474ecb618672b8c8eb701bac53f70ed4e31 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Jun 2023 16:11:33 +0200
Subject: [PATCH 3/4] Fix intl message structure

---
 src/react-components/room/SceneUrlModalContainer.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/react-components/room/SceneUrlModalContainer.js b/src/react-components/room/SceneUrlModalContainer.js
index e5ffff0750..5288da3f7f 100644
--- a/src/react-components/room/SceneUrlModalContainer.js
+++ b/src/react-components/room/SceneUrlModalContainer.js
@@ -11,7 +11,13 @@ export function SceneUrlModalContainer({ hubChannel, onClose }) {
   const onValidateUrl = useCallback(
     async url => {
       const valid = await isValidSceneUrl(url.trim());
-      return valid || intl.formatMessage("scene-url-modal.invalid-scene-url");
+      return (
+        valid ||
+        intl.formatMessage({
+          id: "scene-url-modal.invalid-scene-url",
+          defaultMessage: "This URL does not point to a scene or valid GLB."
+        })
+      );
     },
     [intl]
   );

From af293495c375c84a1c62284f5c56843bd424f313 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Jun 2023 16:11:45 +0200
Subject: [PATCH 4/4] Catch exception for isValidGLB

---
 src/utils/scene-url-utils.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/utils/scene-url-utils.js b/src/utils/scene-url-utils.js
index 0ed2a45f4c..4ce0d426e2 100644
--- a/src/utils/scene-url-utils.js
+++ b/src/utils/scene-url-utils.js
@@ -1,20 +1,22 @@
 import { isLocalHubsSceneUrl, proxiedUrlFor } from "../utils/media-url-utils";
 
 export async function isValidGLB(url) {
-  return fetch(url).then(async r => {
-    const reader = r.body.getReader();
-    let header = "";
-    function readChunk({ done, value }) {
-      header += String.fromCharCode.apply(null, value.slice(0, 4));
-      if (!done && header.length < 4) {
-        return reader.read().then(readChunk);
-      } else {
-        reader.cancel();
+  return fetch(url)
+    .then(async r => {
+      const reader = r.body.getReader();
+      let header = "";
+      function readChunk({ done, value }) {
+        header += String.fromCharCode.apply(null, value.slice(0, 4));
+        if (!done && header.length < 4) {
+          return reader.read().then(readChunk);
+        } else {
+          reader.cancel();
+        }
       }
-    }
-    await reader.read().then(readChunk);
-    return header.startsWith("glTF");
-  });
+      await reader.read().then(readChunk);
+      return header.startsWith("glTF");
+    })
+    .catch(e => console.error(e));
 }
 
 export async function isValidSceneUrl(url) {