Merge branch 'dev' into fix/asset-download-improvement

# Conflicts: # packages/atlas/src/hooks/useGetAssetUrl.ts # packages/atlas/src/views/viewer/VideoView/VideoView.tsx
WRadoslaw · Feb 27, 2024 · ad1abf6 · ad1abf6
2 parents 854c3d6 + aaf7235
commit ad1abf6
Show file tree

Hide file tree

Showing 18 changed files with 690 additions and 300 deletions.
diff --git a/packages/atlas/src/MainLayout.tsx b/packages/atlas/src/MainLayout.tsx
@@ -45,6 +45,21 @@ const LoadablePlaygroundLayout = loadable(
 )
 
 export const MainLayout: FC = () => {
+  return (
+    <>
+      <CookiePopover />
+      <MiscUtils />
+      <Routes>
+        <Route path={BASE_PATHS.viewer + '/*'} element={<ViewerLayout />} />
+        <Route path={BASE_PATHS.legal + '/*'} element={<LegalLayout />} />
+        <Route path={BASE_PATHS.studio + '/*'} element={<LoadableStudioLayout />} />
+        <Route path={BASE_PATHS.playground + '/*'} element={<LoadablePlaygroundLayout />} />
+      </Routes>
+    </>
+  )
+}
+
+const MiscUtils = () => {
   useTimeMismatchWarning()
   const scrollPosition = useRef<number>(0)
   const location = useLocation()
@@ -111,15 +126,5 @@ export const MainLayout: FC = () => {
     }, parseInt(transitions.timings.routing) + ROUTING_ANIMATION_OFFSET)
   }, [location, cachedLocation, locationState, navigationType, clearOverlays])
 
-  return (
-    <>
-      <CookiePopover />
-      <Routes>
-        <Route path={BASE_PATHS.viewer + '/*'} element={<ViewerLayout />} />
-        <Route path={BASE_PATHS.legal + '/*'} element={<LegalLayout />} />
-        <Route path={BASE_PATHS.studio + '/*'} element={<LoadableStudioLayout />} />
-        <Route path={BASE_PATHS.playground + '/*'} element={<LoadablePlaygroundLayout />} />
-      </Routes>
-    </>
-  )
+  return null
 }
diff --git a/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts b/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts