From 1e0841e1b4060f8a94ab63f81819cd79eebc6991 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 13 Dec 2023 16:46:58 +0100
Subject: [PATCH 01/54] Create global UIDocument for scenes UI + start
 implementing UIText systems

---
 .../AssetGroups/UI.asset                      |  5 ++
 .../Handlers/DebugLogReportHandler.cs         |  1 +
 .../ReportsHandling/ReportCategory.cs         |  5 ++
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   | 33 ++++++++
 .../PluginSystem/World/SceneUIPlugin.cs.meta  |  3 +
 .../Assets/Scenes/DynamicSceneLoading.unity   | 80 ++++++++++++++++++-
 .../Assets/Scenes/StaticSceneLoader.unity     | 75 ++++++++++++++++-
 .../Assets/Scripts/ECS/Unity/SceneUI.meta     |  3 +
 .../Scripts/ECS/Unity/SceneUI/Components.meta |  3 +
 .../SceneUI/Components/UITextComponent.cs     | 17 ++++
 .../Components/UITextComponent.cs.meta        |  3 +
 .../Unity/SceneUI/ScenesUIRootCanvas.prefab   | 50 ++++++++++++
 .../SceneUI/ScenesUIRootCanvas.prefab.meta}   |  4 +-
 .../Scripts/ECS/Unity/SceneUI/Systems.meta    |  3 +
 .../Systems/InstantiateSceneUISystem.cs       | 55 +++++++++++++
 .../Systems/InstantiateSceneUISystem.cs.meta  |  3 +
 .../Scripts/Global/ComponentsContainer.cs     |  2 +
 .../Global/Dynamic/DynamicSceneLoader.cs      |  3 +-
 .../Global/Static/StaticSceneLauncher.cs      |  7 +-
 .../Assets/Scripts/Global/StaticContainer.cs  |  6 +-
 .../Tests/PlayMode/IntegrationTestsSuite.cs   |  5 +-
 .../ProtobufPartialClasses/IDirtyMarker.cs    | 10 +++
 22 files changed, 365 insertions(+), 11 deletions(-)
 create mode 100644 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
 create mode 100644 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab
 rename Explorer/Assets/{AddressableAssetsData/Windows/addressables_content_state.bin.meta => Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta} (63%)
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta

diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
index ad83102aac..74b084e05e 100644
--- a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
+++ b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
@@ -52,6 +52,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2734962b32be95543bbfc82000f04fb4
+    m_Address: ScenesUIRootCanvas
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
   m_SchemaSet:
diff --git a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/Handlers/DebugLogReportHandler.cs b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/Handlers/DebugLogReportHandler.cs
index 7730fd2e03..4db7e1fac0 100644
--- a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/Handlers/DebugLogReportHandler.cs
+++ b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/Handlers/DebugLogReportHandler.cs
@@ -25,6 +25,7 @@ public class DebugLogReportHandler : ReportHandlerBase
             // Scene Loading blueish
             { ReportCategory.SCENE_LOADING, ColorUtility.ToHtmlStringRGB(new Color(0.30f, 0.50f, 0.90f)) },
             { ReportCategory.SCENE_FACTORY, ColorUtility.ToHtmlStringRGB(new Color(0.15f, 0.35f, 0.75f)) },
+            { ReportCategory.SCENE_UI, ColorUtility.ToHtmlStringRGB(new Color(0.10f, 0.30f, 0.45f)) },
 
             // JavaScript
             { ReportCategory.JAVASCRIPT, ColorUtility.ToHtmlStringRGB(new Color(0.90f, 0.30f, 0.35f)) },
diff --git a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/ReportCategory.cs b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/ReportCategory.cs
index 78c63a8a4d..e4cedfe211 100644
--- a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/ReportCategory.cs
+++ b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Diagnostics/ReportsHandling/ReportCategory.cs
@@ -40,6 +40,11 @@ public static class ReportCategory
         /// </summary>
         public const string SCENE_LOADING = nameof(SCENE_LOADING);
 
+        /// <summary>
+        ///     Messages related to the scene UI
+        /// </summary>
+        public const string SCENE_UI = nameof(SCENE_UI);
+
         /// <summary>
         ///     Errors reported from JavaScript
         /// </summary>
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
new file mode 100644
index 0000000000..03eddddd5b
--- /dev/null
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -0,0 +1,33 @@
+using Arch.SystemGroups;
+using DCL.Optimization.Pools;
+using DCL.PluginSystem.World.Dependencies;
+using ECS.LifeCycle;
+using ECS.Unity.SceneUI.Systems;
+using System.Collections.Generic;
+using UnityEngine.UIElements;
+
+namespace DCL.PluginSystem.World
+{
+    public class SceneUIPlugin : IDCLWorldPluginWithoutSettings
+    {
+        private readonly UIDocument canvas;
+        private readonly IComponentPoolsRegistry componentPoolsRegistry;
+
+        public SceneUIPlugin(
+            UIDocument canvas,
+            ECSWorldSingletonSharedDependencies singletonSharedDependencies)
+        {
+            this.canvas = canvas;
+
+            componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
+            componentPoolsRegistry.AddComponentPool<Label>();
+        }
+
+        public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
+        {
+            InstantiateSceneUISystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+        }
+
+        public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
+    }
+}
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs.meta b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs.meta
new file mode 100644
index 0000000000..d48358be4d
--- /dev/null
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a9d760b95bc544e285abd9c9766d39c2
+timeCreated: 1702054494
\ No newline at end of file
diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index 03dd365c6e..e86a7fb1c7 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -123,6 +123,17 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!114 &78723076 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+  m_PrefabInstance: {fileID: 3158676383174102666}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &158563621
 GameObject:
   m_ObjectHideFlags: 0
@@ -279,8 +290,9 @@ MonoBehaviour:
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
+  scenesUiRoot: {fileID: 78723076}
   StartPosition: {x: 0, y: 0}
-  SceneLoadRadius: 4
+  SceneLoadRadius: 1
   StaticLoadPositions: []
   realmLauncher: {fileID: 234607244}
   realms:
@@ -289,6 +301,7 @@ MonoBehaviour:
   - https://sdk-test-scenes.decentraland.zone
   - https://peer.decentraland.org
   - https://worlds-content-server.decentraland.org/world/olavra.dcl.eth
+  - http://127.0.0.1:8000
   dynamicSettings:
     <PopupCloserView>k__BackingField:
       m_AssetGUID: dbfb7e67a438449f9a887f820f733868
@@ -1461,7 +1474,7 @@ RectTransform:
   - {fileID: 2095941040}
   - {fileID: 1277831542}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2046,8 +2059,69 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &3158676383174102666
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8765448689815683113, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_Name
+      value: ScenesUIRootCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
 --- !u!1001 &4363253906714060728
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Explorer/Assets/Scenes/StaticSceneLoader.unity b/Explorer/Assets/Scenes/StaticSceneLoader.unity
index f3f2c241da..408ef6727e 100644
--- a/Explorer/Assets/Scenes/StaticSceneLoader.unity
+++ b/Explorer/Assets/Scenes/StaticSceneLoader.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
+  m_IndirectSpecularColor: {r: 0.12731868, g: 0.13414744, b: 0.12107858, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -179,6 +179,7 @@ MonoBehaviour:
     - sdk6-basic-scene
   globalPluginSettingsContainer: {fileID: 11400000, guid: 7575a56449e4af444b9c13267319c95d, type: 2}
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
+  scenesUiRoot: {fileID: 1254164264}
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
@@ -434,6 +435,78 @@ MonoBehaviour:
     mipBias: 0
     varianceClampScale: 0.9
     contrastAdaptiveSharpening: 0
+--- !u!1001 &1254164263
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8765448689815683113, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+      propertyPath: m_Name
+      value: ScenesUIRootCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+--- !u!114 &1254164264 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+  m_PrefabInstance: {fileID: 1254164263}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2137356830
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta
new file mode 100644
index 0000000000..72b67b87b4
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f93dbd780b864b4ebdc0f90b3bf8f1dd
+timeCreated: 1702293070
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta
new file mode 100644
index 0000000000..1498556751
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ed5204f2085d4fbdad96735d86eca4bc
+timeCreated: 1702479170
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs
new file mode 100644
index 0000000000..effcffc04a
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs
@@ -0,0 +1,17 @@
+using DCL.Optimization.Pools;
+using System;
+using UnityEngine.UIElements;
+
+namespace ECS.Unity.SceneUI.Components
+{
+    public struct UITextComponent: IPoolableComponentProvider<Label>
+    {
+        public Label Label;
+        public Label PoolableComponent => Label;
+
+        Label IPoolableComponentProvider<Label>.PoolableComponent => Label;
+        Type IPoolableComponentProvider<Label>.PoolableComponentType => typeof(Label);
+
+        public void Dispose(){ }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta
new file mode 100644
index 0000000000..b7786b5b3a
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 648c1fd5dd79417f96ccd80bec48bbb4
+timeCreated: 1702479199
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab
new file mode 100644
index 0000000000..81384cad68
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab
@@ -0,0 +1,50 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8765448689815683113
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4780495006830554941}
+  - component: {fileID: 3889322179606995116}
+  m_Layer: 5
+  m_Name: ScenesUIRootCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4780495006830554941
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8765448689815683113}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3889322179606995116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8765448689815683113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PanelSettings: {fileID: 11400000, guid: 9be11967a62ac1e43a24aecf7ff62934, type: 2}
+  m_ParentUI: {fileID: 0}
+  sourceAsset: {fileID: 0}
+  m_SortingOrder: 200
diff --git a/Explorer/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
similarity index 63%
rename from Explorer/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta
rename to Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
index 128d712ca0..f371c614f2 100644
--- a/Explorer/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 6ba3d1ad6dde3b64dbe078d478719324
-DefaultImporter:
+guid: 2734962b32be95543bbfc82000f04fb4
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta
new file mode 100644
index 0000000000..f6c263352b
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 87af84e68e0040deb3ddcbcdfaf9c54e
+timeCreated: 1702293109
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
new file mode 100644
index 0000000000..c3151cf2cb
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
@@ -0,0 +1,55 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using ECS.Abstract;
+using ECS.Unity.ColorComponent;
+using ECS.Unity.Groups;
+using ECS.Unity.SceneUI.Components;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace ECS.Unity.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class InstantiateSceneUISystem : BaseUnityLoopSystem
+    {
+        private readonly UIDocument canvas;
+        private readonly IComponentPool<Label> labelsPool;
+
+        internal InstantiateSceneUISystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        {
+            this.canvas = canvas;
+            labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
+        }
+
+        protected override void Update(float t)
+        {
+            InstantiateNonExistingUITextQuery(World);
+        }
+
+        [Query]
+        [All(typeof(PBUiText), typeof(PBUiTransform))]
+        [None(typeof(UITextComponent))]
+        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent)
+        {
+            // Instantiate the UI Text
+            var label = labelsPool.Get();
+            label.text = sdkComponent.Value;
+            label.style.color = sdkComponent.Color.ToUnityColor();
+            label.style.fontSize = sdkComponent.HasFontSize ? sdkComponent.FontSize : 10;
+            label.style.unityTextAlign = TextAnchor.MiddleCenter;
+            canvas.rootVisualElement.Add(label);
+
+            // Add the UITextComponent to the entity
+            var uiTextComponent = new UITextComponent();
+            uiTextComponent.Label = label;
+            World.Add(entity, uiTextComponent);
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta
new file mode 100644
index 0000000000..00f71a7085
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c769d464f6e0498ba94016580bdac162
+timeCreated: 1702053897
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/Global/ComponentsContainer.cs b/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
index 88a336a4d6..e083670e41 100644
--- a/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
+++ b/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
@@ -38,6 +38,8 @@ public static ComponentsContainer Create()
                .Add(SDKComponentBuilder<PBTextShape>.Create(ComponentID.TEXT_SHAPE).AsProtobufComponent())
                .Add(SDKComponentBuilder<PBMaterial>.Create(ComponentID.MATERIAL).AsProtobufComponent())
                .Add(SDKComponentBuilder<PBRaycast>.Create(ComponentID.RAYCAST).AsProtobufComponent())
+               .Add(SDKComponentBuilder<PBUiTransform>.Create(ComponentID.UI_TRANSFORM).AsProtobufComponent())
+               .Add(SDKComponentBuilder<PBUiText>.Create(ComponentID.UI_TEXT).AsProtobufComponent())
 
                 // Special logic for pooling/releasing PBRaycastResult
                .Add(SDKComponentBuilder<PBRaycastResult>.Create(ComponentID.RAYCAST_RESULT)
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index cf2fe1f399..879b770de2 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -24,6 +24,7 @@ public class DynamicSceneLoader : MonoBehaviour
         [Space]
         [SerializeField] private UIDocument uiToolkitRoot;
         [SerializeField] private UIDocument debugUiRoot;
+        [SerializeField] private UIDocument scenesUiRoot;
         [SerializeField] private Vector2Int StartPosition;
         [SerializeField] [Obsolete] private int SceneLoadRadius = 4;
 
@@ -79,7 +80,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, web3Authenticator, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUiRoot, web3Authenticator, ct);
 
                 if (!isLoaded)
                 {
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 30a54325b9..592612926b 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Threading;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace Global.Static
 {
@@ -16,6 +17,7 @@ public class StaticSceneLauncher : MonoBehaviour
         [SerializeField] private SceneLauncher sceneLauncher;
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
+        [SerializeField] private UIDocument scenesUiRoot;
 
         private ISceneFacade sceneFacade;
 
@@ -41,7 +43,7 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
                 SceneSharedContainer sceneSharedContainer;
 
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
-                    web3Authenticator, ct);
+                    scenesUiRoot, web3Authenticator, ct);
                 sceneLauncher.Initialize(sceneSharedContainer, destroyCancellationToken);
             }
             catch (OperationCanceledException) { }
@@ -56,12 +58,13 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
         public static async UniTask<(StaticContainer staticContainer, SceneSharedContainer sceneSharedContainer)> InstallAsync(
             IPluginSettingsContainer globalSettingsContainer,
             IPluginSettingsContainer sceneSettingsContainer,
+            UIDocument scenesUiRoot,
             IWeb3Authenticator web3Authenticator,
             CancellationToken ct)
         {
             // First load the common global plugin
             (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(globalSettingsContainer,
-                web3Authenticator, ct);
+                scenesUiRoot, web3Authenticator, ct);
 
             if (!isLoaded)
                 GameReports.PrintIsDead();
diff --git a/Explorer/Assets/Scripts/Global/StaticContainer.cs b/Explorer/Assets/Scripts/Global/StaticContainer.cs
index ba02502529..7445f81ba8 100644
--- a/Explorer/Assets/Scripts/Global/StaticContainer.cs
+++ b/Explorer/Assets/Scripts/Global/StaticContainer.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace Global
 {
@@ -93,7 +94,9 @@ await UniTask.WhenAll(
                     AssetsProvisioner.ProvideMainAssetAsync(settings.RealmPartitionSettings, ct));
         }
 
-        public static async UniTask<(StaticContainer container, bool success)> CreateAsync(IPluginSettingsContainer settingsContainer,
+        public static async UniTask<(StaticContainer container, bool success)> CreateAsync(
+            IPluginSettingsContainer settingsContainer,
+            UIDocument scenesUIDocument,
             IWeb3Authenticator web3Authenticator,
             CancellationToken ct)
         {
@@ -150,6 +153,7 @@ await UniTask.WhenAll(
                 assetBundlePlugin,
                 new GltfContainerPlugin(sharedDependencies, container.CacheCleaner),
                 new InteractionPlugin(sharedDependencies, profilingProvider, exposedGlobalDataContainer.GlobalInputEvents),
+                new SceneUIPlugin(scenesUIDocument, sharedDependencies),
 #if UNITY_EDITOR
                 new GizmosWorldPlugin(),
 #endif
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index 4c87ac735e..fdb74f448b 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -5,6 +5,7 @@
 using NSubstitute;
 using System.Threading;
 using UnityEngine.AddressableAssets;
+using UnityEngine.UIElements;
 
 namespace Global.Tests
 {
@@ -12,14 +13,16 @@ public static class IntegrationTestsSuite
     {
         private const string GLOBAL_CONTAINER_ADDRESS = "Integration Tests Global Container";
         private const string WORLD_CONTAINER_ADDRESS = "Integration Tests World Container";
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
 
         public static async UniTask<(StaticContainer staticContainer, SceneSharedContainer sceneSharedContainer)> CreateStaticContainer()
         {
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
+            UIDocument scenesUIRootCanvas = await Addressables.LoadAssetAsync<UIDocument>(SCENES_UI_ROOT_CANVAS);
 
             return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,
-                Substitute.For<IWeb3Authenticator>(), CancellationToken.None);
+                scenesUIRootCanvas, Substitute.For<IWeb3Authenticator>(), CancellationToken.None);
         }
     }
 }
diff --git a/Explorer/Assets/Scripts/ProtobufPartialClasses/IDirtyMarker.cs b/Explorer/Assets/Scripts/ProtobufPartialClasses/IDirtyMarker.cs
index b56b47a735..b25d5bde69 100644
--- a/Explorer/Assets/Scripts/ProtobufPartialClasses/IDirtyMarker.cs
+++ b/Explorer/Assets/Scripts/ProtobufPartialClasses/IDirtyMarker.cs
@@ -67,6 +67,16 @@ public partial class PBRaycast : IDirtyMarker
         public bool IsDirty { get; set; }
     }
 
+    public partial class PBUiTransform : IDirtyMarker
+    {
+        public bool IsDirty { get; set; }
+    }
+
+    public partial class PBUiText : IDirtyMarker
+    {
+        public bool IsDirty { get; set; }
+    }
+
     public static class DirtyMarkerExtensions
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

From 0647ca6f02187b058c07aa69eafc774217c0dc8b Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 1 Jan 2024 11:12:57 +0100
Subject: [PATCH 02/54] Fix conflicts after last merge

---
 .../AssetGroups/UI.asset                      |   2 +-
 .../ProfileDataSourceSettings.asset.meta      |   8 --
 .../Assets/Scenes/DynamicSceneLoading.unity   | 120 ++++++++++++++----
 .../Assets/Scenes/StaticSceneLoader.unity     |  28 ++--
 .../SceneUI/ScenesUIRootCanvas.prefab.meta    |   2 +-
 .../Dynamic/DynamicSceneLoaderSettings.asset  |   1 +
 .../UserSettings/EditorUserSettings.asset     |   4 +-
 7 files changed, 116 insertions(+), 49 deletions(-)
 delete mode 100644 Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta

diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
index 74b084e05e..42ad0eafa5 100644
--- a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
+++ b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
@@ -52,7 +52,7 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2734962b32be95543bbfc82000f04fb4
+  - m_GUID: e0f5a4ab5d8f74640ae94adb6824bd45
     m_Address: ScenesUIRootCanvas
     m_ReadOnly: 0
     m_SerializedLabels: []
diff --git a/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
deleted file mode 100644
index 761988bff9..0000000000
--- a/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ebe2a662356314f05b03623e66ea7c24
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index dba1e6d006..3896461df5 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -146,13 +146,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 158563621}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &170878723
 GameObject:
@@ -185,6 +185,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1648087549}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -254,13 +255,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 234607240}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &234607243
 MonoBehaviour:
@@ -278,6 +279,7 @@ MonoBehaviour:
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
+  scenesUiRoot: {fileID: 1863727842}
   realmLauncher: {fileID: 234607244}
   settings: {fileID: 11400000, guid: 2e1d2c350e04ac3428300d032c5ee567, type: 2}
   dynamicSettings:
@@ -372,6 +374,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1648087549}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -446,6 +449,7 @@ RectTransform:
   m_Children:
   - {fileID: 619587374}
   m_Father: {fileID: 1382499186}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -485,6 +489,7 @@ RectTransform:
   m_Children:
   - {fileID: 1895623060}
   m_Father: {fileID: 1385343039}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -573,6 +578,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 527563491}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0.2}
@@ -704,13 +710,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 705507993}
-  serializedVersion: 2
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!114 &705507996
 MonoBehaviour:
@@ -775,13 +781,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 946305962}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1277831541
 GameObject:
@@ -814,6 +820,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1431507216}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -957,13 +964,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1281082859}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1281082863
 MonoBehaviour:
@@ -1026,6 +1033,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1648087549}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1162,6 +1170,7 @@ RectTransform:
   m_Children:
   - {fileID: 527563491}
   m_Father: {fileID: 1385343039}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1289,6 +1298,7 @@ RectTransform:
   - {fileID: 603247677}
   - {fileID: 1382499186}
   m_Father: {fileID: 2095941040}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1460,6 +1470,7 @@ RectTransform:
   - {fileID: 2095941040}
   - {fileID: 1277831542}
   m_Father: {fileID: 0}
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1499,6 +1510,7 @@ RectTransform:
   - {fileID: 446244953}
   - {fileID: 1335601610}
   m_Father: {fileID: 1895623060}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -1576,13 +1588,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1800558272}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1855600545
 GameObject:
@@ -1615,6 +1627,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2095941040}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -1659,6 +1672,78 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1855600545}
   m_CullTransparentMesh: 1
+--- !u!1001 &1863727841
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_Name
+      value: ScenesUIRootCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+--- !u!114 &1863727842 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+  m_PrefabInstance: {fileID: 1863727841}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1895623059
 GameObject:
   m_ObjectHideFlags: 0
@@ -1689,6 +1774,7 @@ RectTransform:
   m_Children:
   - {fileID: 1648087549}
   m_Father: {fileID: 603247677}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1735,13 +1821,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1901323877}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2042493840
 GameObject:
@@ -1774,6 +1860,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2095941040}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1912,6 +1999,7 @@ RectTransform:
   - {fileID: 1855600546}
   - {fileID: 1385343039}
   m_Father: {fileID: 1431507216}
+  m_RootOrder: -2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2033,13 +2121,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2104274356}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &4363253906714060728
 PrefabInstance:
@@ -2071,7 +2159,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2118,17 +2206,3 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
---- !u!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 234607242}
-  - {fileID: 158563622}
-  - {fileID: 705507995}
-  - {fileID: 4363253906714060728}
-  - {fileID: 1800558273}
-  - {fileID: 1281082862}
-  - {fileID: 1901323879}
-  - {fileID: 946305964}
-  - {fileID: 1431507216}
-  - {fileID: 2104274357}
diff --git a/Explorer/Assets/Scenes/StaticSceneLoader.unity b/Explorer/Assets/Scenes/StaticSceneLoader.unity
index 408ef6727e..7839bb1646 100644
--- a/Explorer/Assets/Scenes/StaticSceneLoader.unity
+++ b/Explorer/Assets/Scenes/StaticSceneLoader.unity
@@ -443,51 +443,51 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_RootOrder
       value: 4
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8765448689815683113, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
       propertyPath: m_Name
       value: ScenesUIRootCanvas
       objectReference: {fileID: 0}
@@ -495,10 +495,10 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
 --- !u!114 &1254164264 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: 2734962b32be95543bbfc82000f04fb4, type: 3}
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
   m_PrefabInstance: {fileID: 1254164263}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
index 18551a6f1c..7b89471cf8 100644
--- a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
+++ b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
-guid: 2734962b32be95543bbfc82000f04fb4
+guid: e0f5a4ab5d8f74640ae94adb6824bd45
 PrefabImporter:
 ========
 guid: 642801d2974ab4d07b5d73006e6421df
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
index b5135ca479..6e29d2e2c1 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
@@ -22,3 +22,4 @@ MonoBehaviour:
   - https://peer.decentraland.org
   - https://worlds-content-server.decentraland.org/world/olavra.dcl.eth
   - https://worlds-content-server.decentraland.org/world/yemel.dcl.eth
+  - http://127.0.0.1:8000
diff --git a/Explorer/UserSettings/EditorUserSettings.asset b/Explorer/UserSettings/EditorUserSettings.asset
index e2a32b564d..289dcd47d0 100644
--- a/Explorer/UserSettings/EditorUserSettings.asset
+++ b/Explorer/UserSettings/EditorUserSettings.asset
@@ -9,13 +9,13 @@ EditorUserSettings:
       value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0607020350035e5d5d0f5c7212265e4447164c282f7a7f642e791c31e3b8636b
+      value: 5a55570203075a5d0c5b557547775a4917161d2e7c2924677c714a6ab0e2646c
       flags: 0
     RecentlyUsedSceneGuid-2:
       value: 05025151010350585a5d0d7416200c44124f4a7c752a71652c784830e3e5666e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5a55570203075a5d0c5b557547775a4917161d2e7c2924677c714a6ab0e2646c
+      value: 0607020350035e5d5d0f5c7212265e4447164c282f7a7f642e791c31e3b8636b
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

From 17836eeda1143f56cf3c9c576c8157820ae63bfc Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 1 Jan 2024 12:25:39 +0100
Subject: [PATCH 03/54] Fix IntegrationTestsSuite

---
 .../Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index fdb74f448b..583507c575 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -4,6 +4,7 @@
 using Global.Static;
 using NSubstitute;
 using System.Threading;
+using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.UIElements;
 
@@ -19,7 +20,7 @@ public static class IntegrationTestsSuite
         {
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
-            UIDocument scenesUIRootCanvas = await Addressables.LoadAssetAsync<UIDocument>(SCENES_UI_ROOT_CANVAS);
+            UIDocument scenesUIRootCanvas = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
 
             return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,
                 scenesUIRootCanvas, Substitute.For<IWeb3Authenticator>(), CancellationToken.None);

From 4406ce089076ac11e617a76ec9ba66b8b9d3076b Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 1 Jan 2024 17:27:02 +0100
Subject: [PATCH 04/54] Move SceneUI folder to DCL/SDKComponents

---
 .../DCL/PluginSystem/DCL.Plugins.asmdef       |  3 +-
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  9 +-
 .../Unity => DCL/SDKComponents}/SceneUI.meta  |  0
 .../SDKComponents}/SceneUI/Components.meta    |  0
 .../SceneUI/Components/UITextComponent.cs     |  2 +-
 .../Components/UITextComponent.cs.meta        |  0
 .../SDKComponents/SceneUI/PBUiTextDefaults.cs | 23 ++++++
 .../SceneUI/PBUiTextDefaults.cs.meta          |  3 +
 .../DCL/SDKComponents/SceneUI/SceneUI.asmdef  | 31 +++++++
 .../SDKComponents/SceneUI/SceneUI.asmdef.meta |  7 ++
 .../SceneUI/ScenesUIRootCanvas.prefab         |  0
 .../SceneUI/ScenesUIRootCanvas.prefab.meta    |  0
 .../SDKComponents}/SceneUI/Systems.meta       |  0
 .../SceneUI/Systems/UITextHandlerSystem.cs    | 82 +++++++++++++++++++
 .../Systems/UITextHandlerSystem.cs.meta}      |  0
 .../Systems/InstantiateSceneUISystem.cs       | 55 -------------
 Explorer/Assets/Scripts/ECS/Unity/Utils.meta  |  3 +
 .../ECS/Unity/Utils/ProtoConvertUtils.cs      | 38 +++++++++
 .../ECS/Unity/Utils/ProtoConvertUtils.cs.meta |  3 +
 .../Scripts/ECS/Unity/Utils/UiElementUtils.cs | 20 +++++
 .../ECS/Unity/Utils/UiElementUtils.cs.meta    |  3 +
 21 files changed, 222 insertions(+), 60 deletions(-)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI.meta (100%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/Components.meta (100%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/Components/UITextComponent.cs (90%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/Components/UITextComponent.cs.meta (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef.meta
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/ScenesUIRootCanvas.prefab (100%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/ScenesUIRootCanvas.prefab.meta (100%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents}/SceneUI/Systems.meta (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
 rename Explorer/Assets/{Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta => DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs.meta} (100%)
 delete mode 100644 Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta

diff --git a/Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef b/Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef
index 24d5aac94b..68a295d09c 100644
--- a/Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef
+++ b/Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef
@@ -55,7 +55,8 @@
         "GUID:db9f6ca714dd4f9b9755c0faa3a8f24c",
         "GUID:6830e2f56251b492e9934f1fafbc8c7d",
         "GUID:5ab29fa8ae5769b49ab29e390caca7a4",
-        "GUID:e56a0d6a94c144c784012e63b6043100"
+        "GUID:e56a0d6a94c144c784012e63b6043100",
+        "GUID:7f6c11dd1400cef4f838168f18ce244a"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 03eddddd5b..fdf81fe1db 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -1,8 +1,8 @@
 using Arch.SystemGroups;
 using DCL.Optimization.Pools;
 using DCL.PluginSystem.World.Dependencies;
+using DCL.SDKComponents.SceneUI.Systems;
 using ECS.LifeCycle;
-using ECS.Unity.SceneUI.Systems;
 using System.Collections.Generic;
 using UnityEngine.UIElements;
 
@@ -25,9 +25,12 @@ public SceneUIPlugin(
 
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
-            InstantiateSceneUISystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
         }
 
-        public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
+        public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies)
+        {
+            UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+        }
     }
 }
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Components.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
similarity index 90%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
index effcffc04a..fa36ac304c 100644
--- a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using UnityEngine.UIElements;
 
-namespace ECS.Unity.SceneUI.Components
+namespace DCL.SDKComponents.SceneUI.Components
 {
     public struct UITextComponent: IPoolableComponentProvider<Label>
     {
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/Components/UITextComponent.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
new file mode 100644
index 0000000000..ef53a6418f
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
@@ -0,0 +1,23 @@
+using DCL.ECSComponents;
+using ECS.Unity.ColorComponent;
+using ECS.Unity.Utils;
+using UnityEngine;
+using Font = DCL.ECSComponents.Font;
+
+namespace DCL.SDKComponents.SceneUI
+{
+    public static class PBUiTextDefaults
+    {
+        public static Color GetColor(this PBUiText self) =>
+            self.Color?.ToUnityColor() ?? ColorDefaults.COLOR_WHITE;
+
+        public static TextAnchor GetTextAlign(this PBUiText self) =>
+            (self.HasTextAlign ? self.TextAlign : TextAlignMode.TamMiddleCenter).ToUnityTextAlign();
+
+        public static Font GetFont(this PBUiText self) =>
+            self.HasFont ? self.Font : Font.FSansSerif;
+
+        public static float GetFontSize(this PBUiText self) =>
+            self.HasFontSize ? self.FontSize : 10;
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta
new file mode 100644
index 0000000000..32abd857d0
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7b022cfbdbbf416cb754f488802b887a
+timeCreated: 1704112783
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
new file mode 100644
index 0000000000..09b67c5d1c
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
@@ -0,0 +1,31 @@
+{
+    "name": "SceneUI",
+    "rootNamespace": "",
+    "references": [
+        "GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
+        "GUID:4794e238ed0f65142a4aea5848b513e5",
+        "GUID:275e22790c04e9b47a5085d7b0c4432a",
+        "GUID:3c7b57a14671040bd8c549056adc04f5",
+        "GUID:0f4c0f120707fb74497f5d581b9858f8",
+        "GUID:fa7b3fdbb04d67549916da7bd2af58ab",
+        "GUID:08b2edf8f14cdd3408988fd7746b749c",
+        "GUID:d414ef88f3b15f746a4b97636b50dfb4",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23",
+        "GUID:fd2b275602de4d638e01adafe118d5ea",
+        "GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:56e8195b069a4dca9c4c4f313c65f526",
+        "GUID:393a5d2fbaa249d09c260018aaeb4fc0",
+        "GUID:166b65e6dfc848bb9fb075f53c293a38",
+        "GUID:101b8b6ebaf64668909b49c4b7a1420d"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef.meta
new file mode 100644
index 0000000000..7408f181c5
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7f6c11dd1400cef4f838168f18ce244a
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIRootCanvas.prefab
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIRootCanvas.prefab
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIRootCanvas.prefab.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/ScenesUIRootCanvas.prefab.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIRootCanvas.prefab.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
new file mode 100644
index 0000000000..1084a64c40
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -0,0 +1,82 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.Abstract;
+using ECS.Unity.ColorComponent;
+using ECS.Unity.Groups;
+using ECS.Unity.Utils;
+using UnityEngine.UIElements;
+using Entity = Arch.Core.Entity;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITextHandlerSystem : BaseUnityLoopSystem
+    {
+        private readonly UIDocument canvas;
+        private readonly IComponentPool<Label> labelsPool;
+
+        private UITextHandlerSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        {
+            this.canvas = canvas;
+            labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
+        }
+
+        protected override void Update(float t)
+        {
+            InstantiateNonExistingUITextQuery(World);
+            TrySetupExistingUITextQuery(World);
+        }
+
+        [Query]
+        [All(typeof(PBUiText), typeof(PBUiTransform))]
+        [None(typeof(UITextComponent))]
+        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent)
+        {
+            var uiTextComponent = new UITextComponent();
+            InstantiateLabel(ref uiTextComponent, ref sdkComponent);
+            World.Add(entity, uiTextComponent);
+        }
+
+        [Query]
+        [All(typeof(PBUiText), typeof(PBUiTransform), typeof(UITextComponent))]
+        private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
+        {
+            if (!sdkComponent.IsDirty)
+                return;
+
+            if (ReferenceEquals(uiTextComponent.Label, null))
+                InstantiateLabel(ref uiTextComponent, ref sdkComponent);
+            else
+                SetupLabel(uiTextComponent.Label, sdkComponent);
+
+            sdkComponent.IsDirty = false;
+        }
+
+        private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
+        {
+            var label = labelsPool.Get();
+            UiElementUtils.SetElementDefaultStyle(label.style);
+            canvas.rootVisualElement.Add(label);
+            uiTextComponent.Label = label;
+
+            SetupLabel(label, sdkComponent);
+        }
+
+        private static void SetupLabel(Label labelToSetup, PBUiText pbModel)
+        {
+            labelToSetup.text = pbModel.Value;
+            labelToSetup.style.color = pbModel.GetColor();
+            labelToSetup.style.fontSize = pbModel.GetFontSize();
+            labelToSetup.style.unityTextAlign = pbModel.GetTextAlign();
+            //labelToSetup.style.unityFont = pbModel.GetFont();
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs b/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
deleted file mode 100644
index c3151cf2cb..0000000000
--- a/Explorer/Assets/Scripts/ECS/Unity/SceneUI/Systems/InstantiateSceneUISystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Arch.Core;
-using Arch.System;
-using Arch.SystemGroups;
-using Arch.SystemGroups.Throttling;
-using DCL.Diagnostics;
-using DCL.ECSComponents;
-using DCL.Optimization.Pools;
-using ECS.Abstract;
-using ECS.Unity.ColorComponent;
-using ECS.Unity.Groups;
-using ECS.Unity.SceneUI.Components;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace ECS.Unity.SceneUI.Systems
-{
-    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
-    [LogCategory(ReportCategory.SCENE_UI)]
-    [ThrottlingEnabled]
-    public partial class InstantiateSceneUISystem : BaseUnityLoopSystem
-    {
-        private readonly UIDocument canvas;
-        private readonly IComponentPool<Label> labelsPool;
-
-        internal InstantiateSceneUISystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
-        {
-            this.canvas = canvas;
-            labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
-        }
-
-        protected override void Update(float t)
-        {
-            InstantiateNonExistingUITextQuery(World);
-        }
-
-        [Query]
-        [All(typeof(PBUiText), typeof(PBUiTransform))]
-        [None(typeof(UITextComponent))]
-        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent)
-        {
-            // Instantiate the UI Text
-            var label = labelsPool.Get();
-            label.text = sdkComponent.Value;
-            label.style.color = sdkComponent.Color.ToUnityColor();
-            label.style.fontSize = sdkComponent.HasFontSize ? sdkComponent.FontSize : 10;
-            label.style.unityTextAlign = TextAnchor.MiddleCenter;
-            canvas.rootVisualElement.Add(label);
-
-            // Add the UITextComponent to the entity
-            var uiTextComponent = new UITextComponent();
-            uiTextComponent.Label = label;
-            World.Add(entity, uiTextComponent);
-        }
-    }
-}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils.meta b/Explorer/Assets/Scripts/ECS/Unity/Utils.meta
new file mode 100644
index 0000000000..24509742b0
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/Utils.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 045b78920de04aa3932b0e56d2873739
+timeCreated: 1704113613
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs b/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs
new file mode 100644
index 0000000000..437f7ffc80
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs
@@ -0,0 +1,38 @@
+using DCL.ECSComponents;
+using UnityEngine;
+
+namespace ECS.Unity.Utils
+{
+    public static class ProtoConvertUtils
+    {
+        public static TextAnchor ToUnityTextAlign(this TextAlignMode align)
+        {
+            switch (align)
+            {
+                case TextAlignMode.TamTopCenter:
+                    return TextAnchor.UpperCenter;
+                case TextAlignMode.TamTopLeft:
+                    return TextAnchor.UpperLeft;
+                case TextAlignMode.TamTopRight:
+                    return TextAnchor.UpperRight;
+
+                case TextAlignMode.TamBottomCenter:
+                    return TextAnchor.LowerCenter;
+                case TextAlignMode.TamBottomLeft:
+                    return TextAnchor.LowerLeft;
+                case TextAlignMode.TamBottomRight:
+                    return TextAnchor.LowerRight;
+
+                case TextAlignMode.TamMiddleCenter:
+                    return TextAnchor.MiddleCenter;
+                case TextAlignMode.TamMiddleLeft:
+                    return TextAnchor.MiddleLeft;
+                case TextAlignMode.TamMiddleRight:
+                    return TextAnchor.MiddleRight;
+
+                default:
+                    return TextAnchor.MiddleCenter;
+            }
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta b/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta
new file mode 100644
index 0000000000..b488741179
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 14d93f2b4b40466d95071a46a4bced08
+timeCreated: 1704112991
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs b/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs
new file mode 100644
index 0000000000..751353a033
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs
@@ -0,0 +1,20 @@
+using UnityEngine.UIElements;
+
+namespace ECS.Unity.Utils
+{
+    public static class UiElementUtils
+    {
+        public static void SetElementDefaultStyle(IStyle elementStyle)
+        {
+            elementStyle.right = 0;
+            elementStyle.left = 0;
+            elementStyle.top = 0;
+            elementStyle.bottom = 0;
+            elementStyle.width = new StyleLength(StyleKeyword.Auto);
+            elementStyle.height = new StyleLength(StyleKeyword.Auto);
+            elementStyle.position = new StyleEnum<Position>(Position.Absolute);
+            elementStyle.justifyContent = new StyleEnum<Justify>(Justify.Center);
+            elementStyle.alignItems = new StyleEnum<Align>(Align.Center);
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta b/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta
new file mode 100644
index 0000000000..4565ab4e32
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 00ec847eaf6848d6a56e5ae1d9e9ffd5
+timeCreated: 1704114066
\ No newline at end of file

From bd7058a1bf68c332a9a2c2b54a2d871301c86ea9 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 1 Jan 2024 18:19:22 +0100
Subject: [PATCH 05/54] Handle UIText removal

---
 .../SceneUI/Systems/UITextHandlerSystem.cs    | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
index 1084a64c40..e81f95492a 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -7,7 +7,7 @@
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
 using ECS.Abstract;
-using ECS.Unity.ColorComponent;
+using ECS.LifeCycle.Components;
 using ECS.Unity.Groups;
 using ECS.Unity.Utils;
 using UnityEngine.UIElements;
@@ -21,11 +21,13 @@ namespace DCL.SDKComponents.SceneUI.Systems
     public partial class UITextHandlerSystem : BaseUnityLoopSystem
     {
         private readonly UIDocument canvas;
+        private readonly IComponentPoolsRegistry poolsRegistry;
         private readonly IComponentPool<Label> labelsPool;
 
         private UITextHandlerSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             this.canvas = canvas;
+            this.poolsRegistry = poolsRegistry;
             labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
         }
 
@@ -33,10 +35,13 @@ protected override void Update(float t)
         {
             InstantiateNonExistingUITextQuery(World);
             TrySetupExistingUITextQuery(World);
+            HandleEntityDestructionQuery(World);
+            HandleUITextRemovalQuery(World);
+            World.Remove<UITextComponent>(in HandleUITextRemoval_QueryDescription);
         }
 
         [Query]
-        [All(typeof(PBUiText), typeof(PBUiTransform))]
+        [All(typeof(PBUiText))]
         [None(typeof(UITextComponent))]
         private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent)
         {
@@ -46,7 +51,7 @@ private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComp
         }
 
         [Query]
-        [All(typeof(PBUiText), typeof(PBUiTransform), typeof(UITextComponent))]
+        [All(typeof(PBUiText), typeof(UITextComponent))]
         private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
         {
             if (!sdkComponent.IsDirty)
@@ -60,6 +65,16 @@ private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBU
             sdkComponent.IsDirty = false;
         }
 
+        [Query]
+        [None(typeof(PBUiText), typeof(DeleteEntityIntention))]
+        private void HandleUITextRemoval(ref UITextComponent uiTextComponent) =>
+            RemoveLabel(uiTextComponent);
+
+        [Query]
+        [All(typeof(DeleteEntityIntention))]
+        private void HandleEntityDestruction(ref UITextComponent uiTextComponent) =>
+            RemoveLabel(uiTextComponent);
+
         private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
         {
             var label = labelsPool.Get();
@@ -78,5 +93,13 @@ private static void SetupLabel(Label labelToSetup, PBUiText pbModel)
             labelToSetup.style.unityTextAlign = pbModel.GetTextAlign();
             //labelToSetup.style.unityFont = pbModel.GetFont();
         }
+
+        private void RemoveLabel(UITextComponent uiTextComponent)
+        {
+            if (!poolsRegistry.TryGetPool(uiTextComponent.Label.GetType(), out IComponentPool componentPool))
+                return;
+
+            componentPool.Release(uiTextComponent.Label);
+        }
     }
 }

From 481cd53d641a33ea6ee06db0470d78285d33bcaa Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 2 Jan 2024 11:11:47 +0100
Subject: [PATCH 06/54] Update SceneUIPlugin.cs

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index fdf81fe1db..25824ce187 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -1,7 +1,9 @@
 using Arch.SystemGroups;
 using DCL.Optimization.Pools;
 using DCL.PluginSystem.World.Dependencies;
+using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Systems;
+using ECS.ComponentsPooling.Systems;
 using ECS.LifeCycle;
 using System.Collections.Generic;
 using UnityEngine.UIElements;
@@ -26,11 +28,10 @@ public SceneUIPlugin(
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
             UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
-        }
 
-        public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies)
-        {
-            UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            finalizeWorldSystems.Add(ReleasePoolableComponentSystem<Label, UITextComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
         }
+
+        public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
     }
 }

From d71232d3b32ad44a734b7e27198e7383b4a2f4ac Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 2 Jan 2024 13:46:55 +0100
Subject: [PATCH 07/54] Update UITextHandlerSystem.cs

---
 .../DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
index e81f95492a..b2c51176a2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -87,6 +87,7 @@ private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText
 
         private static void SetupLabel(Label labelToSetup, PBUiText pbModel)
         {
+            labelToSetup.pickingMode = PickingMode.Ignore;
             labelToSetup.text = pbModel.Value;
             labelToSetup.style.color = pbModel.GetColor();
             labelToSetup.style.fontSize = pbModel.GetFontSize();

From c466629c398fae6ef9db2d5da3095887215f2932 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 2 Jan 2024 13:59:57 +0100
Subject: [PATCH 08/54] Setup canvas with the default configuration

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 25824ce187..0221ad2bc2 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -20,6 +20,7 @@ public SceneUIPlugin(
             ECSWorldSingletonSharedDependencies singletonSharedDependencies)
         {
             this.canvas = canvas;
+            SetupCanvas();
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
             componentPoolsRegistry.AddComponentPool<Label>();
@@ -33,5 +34,24 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
         }
 
         public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
+
+        private void SetupCanvas()
+        {
+            canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
+
+            var style = canvas.rootVisualElement.style;
+            style.width = new Length(100f, LengthUnit.Percent);
+            style.height = new Length(100f, LengthUnit.Percent);
+            style.flexDirection = new StyleEnum<FlexDirection>(FlexDirection.Row);
+            style.flexBasis = new StyleLength(StyleKeyword.Auto);
+            style.flexGrow = 0;
+            style.flexShrink = 1;
+            style.flexWrap = new StyleEnum<Wrap>(Wrap.NoWrap);
+            style.justifyContent = new StyleEnum<Justify>(Justify.FlexStart);
+            style.alignItems = new StyleEnum<Align>(Align.Stretch);
+            style.alignSelf = new StyleEnum<Align>(Align.Auto);
+            style.alignContent = new StyleEnum<Align>(Align.Stretch);
+            style.position = new StyleEnum<Position>(Position.Absolute);
+        }
     }
 }

From 3ccdee4e8ae8ece5a5b439e97fd441328d03b0c0 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 2 Jan 2024 16:13:21 +0100
Subject: [PATCH 09/54] Move ProtoConvertUtils and UiElementUtils under SceneUI
 folder

---
 Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs  | 2 +-
 .../DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs   | 2 +-
 Explorer/Assets/DCL/SDKComponents/SceneUI/Utils.meta           | 3 +++
 .../SDKComponents/SceneUI}/Utils/ProtoConvertUtils.cs          | 2 +-
 .../SDKComponents/SceneUI}/Utils/ProtoConvertUtils.cs.meta     | 0
 .../SDKComponents/SceneUI}/Utils/UiElementUtils.cs             | 2 +-
 .../SDKComponents/SceneUI}/Utils/UiElementUtils.cs.meta        | 0
 Explorer/Assets/Scripts/ECS/Unity/Utils.meta                   | 3 ---
 8 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Utils.meta
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents/SceneUI}/Utils/ProtoConvertUtils.cs (96%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents/SceneUI}/Utils/ProtoConvertUtils.cs.meta (100%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents/SceneUI}/Utils/UiElementUtils.cs (94%)
 rename Explorer/Assets/{Scripts/ECS/Unity => DCL/SDKComponents/SceneUI}/Utils/UiElementUtils.cs.meta (100%)
 delete mode 100644 Explorer/Assets/Scripts/ECS/Unity/Utils.meta

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
index ef53a6418f..9e90ac6de3 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
@@ -1,6 +1,6 @@
 using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Unity.ColorComponent;
-using ECS.Unity.Utils;
 using UnityEngine;
 using Font = DCL.ECSComponents.Font;
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
index b2c51176a2..837378aba0 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -6,10 +6,10 @@
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
 using ECS.LifeCycle.Components;
 using ECS.Unity.Groups;
-using ECS.Unity.Utils;
 using UnityEngine.UIElements;
 using Entity = Arch.Core.Entity;
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils.meta
new file mode 100644
index 0000000000..f7c34c33b4
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ebbd7ddc28ad44ab9309f37af730d979
+timeCreated: 1704208202
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs
similarity index 96%
rename from Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs
index 437f7ffc80..c4ce533239 100644
--- a/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs
@@ -1,7 +1,7 @@
 using DCL.ECSComponents;
 using UnityEngine;
 
-namespace ECS.Unity.Utils
+namespace DCL.SDKComponents.SceneUI.Utils
 {
     public static class ProtoConvertUtils
     {
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/Utils/ProtoConvertUtils.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
similarity index 94%
rename from Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index 751353a033..5e1d25ab7b 100644
--- a/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -1,6 +1,6 @@
 using UnityEngine.UIElements;
 
-namespace ECS.Unity.Utils
+namespace DCL.SDKComponents.SceneUI.Utils
 {
     public static class UiElementUtils
     {
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs.meta
similarity index 100%
rename from Explorer/Assets/Scripts/ECS/Unity/Utils/UiElementUtils.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs.meta
diff --git a/Explorer/Assets/Scripts/ECS/Unity/Utils.meta b/Explorer/Assets/Scripts/ECS/Unity/Utils.meta
deleted file mode 100644
index 24509742b0..0000000000
--- a/Explorer/Assets/Scripts/ECS/Unity/Utils.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 045b78920de04aa3932b0e56d2873739
-timeCreated: 1704113613
\ No newline at end of file

From 78467fff9d8c8adee8670aadeb66b3a274c1a189 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 2 Jan 2024 18:07:10 +0100
Subject: [PATCH 10/54] Implement UITransform

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |   2 +
 .../SceneUI/Components/UITextComponent.cs     |   2 +-
 .../Components/UITransformComponent.cs        |  17 ++
 .../Components/UITransformComponent.cs.meta   |   3 +
 .../DCL/SDKComponents/SceneUI/Defaults.meta   |   3 +
 .../{ => Defaults}/PBUiTextDefaults.cs        |   2 +-
 .../{ => Defaults}/PBUiTextDefaults.cs.meta   |   0
 .../Defaults/PBUiTransform_Defaults.cs        |  19 ++
 .../Defaults/PBUiTransform_Defaults.cs.meta   |   3 +
 .../SceneUI/Systems/UITextHandlerSystem.cs    |  13 +-
 .../Systems/UITransformHandlerSystem.cs       | 180 ++++++++++++++++++
 .../Systems/UITransformHandlerSystem.cs.meta  |   3 +
 .../SceneUI/Utils/UiElementUtils.cs           | 115 +++++++++++
 13 files changed, 354 insertions(+), 8 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults.meta
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/{ => Defaults}/PBUiTextDefaults.cs (94%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/{ => Defaults}/PBUiTextDefaults.cs.meta (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 0221ad2bc2..cafdfbadf4 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -23,11 +23,13 @@ public SceneUIPlugin(
             SetupCanvas();
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
+            componentPoolsRegistry.AddComponentPool<VisualElement>();
             componentPoolsRegistry.AddComponentPool<Label>();
         }
 
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
+            UITransformHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
 
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<Label, UITextComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
index fa36ac304c..2ba44a7d05 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
@@ -12,6 +12,6 @@ public struct UITextComponent: IPoolableComponentProvider<Label>
         Label IPoolableComponentProvider<Label>.PoolableComponent => Label;
         Type IPoolableComponentProvider<Label>.PoolableComponentType => typeof(Label);
 
-        public void Dispose(){ }
+        public void Dispose() { }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
new file mode 100644
index 0000000000..f2fd08ff28
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
@@ -0,0 +1,17 @@
+using DCL.Optimization.Pools;
+using System;
+using UnityEngine.UIElements;
+
+namespace DCL.SDKComponents.SceneUI.Components
+{
+    public struct UITransformComponent : IPoolableComponentProvider<VisualElement>
+    {
+        public VisualElement Transform;
+        public VisualElement PoolableComponent => Transform;
+        
+        VisualElement IPoolableComponentProvider<VisualElement>.PoolableComponent => Transform;
+        Type IPoolableComponentProvider<VisualElement>.PoolableComponentType => typeof(VisualElement);
+        
+        public void Dispose() { }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs.meta
new file mode 100644
index 0000000000..afd53c9918
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a7a4451e2e664fc99e9595a2b10796bb
+timeCreated: 1704210321
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults.meta
new file mode 100644
index 0000000000..bbb3fbfbc8
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fa7797b11ba64acf9cbbe95cf0ca0a89
+timeCreated: 1704214311
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTextDefaults.cs
similarity index 94%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTextDefaults.cs
index 9e90ac6de3..98683bbc96 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTextDefaults.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using Font = DCL.ECSComponents.Font;
 
-namespace DCL.SDKComponents.SceneUI
+namespace DCL.SDKComponents.SceneUI.Defaults
 {
     public static class PBUiTextDefaults
     {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTextDefaults.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/PBUiTextDefaults.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTextDefaults.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs
new file mode 100644
index 0000000000..2e91fafab4
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs
@@ -0,0 +1,19 @@
+using DCL.ECSComponents;
+
+namespace DCL.SDKComponents.SceneUI.Defaults
+{
+    public static class PBUiTransform_Defaults
+    {
+        public static float GetFlexShrink(this PBUiTransform self) =>
+            self.HasFlexShrink ? self.FlexShrink : 1;
+
+        public static YGAlign GetAlignItems(this PBUiTransform self) =>
+            self.HasAlignItems ? self.AlignItems : YGAlign.YgaStretch;
+
+        public static YGAlign GetAlignContent(this PBUiTransform self) =>
+            self.HasAlignContent ? self.AlignContent : YGAlign.YgaStretch;
+
+        public static YGWrap GetFlexWrap(this PBUiTransform self) =>
+            self.HasFlexWrap ? self.FlexWrap : YGWrap.YgwNoWrap;
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs.meta
new file mode 100644
index 0000000000..5a82e57a9c
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Defaults/PBUiTransform_Defaults.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4fbcbcdbd195463d89af3701d42ecf48
+timeCreated: 1704213909
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
index 837378aba0..79e68631b2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -6,6 +6,7 @@
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Defaults;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
 using ECS.LifeCycle.Components;
@@ -85,14 +86,14 @@ private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText
             SetupLabel(label, sdkComponent);
         }
 
-        private static void SetupLabel(Label labelToSetup, PBUiText pbModel)
+        private static void SetupLabel(Label labelToSetup, PBUiText model)
         {
             labelToSetup.pickingMode = PickingMode.Ignore;
-            labelToSetup.text = pbModel.Value;
-            labelToSetup.style.color = pbModel.GetColor();
-            labelToSetup.style.fontSize = pbModel.GetFontSize();
-            labelToSetup.style.unityTextAlign = pbModel.GetTextAlign();
-            //labelToSetup.style.unityFont = pbModel.GetFont();
+            labelToSetup.text = model.Value;
+            labelToSetup.style.color = model.GetColor();
+            labelToSetup.style.fontSize = model.GetFontSize();
+            labelToSetup.style.unityTextAlign = model.GetTextAlign();
+            //labelToSetup.style.unityFont = model.GetFont();
         }
 
         private void RemoveLabel(UITextComponent uiTextComponent)
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
new file mode 100644
index 0000000000..066fdc3ebc
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
@@ -0,0 +1,180 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Defaults;
+using DCL.SDKComponents.SceneUI.Utils;
+using ECS.Abstract;
+using ECS.LifeCycle.Components;
+using ECS.Unity.Groups;
+using UnityEngine.UIElements;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITransformHandlerSystem : BaseUnityLoopSystem
+    {
+        private readonly UIDocument canvas;
+        private readonly IComponentPoolsRegistry poolsRegistry;
+        private readonly IComponentPool<VisualElement> transformsPool;
+
+        private UITransformHandlerSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        {
+            this.canvas = canvas;
+            this.poolsRegistry = poolsRegistry;
+            transformsPool = poolsRegistry.GetReferenceTypePool<VisualElement>();
+        }
+
+        protected override void Update(float t)
+        {
+            InstantiateNonExistingUITransformQuery(World);
+            TrySetupExistingUITransformQuery(World);
+            HandleEntityDestructionQuery(World);
+            HandleUITransformRemovalQuery(World);
+            World.Remove<UITransformComponent>(in HandleUITransformRemoval_QueryDescription);
+        }
+
+        [Query]
+        [All(typeof(PBUiTransform))]
+        [None(typeof(UITransformComponent))]
+        private void InstantiateNonExistingUITransform(in Entity entity, ref PBUiTransform sdkComponent)
+        {
+            var uiTransformComponent = new UITransformComponent();
+            InstantiateEmptyVisualElement(ref uiTransformComponent, ref sdkComponent);
+            World.Add(entity, uiTransformComponent);
+        }
+
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
+        private void TrySetupExistingUITransform(ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
+        {
+            if (!sdkComponent.IsDirty)
+                return;
+
+            if (ReferenceEquals(uiTransformComponent.Transform, null))
+                InstantiateEmptyVisualElement(ref uiTransformComponent, ref sdkComponent);
+            else
+                SetupVisualElement(uiTransformComponent.Transform, sdkComponent);
+
+            sdkComponent.IsDirty = false;
+        }
+
+        [Query]
+        [None(typeof(PBUiTransform), typeof(DeleteEntityIntention))]
+        private void HandleUITransformRemoval(ref UITransformComponent uiTransformComponent) =>
+            RemoveVisualElement(uiTransformComponent);
+
+        [Query]
+        [All(typeof(DeleteEntityIntention))]
+        private void HandleEntityDestruction(ref UITransformComponent uiTransformComponent) =>
+            RemoveVisualElement(uiTransformComponent);
+
+        private void InstantiateEmptyVisualElement(ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
+        {
+            var transform = transformsPool.Get();
+            canvas.rootVisualElement.Add(transform);
+            uiTransformComponent.Transform = transform;
+
+            SetupVisualElement(transform, sdkComponent);
+        }
+
+        private static void SetupVisualElement(VisualElement visualElementToSetup, PBUiTransform model)
+        {
+            visualElementToSetup.style.display = UiElementUtils.GetDisplay(model.Display);
+            visualElementToSetup.style.overflow = UiElementUtils.GetOverflow(model.Overflow);
+
+            // Pointer blocking
+            //visualElementToSetup.pickingMode = model.PointerFilter == PointerFilterMode.PfmBlock ? PickingMode.Position : PickingMode.Ignore;
+            visualElementToSetup.pickingMode = PickingMode.Ignore;
+
+            // Flex
+            visualElementToSetup.style.flexDirection = UiElementUtils.GetFlexDirection(model.FlexDirection);
+            if (model.FlexBasisUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.flexBasis = model.FlexBasisUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.FlexBasis, UiElementUtils.GetUnit(model.FlexBasisUnit));
+
+            visualElementToSetup.style.flexGrow = model.FlexGrow;
+            visualElementToSetup.style.flexShrink = model.GetFlexShrink();
+            visualElementToSetup.style.flexWrap = UiElementUtils.GetWrap(model.GetFlexWrap());
+
+            // Align
+            visualElementToSetup.style.alignContent = UiElementUtils.GetAlign(model.GetAlignContent());
+            visualElementToSetup.style.alignItems = UiElementUtils.GetAlign(model.GetAlignItems());
+            visualElementToSetup.style.alignSelf = UiElementUtils.GetAlign(model.AlignSelf);
+            visualElementToSetup.style.justifyContent = UiElementUtils.GetJustify(model.JustifyContent);
+
+            // Layout size
+            if (model.HeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.height = model.HeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Height, UiElementUtils.GetUnit(model.HeightUnit));
+
+            if (model.WidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.width = model.WidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Width, UiElementUtils.GetUnit(model.WidthUnit));
+
+            if (model.MaxWidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.maxWidth = model.MaxWidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxWidth, UiElementUtils.GetUnit(model.MaxWidthUnit));
+
+            if (model.MaxHeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.maxHeight = model.MaxHeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxHeight, UiElementUtils.GetUnit(model.MaxHeightUnit));
+
+            if (model.MinHeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.minHeight = new Length(model.MinHeight, UiElementUtils.GetUnit(model.MinHeightUnit));
+
+            if (model.MinWidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.minWidth = new Length(model.MinWidth, UiElementUtils.GetUnit(model.MinWidthUnit));
+
+            // Paddings
+            if (model.PaddingBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingBottom = new Length(model.PaddingBottom, UiElementUtils.GetUnit(model.PaddingBottomUnit));
+
+            if (model.PaddingLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingLeft = new Length(model.PaddingLeft, UiElementUtils.GetUnit(model.PaddingLeftUnit));
+
+            if (model.PaddingRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingRight = new Length(model.PaddingRight, UiElementUtils.GetUnit(model.PaddingRightUnit));
+
+            if (model.PaddingTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingTop = new Length(model.PaddingTop, UiElementUtils.GetUnit(model.PaddingTopUnit));
+
+            // Margins
+            if (model.MarginLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginLeft = new Length(model.MarginLeft, UiElementUtils.GetUnit(model.MarginLeftUnit));
+
+            if (model.MarginRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginRight = new Length(model.MarginRight, UiElementUtils.GetUnit(model.MarginRightUnit));
+
+            if (model.MarginBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginBottom = new Length(model.MarginBottom, UiElementUtils.GetUnit(model.MarginBottomUnit));
+
+            if (model.MarginTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginTop = new Length(model.MarginTop, UiElementUtils.GetUnit(model.MarginTopUnit));
+
+            // Position
+            visualElementToSetup.style.position = UiElementUtils.GetPosition(model.PositionType);
+
+            if (model.PositionTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.top = new Length(model.PositionTop, UiElementUtils.GetUnit(model.PositionTopUnit));
+
+            if (model.PositionBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.bottom = new Length(model.PositionBottom, UiElementUtils.GetUnit(model.PositionBottomUnit));
+
+            if (model.PositionRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.right = new Length(model.PositionRight, UiElementUtils.GetUnit(model.PositionRightUnit));
+
+            if (model.PositionLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.left = new Length(model.PositionLeft, UiElementUtils.GetUnit(model.PositionLeftUnit));
+        }
+
+        private void RemoveVisualElement(UITransformComponent uiTransformComponent)
+        {
+            if (!poolsRegistry.TryGetPool(uiTransformComponent.Transform.GetType(), out IComponentPool componentPool))
+                return;
+
+            componentPool.Release(uiTransformComponent.Transform);
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta
new file mode 100644
index 0000000000..595d8a61ca
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cd52fa5412754764805dabf04072ef2f
+timeCreated: 1704210496
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index 5e1d25ab7b..16988b937e 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -1,4 +1,5 @@
 using UnityEngine.UIElements;
+using DCL.ECSComponents;
 
 namespace DCL.SDKComponents.SceneUI.Utils
 {
@@ -16,5 +17,119 @@ public static void SetElementDefaultStyle(IStyle elementStyle)
             elementStyle.justifyContent = new StyleEnum<Justify>(Justify.Center);
             elementStyle.alignItems = new StyleEnum<Align>(Align.Center);
         }
+
+        public static LengthUnit GetUnit(YGUnit unit)
+        {
+            switch (unit)
+            {
+                case YGUnit.YguPercent:
+                    return LengthUnit.Percent;
+                default:
+                    return LengthUnit.Pixel;
+            }
+        }
+
+        public static StyleEnum<Overflow> GetOverflow(YGOverflow overflow)
+        {
+            switch (overflow)
+            {
+                case YGOverflow.YgoHidden:
+                    return Overflow.Hidden;
+                default:
+                    return Overflow.Visible;
+            }
+        }
+
+        public static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
+        {
+            switch (display)
+            {
+                case YGDisplay.YgdNone:
+                    return DisplayStyle.None;
+                default:
+                    return DisplayStyle.Flex;
+            }
+        }
+
+        public static StyleEnum<Justify> GetJustify(YGJustify justify)
+        {
+            switch (justify)
+            {
+                case YGJustify.YgjFlexStart:
+                    return Justify.FlexStart;
+                case YGJustify.YgjCenter:
+                    return Justify.Center;
+                case YGJustify.YgjFlexEnd:
+                    return Justify.FlexEnd;
+                case YGJustify.YgjSpaceBetween:
+                    return Justify.SpaceBetween;
+                case YGJustify.YgjSpaceAround:
+                    return Justify.SpaceAround;
+                default:
+                    return Justify.FlexStart;
+            }
+        }
+
+        public static StyleEnum<Wrap> GetWrap(YGWrap wrap)
+        {
+            switch (wrap)
+            {
+                case YGWrap.YgwNoWrap:
+                    return Wrap.NoWrap;
+                case YGWrap.YgwWrap:
+                    return Wrap.Wrap;
+                case YGWrap.YgwWrapReverse:
+                    return Wrap.WrapReverse;
+                default:
+                    return Wrap.Wrap;
+            }
+        }
+
+        public static StyleEnum<FlexDirection> GetFlexDirection(YGFlexDirection direction)
+        {
+            switch (direction)
+            {
+                case YGFlexDirection.YgfdColumn:
+                    return FlexDirection.Column;
+                case YGFlexDirection.YgfdColumnReverse:
+                    return FlexDirection.ColumnReverse;
+                case YGFlexDirection.YgfdRow:
+                    return FlexDirection.Row;
+                case YGFlexDirection.YgfdRowReverse:
+                    return FlexDirection.RowReverse;
+                default:
+                    return FlexDirection.Row;
+            }
+        }
+
+        public static StyleEnum<Position> GetPosition(YGPositionType positionType)
+        {
+            switch (positionType)
+            {
+                case YGPositionType.YgptAbsolute:
+                    return Position.Absolute;
+                default:
+                    return Position.Relative;
+            }
+        }
+
+        public static StyleEnum<Align> GetAlign(YGAlign align)
+        {
+            switch (align)
+            {
+                case YGAlign.YgaAuto:
+                    return Align.Auto;
+                case YGAlign.YgaFlexStart:
+                    return Align.FlexStart;
+                case YGAlign.YgaCenter:
+                    return Align.Center;
+                case YGAlign.YgaFlexEnd:
+                    return Align.FlexEnd;
+                case YGAlign.YgaStretch:
+                    return Align.Stretch;
+                default:
+                    return Align.Auto;
+            }
+        }
     }
 }

From 88bddf88fb97056e90d42d64886836a59b359e40 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 12:23:46 +0100
Subject: [PATCH 11/54] Add release bejavior

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs     | 6 ++++--
 .../SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs    | 2 +-
 .../SceneUI/Systems/UITransformHandlerSystem.cs             | 2 +-
 .../DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs       | 5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index cafdfbadf4..f9cee0132d 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -3,6 +3,7 @@
 using DCL.PluginSystem.World.Dependencies;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Systems;
+using DCL.SDKComponents.SceneUI.Utils;
 using ECS.ComponentsPooling.Systems;
 using ECS.LifeCycle;
 using System.Collections.Generic;
@@ -23,8 +24,8 @@ public SceneUIPlugin(
             SetupCanvas();
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
-            componentPoolsRegistry.AddComponentPool<VisualElement>();
-            componentPoolsRegistry.AddComponentPool<Label>();
+            componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement);
+            componentPoolsRegistry.AddComponentPool<Label>(onRelease: UiElementUtils.ReleaseUIElement);
         }
 
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
@@ -32,6 +33,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
             UITransformHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
 
+            finalizeWorldSystems.Add(ReleasePoolableComponentSystem<VisualElement, UITransformComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<Label, UITextComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
         }
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
index 79e68631b2..e8decd8b4d 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
@@ -98,7 +98,7 @@ private static void SetupLabel(Label labelToSetup, PBUiText model)
 
         private void RemoveLabel(UITextComponent uiTextComponent)
         {
-            if (!poolsRegistry.TryGetPool(uiTextComponent.Label.GetType(), out IComponentPool componentPool))
+            if (!poolsRegistry.TryGetPool(typeof(Label), out IComponentPool componentPool))
                 return;
 
             componentPool.Release(uiTextComponent.Label);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
index 066fdc3ebc..8b4de09395 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
@@ -171,7 +171,7 @@ private static void SetupVisualElement(VisualElement visualElementToSetup, PBUiT
 
         private void RemoveVisualElement(UITransformComponent uiTransformComponent)
         {
-            if (!poolsRegistry.TryGetPool(uiTransformComponent.Transform.GetType(), out IComponentPool componentPool))
+            if (!poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool))
                 return;
 
             componentPool.Release(uiTransformComponent.Transform);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index 16988b937e..483cc2ef48 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -131,5 +131,10 @@ public static StyleEnum<Align> GetAlign(YGAlign align)
                     return Align.Auto;
             }
         }
+
+        public static void ReleaseUIElement(VisualElement visualElement)
+        {
+            visualElement.RemoveFromHierarchy();
+        }
     }
 }

From f857520b460559b98bbfb2a00bce4f8deb7828e1 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 13:12:25 +0100
Subject: [PATCH 12/54] Create a style sheet for the main canvas

---
 .../AssetGroups/UI.asset                      |  5 ++++
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   | 24 ++++---------------
 .../SceneUI/ScenesUIStyleSheet.uss            | 14 +++++++++++
 .../SceneUI/ScenesUIStyleSheet.uss.meta       | 11 +++++++++
 .../SceneUI/Utils/UiElementUtils.cs           |  4 +---
 .../Assets/Scenes/DynamicSceneLoading.unity   |  1 +
 .../Assets/Scenes/StaticSceneLoader.unity     |  1 +
 .../Global/Dynamic/DynamicSceneLoader.cs      |  3 ++-
 .../Global/Static/StaticSceneLauncher.cs      |  6 +++--
 .../Assets/Scripts/Global/StaticContainer.cs  |  3 ++-
 .../Tests/PlayMode/IntegrationTestsSuite.cs   |  4 +++-
 11 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss.meta

diff --git a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
index 42ad0eafa5..e4e5a117de 100644
--- a/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
+++ b/Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
@@ -57,6 +57,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 295cf8ad8d171d849863eccaf581c9e7
+    m_Address: ScenesUIStyleSheet
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
   m_SchemaSet:
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index f9cee0132d..2ad6a2c1ed 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -18,10 +18,13 @@ public class SceneUIPlugin : IDCLWorldPluginWithoutSettings
 
         public SceneUIPlugin(
             UIDocument canvas,
+            StyleSheet canvasStyleSheet,
             ECSWorldSingletonSharedDependencies singletonSharedDependencies)
         {
             this.canvas = canvas;
-            SetupCanvas();
+            this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
+            this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
+            this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
             componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement);
@@ -38,24 +41,5 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
         }
 
         public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
-
-        private void SetupCanvas()
-        {
-            canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
-
-            var style = canvas.rootVisualElement.style;
-            style.width = new Length(100f, LengthUnit.Percent);
-            style.height = new Length(100f, LengthUnit.Percent);
-            style.flexDirection = new StyleEnum<FlexDirection>(FlexDirection.Row);
-            style.flexBasis = new StyleLength(StyleKeyword.Auto);
-            style.flexGrow = 0;
-            style.flexShrink = 1;
-            style.flexWrap = new StyleEnum<Wrap>(Wrap.NoWrap);
-            style.justifyContent = new StyleEnum<Justify>(Justify.FlexStart);
-            style.alignItems = new StyleEnum<Align>(Align.Stretch);
-            style.alignSelf = new StyleEnum<Align>(Align.Auto);
-            style.alignContent = new StyleEnum<Align>(Align.Stretch);
-            style.position = new StyleEnum<Position>(Position.Absolute);
-        }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss
new file mode 100644
index 0000000000..577bb3bb27
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss
@@ -0,0 +1,14 @@
+.sceneUIMainCanvas {
+    width: 100%;
+    height: 100%;
+    flex-direction: row;
+    flex-basis: auto;
+    flex-grow: 0;
+    flex-shrink: 1;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: stretch;
+    align-self: auto;
+    align-content: stretch;
+    position: absolute;
+}
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss.meta
new file mode 100644
index 0000000000..44661da823
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/ScenesUIStyleSheet.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 295cf8ad8d171d849863eccaf581c9e7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index 483cc2ef48..2b14b7ce98 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -132,9 +132,7 @@ public static StyleEnum<Align> GetAlign(YGAlign align)
             }
         }
 
-        public static void ReleaseUIElement(VisualElement visualElement)
-        {
+        public static void ReleaseUIElement(VisualElement visualElement) =>
             visualElement.RemoveFromHierarchy();
-        }
     }
 }
diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index 3896461df5..bfbe7f828e 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -280,6 +280,7 @@ MonoBehaviour:
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
   scenesUiRoot: {fileID: 1863727842}
+  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
   realmLauncher: {fileID: 234607244}
   settings: {fileID: 11400000, guid: 2e1d2c350e04ac3428300d032c5ee567, type: 2}
   dynamicSettings:
diff --git a/Explorer/Assets/Scenes/StaticSceneLoader.unity b/Explorer/Assets/Scenes/StaticSceneLoader.unity
index 7839bb1646..ad0ac7ab1c 100644
--- a/Explorer/Assets/Scenes/StaticSceneLoader.unity
+++ b/Explorer/Assets/Scenes/StaticSceneLoader.unity
@@ -180,6 +180,7 @@ MonoBehaviour:
   globalPluginSettingsContainer: {fileID: 11400000, guid: 7575a56449e4af444b9c13267319c95d, type: 2}
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   scenesUiRoot: {fileID: 1254164264}
+  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index 5effafb032..15c7d62583 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -23,6 +23,7 @@ public class DynamicSceneLoader : MonoBehaviour
         [SerializeField] private UIDocument uiToolkitRoot;
         [SerializeField] private UIDocument debugUiRoot;
         [SerializeField] private UIDocument scenesUiRoot;
+        [SerializeField] private StyleSheet scenesUiStyleSheet;
 
         [SerializeField] private RealmLauncher realmLauncher;
         [SerializeField] private DynamicSceneLoaderSettings settings;
@@ -72,7 +73,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUiRoot, web3Authenticator, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUiRoot, scenesUiStyleSheet, web3Authenticator, ct);
 
                 if (!isLoaded)
                 {
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 4d813252ec..0fd0fc00fe 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -18,6 +18,7 @@ public class StaticSceneLauncher : MonoBehaviour
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
         [SerializeField] private UIDocument scenesUiRoot;
+        [SerializeField] private StyleSheet scenesUiStyleSheet;
 
         private ISceneFacade sceneFacade;
 
@@ -43,7 +44,7 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
                 SceneSharedContainer sceneSharedContainer;
 
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
-                    scenesUiRoot, web3Authenticator, ct);
+                    scenesUiRoot, scenesUiStyleSheet, web3Authenticator, ct);
                 sceneLauncher.Initialize(sceneSharedContainer, destroyCancellationToken);
             }
             catch (OperationCanceledException) { }
@@ -59,12 +60,13 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
             IPluginSettingsContainer globalSettingsContainer,
             IPluginSettingsContainer sceneSettingsContainer,
             UIDocument scenesUiRoot,
+            StyleSheet scenesUiStyleSheet,
             IWeb3Authenticator web3Authenticator,
             CancellationToken ct)
         {
             // First load the common global plugin
             (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(globalSettingsContainer,
-                scenesUiRoot, web3Authenticator, ct);
+                scenesUiRoot, scenesUiStyleSheet, web3Authenticator, ct);
 
             if (!isLoaded)
                 GameReports.PrintIsDead();
diff --git a/Explorer/Assets/Scripts/Global/StaticContainer.cs b/Explorer/Assets/Scripts/Global/StaticContainer.cs
index eb148e5370..89e7fbd5b5 100644
--- a/Explorer/Assets/Scripts/Global/StaticContainer.cs
+++ b/Explorer/Assets/Scripts/Global/StaticContainer.cs
@@ -98,6 +98,7 @@ await UniTask.WhenAll(
         public static async UniTask<(StaticContainer container, bool success)> CreateAsync(
             IPluginSettingsContainer settingsContainer,
             UIDocument scenesUIDocument,
+            StyleSheet scenesUIStyleSheet,
             IWeb3Authenticator web3Authenticator,
             CancellationToken ct)
         {
@@ -155,7 +156,7 @@ await UniTask.WhenAll(
                 assetBundlePlugin,
                 new GltfContainerPlugin(sharedDependencies, container.CacheCleaner),
                 new InteractionPlugin(sharedDependencies, profilingProvider, exposedGlobalDataContainer.GlobalInputEvents),
-                new SceneUIPlugin(scenesUIDocument, sharedDependencies),
+                new SceneUIPlugin(scenesUIDocument, scenesUIStyleSheet, sharedDependencies),
 #if UNITY_EDITOR
                 new GizmosWorldPlugin(),
 #endif
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index 583507c575..1d6d267bcd 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -15,15 +15,17 @@ public static class IntegrationTestsSuite
         private const string GLOBAL_CONTAINER_ADDRESS = "Integration Tests Global Container";
         private const string WORLD_CONTAINER_ADDRESS = "Integration Tests World Container";
         private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
 
         public static async UniTask<(StaticContainer staticContainer, SceneSharedContainer sceneSharedContainer)> CreateStaticContainer()
         {
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
             UIDocument scenesUIRootCanvas = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+            StyleSheet scenesUIStyleSheet = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_STYLE_SHEET)).GetComponent<StyleSheet>();
 
             return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,
-                scenesUIRootCanvas, Substitute.For<IWeb3Authenticator>(), CancellationToken.None);
+                scenesUIRootCanvas, scenesUIStyleSheet, Substitute.For<IWeb3Authenticator>(), CancellationToken.None);
         }
     }
 }

From 2fee4392a1f0235f455f546673b61cf34cc55e42 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 16:12:12 +0100
Subject: [PATCH 13/54] Update UITransformHandlerSystem.cs

---
 .../SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
index 8b4de09395..46d7a8b24c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
@@ -90,8 +90,7 @@ private static void SetupVisualElement(VisualElement visualElementToSetup, PBUiT
             visualElementToSetup.style.overflow = UiElementUtils.GetOverflow(model.Overflow);
 
             // Pointer blocking
-            //visualElementToSetup.pickingMode = model.PointerFilter == PointerFilterMode.PfmBlock ? PickingMode.Position : PickingMode.Ignore;
-            visualElementToSetup.pickingMode = PickingMode.Ignore;
+            visualElementToSetup.pickingMode = model.PointerFilter == PointerFilterMode.PfmBlock ? PickingMode.Position : PickingMode.Ignore;
 
             // Flex
             visualElementToSetup.style.flexDirection = UiElementUtils.GetFlexDirection(model.FlexDirection);

From 2933deea74553160b15fa009cccf56f147229783 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 16:30:59 +0100
Subject: [PATCH 14/54] Fix tests

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs  | 9 ++++++---
 .../Global/Tests/PlayMode/IntegrationTestsSuite.cs       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 2ad6a2c1ed..49a52be2ef 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -22,9 +22,12 @@ public SceneUIPlugin(
             ECSWorldSingletonSharedDependencies singletonSharedDependencies)
         {
             this.canvas = canvas;
-            this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
-            this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
-            this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
+            if (this.canvas.rootVisualElement != null)
+            {
+                this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
+                this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
+                this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
+            }
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
             componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement);
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index 1d6d267bcd..4e7c2161a8 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -22,7 +22,7 @@ public static class IntegrationTestsSuite
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
             UIDocument scenesUIRootCanvas = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            StyleSheet scenesUIStyleSheet = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_STYLE_SHEET)).GetComponent<StyleSheet>();
+            StyleSheet scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
 
             return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,
                 scenesUIRootCanvas, scenesUIStyleSheet, Substitute.For<IWeb3Authenticator>(), CancellationToken.None);

From 45d67fee2786753910ba345a864cda15c8e76356 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 17:18:28 +0100
Subject: [PATCH 15/54] Move the release logic to separated systems

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  6 +-
 ...System.cs => UITextInstantiationSystem.cs} | 30 +---------
 ...meta => UITextInstantiationSystem.cs.meta} |  0
 .../SceneUI/Systems/UITextReleaseSystem.cs    | 55 +++++++++++++++++++
 .../Systems/UITextReleaseSystem.cs.meta       |  3 +
 ...m.cs => UITransformInstantiationSystem.cs} | 30 +---------
 ...=> UITransformInstantiationSystem.cs.meta} |  0
 .../Systems/UITransformReleaseSystem.cs       | 55 +++++++++++++++++++
 .../Systems/UITransformReleaseSystem.cs.meta  |  3 +
 9 files changed, 124 insertions(+), 58 deletions(-)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{UITextHandlerSystem.cs => UITextInstantiationSystem.cs} (68%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{UITextHandlerSystem.cs.meta => UITextInstantiationSystem.cs.meta} (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{UITransformHandlerSystem.cs => UITransformInstantiationSystem.cs} (85%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{UITransformHandlerSystem.cs.meta => UITransformInstantiationSystem.cs.meta} (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 49a52be2ef..e468e9903c 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -36,8 +36,10 @@ public SceneUIPlugin(
 
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
-            UITransformHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
-            UITextHandlerSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
+            UITextInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
 
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<VisualElement, UITransformComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<Label, UITextComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
similarity index 68%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
index e8decd8b4d..f00dacfece 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
@@ -1,7 +1,6 @@
 using Arch.Core;
 using Arch.System;
 using Arch.SystemGroups;
-using Arch.SystemGroups.Throttling;
 using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
@@ -9,7 +8,6 @@
 using DCL.SDKComponents.SceneUI.Defaults;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
-using ECS.LifeCycle.Components;
 using ECS.Unity.Groups;
 using UnityEngine.UIElements;
 using Entity = Arch.Core.Entity;
@@ -18,17 +16,14 @@ namespace DCL.SDKComponents.SceneUI.Systems
 {
     [UpdateInGroup(typeof(ComponentInstantiationGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
-    [ThrottlingEnabled]
-    public partial class UITextHandlerSystem : BaseUnityLoopSystem
+    public partial class UITextInstantiationSystem : BaseUnityLoopSystem
     {
         private readonly UIDocument canvas;
-        private readonly IComponentPoolsRegistry poolsRegistry;
         private readonly IComponentPool<Label> labelsPool;
 
-        private UITextHandlerSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        private UITextInstantiationSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             this.canvas = canvas;
-            this.poolsRegistry = poolsRegistry;
             labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
         }
 
@@ -36,9 +31,6 @@ protected override void Update(float t)
         {
             InstantiateNonExistingUITextQuery(World);
             TrySetupExistingUITextQuery(World);
-            HandleEntityDestructionQuery(World);
-            HandleUITextRemovalQuery(World);
-            World.Remove<UITextComponent>(in HandleUITextRemoval_QueryDescription);
         }
 
         [Query]
@@ -66,16 +58,6 @@ private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBU
             sdkComponent.IsDirty = false;
         }
 
-        [Query]
-        [None(typeof(PBUiText), typeof(DeleteEntityIntention))]
-        private void HandleUITextRemoval(ref UITextComponent uiTextComponent) =>
-            RemoveLabel(uiTextComponent);
-
-        [Query]
-        [All(typeof(DeleteEntityIntention))]
-        private void HandleEntityDestruction(ref UITextComponent uiTextComponent) =>
-            RemoveLabel(uiTextComponent);
-
         private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
         {
             var label = labelsPool.Get();
@@ -95,13 +77,5 @@ private static void SetupLabel(Label labelToSetup, PBUiText model)
             labelToSetup.style.unityTextAlign = model.GetTextAlign();
             //labelToSetup.style.unityFont = model.GetFont();
         }
-
-        private void RemoveLabel(UITextComponent uiTextComponent)
-        {
-            if (!poolsRegistry.TryGetPool(typeof(Label), out IComponentPool componentPool))
-                return;
-
-            componentPool.Release(uiTextComponent.Label);
-        }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextHandlerSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
new file mode 100644
index 0000000000..99d7e00b9e
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
@@ -0,0 +1,55 @@
+using Arch.Core;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.Optimization.Pools;
+using ECS.Abstract;
+using ECS.Groups;
+using ECS.Unity.Groups;
+using Arch.System;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.LifeCycle.Components;
+using UnityEngine.UIElements;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateBefore(typeof(ComponentInstantiationGroup))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITextReleaseSystem : BaseUnityLoopSystem
+    {
+        private readonly IComponentPoolsRegistry poolsRegistry;
+
+        private UITextReleaseSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
+        {
+            this.poolsRegistry = poolsRegistry;
+        }
+
+        protected override void Update(float t)
+        {
+            HandleEntityDestructionQuery(World);
+            HandleUITextRemovalQuery(World);
+            World.Remove<UITextComponent>(in HandleUITextRemoval_QueryDescription);
+        }
+
+        [Query]
+        [None(typeof(PBUiText), typeof(DeleteEntityIntention))]
+        private void HandleUITextRemoval(ref UITextComponent uiTextComponent) =>
+            RemoveLabel(uiTextComponent);
+
+        [Query]
+        [All(typeof(DeleteEntityIntention))]
+        private void HandleEntityDestruction(ref UITextComponent uiTextComponent) =>
+            RemoveLabel(uiTextComponent);
+
+        private void RemoveLabel(UITextComponent uiTextComponent)
+        {
+            if (!poolsRegistry.TryGetPool(typeof(Label), out IComponentPool componentPool))
+                return;
+
+            componentPool.Release(uiTextComponent.Label);
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta
new file mode 100644
index 0000000000..12a562b052
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e3791eeea44e478289fbf11f5f3b2a5e
+timeCreated: 1704297925
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
similarity index 85%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
index 46d7a8b24c..abfd17baad 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
@@ -1,7 +1,6 @@
 using Arch.Core;
 using Arch.System;
 using Arch.SystemGroups;
-using Arch.SystemGroups.Throttling;
 using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
@@ -9,7 +8,6 @@
 using DCL.SDKComponents.SceneUI.Defaults;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
-using ECS.LifeCycle.Components;
 using ECS.Unity.Groups;
 using UnityEngine.UIElements;
 
@@ -17,17 +15,14 @@ namespace DCL.SDKComponents.SceneUI.Systems
 {
     [UpdateInGroup(typeof(ComponentInstantiationGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
-    [ThrottlingEnabled]
-    public partial class UITransformHandlerSystem : BaseUnityLoopSystem
+    public partial class UITransformInstantiationSystem : BaseUnityLoopSystem
     {
         private readonly UIDocument canvas;
-        private readonly IComponentPoolsRegistry poolsRegistry;
         private readonly IComponentPool<VisualElement> transformsPool;
 
-        private UITransformHandlerSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        private UITransformInstantiationSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             this.canvas = canvas;
-            this.poolsRegistry = poolsRegistry;
             transformsPool = poolsRegistry.GetReferenceTypePool<VisualElement>();
         }
 
@@ -35,9 +30,6 @@ protected override void Update(float t)
         {
             InstantiateNonExistingUITransformQuery(World);
             TrySetupExistingUITransformQuery(World);
-            HandleEntityDestructionQuery(World);
-            HandleUITransformRemovalQuery(World);
-            World.Remove<UITransformComponent>(in HandleUITransformRemoval_QueryDescription);
         }
 
         [Query]
@@ -65,16 +57,6 @@ private void TrySetupExistingUITransform(ref UITransformComponent uiTransformCom
             sdkComponent.IsDirty = false;
         }
 
-        [Query]
-        [None(typeof(PBUiTransform), typeof(DeleteEntityIntention))]
-        private void HandleUITransformRemoval(ref UITransformComponent uiTransformComponent) =>
-            RemoveVisualElement(uiTransformComponent);
-
-        [Query]
-        [All(typeof(DeleteEntityIntention))]
-        private void HandleEntityDestruction(ref UITransformComponent uiTransformComponent) =>
-            RemoveVisualElement(uiTransformComponent);
-
         private void InstantiateEmptyVisualElement(ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
         {
             var transform = transformsPool.Get();
@@ -167,13 +149,5 @@ private static void SetupVisualElement(VisualElement visualElementToSetup, PBUiT
             if (model.PositionLeftUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.left = new Length(model.PositionLeft, UiElementUtils.GetUnit(model.PositionLeftUnit));
         }
-
-        private void RemoveVisualElement(UITransformComponent uiTransformComponent)
-        {
-            if (!poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool))
-                return;
-
-            componentPool.Release(uiTransformComponent.Transform);
-        }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformHandlerSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
new file mode 100644
index 0000000000..cbf44af31a
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
@@ -0,0 +1,55 @@
+using Arch.Core;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.Optimization.Pools;
+using ECS.Abstract;
+using ECS.Groups;
+using ECS.Unity.Groups;
+using Arch.System;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.LifeCycle.Components;
+using UnityEngine.UIElements;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateBefore(typeof(ComponentInstantiationGroup))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITransformReleaseSystem : BaseUnityLoopSystem
+    {
+        private readonly IComponentPoolsRegistry poolsRegistry;
+
+        private UITransformReleaseSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
+        {
+            this.poolsRegistry = poolsRegistry;
+        }
+
+        protected override void Update(float t)
+        {
+            HandleEntityDestructionQuery(World);
+            HandleUITransformRemovalQuery(World);
+            World.Remove<UITransformComponent>(in HandleUITransformRemoval_QueryDescription);
+        }
+
+        [Query]
+        [None(typeof(PBUiTransform), typeof(DeleteEntityIntention))]
+        private void HandleUITransformRemoval(ref UITransformComponent uiTransformComponent) =>
+            RemoveVisualElement(uiTransformComponent);
+
+        [Query]
+        [All(typeof(DeleteEntityIntention))]
+        private void HandleEntityDestruction(ref UITransformComponent uiTransformComponent) =>
+            RemoveVisualElement(uiTransformComponent);
+
+        private void RemoveVisualElement(UITransformComponent uiTransformComponent)
+        {
+            if (!poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool))
+                return;
+
+            componentPool.Release(uiTransformComponent.Transform);
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta
new file mode 100644
index 0000000000..059cde85b7
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 61414df94f05400ca7b4a2bc9bcf1a1f
+timeCreated: 1704298413
\ No newline at end of file

From 558523e497ba7445e874586ef3869a18687e8b40 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 17:44:23 +0100
Subject: [PATCH 16/54] Make UITransformInstantiationSystem executes first of
 all the rest of systems

---
 .../Assets/DCL/SDKComponents/SceneUI/Groups.meta  |  3 +++
 .../Groups/SceneUIComponentInstantiationGroup.cs  | 15 +++++++++++++++
 .../SceneUIComponentInstantiationGroup.cs.meta    |  3 +++
 .../SceneUI/Systems/UITextInstantiationSystem.cs  |  4 ++--
 .../SceneUI/Systems/UITextReleaseSystem.cs        |  4 ++--
 .../Systems/UITransformInstantiationSystem.cs     |  6 ++++--
 .../SceneUI/Systems/UITransformReleaseSystem.cs   |  5 ++---
 7 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Groups.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs.meta

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups.meta
new file mode 100644
index 0000000000..2b492a018b
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7ddd2710c6174b95901bc7e6f24292ec
+timeCreated: 1704298849
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
new file mode 100644
index 0000000000..b445d3244b
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
@@ -0,0 +1,15 @@
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.SDKComponents.SceneUI.Systems;
+using ECS.Groups;
+
+namespace DCL.SDKComponents.SceneUI.Groups
+{
+    /// <summary>
+    ///     Denotes the group that instantiates specific components right after the entity transform is handled
+    /// </summary>
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateAfter(typeof(UITransformInstantiationSystem))]
+    [ThrottlingEnabled]
+    public partial class SceneUIComponentInstantiationGroup { }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs.meta
new file mode 100644
index 0000000000..4bfcee0901
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 851d67b0a67f42969c02ddf79f9a7671
+timeCreated: 1704298923
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
index f00dacfece..6a5f6d922f 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
@@ -6,15 +6,15 @@
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Defaults;
+using DCL.SDKComponents.SceneUI.Groups;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
-using ECS.Unity.Groups;
 using UnityEngine.UIElements;
 using Entity = Arch.Core.Entity;
 
 namespace DCL.SDKComponents.SceneUI.Systems
 {
-    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
+    [UpdateInGroup(typeof(SceneUIComponentInstantiationGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
     public partial class UITextInstantiationSystem : BaseUnityLoopSystem
     {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
index 99d7e00b9e..65bce81d9c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
@@ -5,17 +5,17 @@
 using DCL.Optimization.Pools;
 using ECS.Abstract;
 using ECS.Groups;
-using ECS.Unity.Groups;
 using Arch.System;
 using DCL.ECSComponents;
 using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Groups;
 using ECS.LifeCycle.Components;
 using UnityEngine.UIElements;
 
 namespace DCL.SDKComponents.SceneUI.Systems
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
-    [UpdateBefore(typeof(ComponentInstantiationGroup))]
+    [UpdateBefore(typeof(SceneUIComponentInstantiationGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
     [ThrottlingEnabled]
     public partial class UITextReleaseSystem : BaseUnityLoopSystem
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
index abfd17baad..281732166e 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
@@ -1,6 +1,7 @@
 using Arch.Core;
 using Arch.System;
 using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
 using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
@@ -8,13 +9,14 @@
 using DCL.SDKComponents.SceneUI.Defaults;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
-using ECS.Unity.Groups;
+using ECS.Groups;
 using UnityEngine.UIElements;
 
 namespace DCL.SDKComponents.SceneUI.Systems
 {
-    [UpdateInGroup(typeof(ComponentInstantiationGroup))]
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
     public partial class UITransformInstantiationSystem : BaseUnityLoopSystem
     {
         private readonly UIDocument canvas;
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
index cbf44af31a..ce6f8dac12 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
@@ -1,12 +1,11 @@
 using Arch.Core;
 using Arch.SystemGroups;
 using Arch.SystemGroups.Throttling;
-using DCL.Diagnostics;
 using DCL.Optimization.Pools;
 using ECS.Abstract;
 using ECS.Groups;
-using ECS.Unity.Groups;
 using Arch.System;
+using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.SDKComponents.SceneUI.Components;
 using ECS.LifeCycle.Components;
@@ -15,7 +14,7 @@
 namespace DCL.SDKComponents.SceneUI.Systems
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
-    [UpdateBefore(typeof(ComponentInstantiationGroup))]
+    [UpdateBefore(typeof(UITransformInstantiationSystem))]
     [LogCategory(ReportCategory.SCENE_UI)]
     [ThrottlingEnabled]
     public partial class UITransformReleaseSystem : BaseUnityLoopSystem

From b305b97ef790874cf49b76c359cd90c3dcb1638c Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 3 Jan 2024 18:32:07 +0100
Subject: [PATCH 17/54] Apply parenting to UIText

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  2 +-
 .../Systems/UITextInstantiationSystem.cs      | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index e468e9903c..2a97b543ff 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -38,7 +38,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
         {
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
-            UITextInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
 
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<VisualElement, UITransformComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
index 6a5f6d922f..581fa8f2fc 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
@@ -18,12 +18,10 @@ namespace DCL.SDKComponents.SceneUI.Systems
     [LogCategory(ReportCategory.SCENE_UI)]
     public partial class UITextInstantiationSystem : BaseUnityLoopSystem
     {
-        private readonly UIDocument canvas;
         private readonly IComponentPool<Label> labelsPool;
 
-        private UITextInstantiationSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        private UITextInstantiationSystem(World world,IComponentPoolsRegistry poolsRegistry) : base(world)
         {
-            this.canvas = canvas;
             labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
         }
 
@@ -34,43 +32,47 @@ protected override void Update(float t)
         }
 
         [Query]
-        [All(typeof(PBUiText))]
+        [All(typeof(PBUiText), typeof(PBUiTransform), typeof(UITransformComponent))]
         [None(typeof(UITextComponent))]
-        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent)
+        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent, ref UITransformComponent transform)
         {
             var uiTextComponent = new UITextComponent();
-            InstantiateLabel(ref uiTextComponent, ref sdkComponent);
+            InstantiateLabel(ref uiTextComponent, ref sdkComponent, ref transform);
             World.Add(entity, uiTextComponent);
         }
 
         [Query]
-        [All(typeof(PBUiText), typeof(UITextComponent))]
-        private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
+        [All(typeof(PBUiText), typeof(UITransformComponent), typeof(UITextComponent))]
+        private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
         {
             if (!sdkComponent.IsDirty)
                 return;
 
             if (ReferenceEquals(uiTextComponent.Label, null))
-                InstantiateLabel(ref uiTextComponent, ref sdkComponent);
+                InstantiateLabel(ref uiTextComponent, ref sdkComponent, ref uiTransformComponent);
             else
-                SetupLabel(uiTextComponent.Label, sdkComponent);
+                SetupLabel(uiTextComponent.Label, sdkComponent, uiTransformComponent);
 
             sdkComponent.IsDirty = false;
         }
 
-        private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent)
+        private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
         {
             var label = labelsPool.Get();
             UiElementUtils.SetElementDefaultStyle(label.style);
-            canvas.rootVisualElement.Add(label);
+            uiTransformComponent.Transform.Add(label);
             uiTextComponent.Label = label;
 
-            SetupLabel(label, sdkComponent);
+            SetupLabel(label, sdkComponent, uiTransformComponent);
         }
 
-        private static void SetupLabel(Label labelToSetup, PBUiText model)
+        private static void SetupLabel(Label labelToSetup, PBUiText model, UITransformComponent uiTransformComponent)
         {
             labelToSetup.pickingMode = PickingMode.Ignore;
+
+            if (uiTransformComponent.Transform.style.width.keyword == StyleKeyword.Auto || uiTransformComponent.Transform.style.height.keyword == StyleKeyword.Auto)
+                labelToSetup.style.position = new StyleEnum<Position>(Position.Relative);
+
             labelToSetup.text = model.Value;
             labelToSetup.style.color = model.GetColor();
             labelToSetup.style.fontSize = model.GetFontSize();

From 21aac883b2ed0423c8e81a1c95515fd8c2780acb Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 4 Jan 2024 11:20:04 +0100
Subject: [PATCH 18/54] Set a name for each component

---
 .../SceneUI/Systems/UITextInstantiationSystem.cs  | 15 ++++++++-------
 .../Systems/UITransformInstantiationSystem.cs     | 15 ++++++++-------
 .../SceneUI/Systems/UITransformReleaseSystem.cs   |  6 +++---
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
index 581fa8f2fc..413a383606 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
@@ -37,36 +37,37 @@ protected override void Update(float t)
         private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent, ref UITransformComponent transform)
         {
             var uiTextComponent = new UITextComponent();
-            InstantiateLabel(ref uiTextComponent, ref sdkComponent, ref transform);
+            InstantiateLabel(entity, ref uiTextComponent, ref sdkComponent, ref transform);
             World.Add(entity, uiTextComponent);
         }
 
         [Query]
         [All(typeof(PBUiText), typeof(UITransformComponent), typeof(UITextComponent))]
-        private void TrySetupExistingUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
+        private void TrySetupExistingUIText(in Entity entity, ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
         {
             if (!sdkComponent.IsDirty)
                 return;
 
             if (ReferenceEquals(uiTextComponent.Label, null))
-                InstantiateLabel(ref uiTextComponent, ref sdkComponent, ref uiTransformComponent);
+                InstantiateLabel(entity, ref uiTextComponent, ref sdkComponent, ref uiTransformComponent);
             else
-                SetupLabel(uiTextComponent.Label, sdkComponent, uiTransformComponent);
+                SetupLabel(ref uiTextComponent.Label, ref sdkComponent, ref uiTransformComponent);
 
             sdkComponent.IsDirty = false;
         }
 
-        private void InstantiateLabel(ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
+        private void InstantiateLabel(in Entity entity, ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
         {
             var label = labelsPool.Get();
+            label.name = $"UIText (Entity {entity.Id})";
             UiElementUtils.SetElementDefaultStyle(label.style);
             uiTransformComponent.Transform.Add(label);
             uiTextComponent.Label = label;
 
-            SetupLabel(label, sdkComponent, uiTransformComponent);
+            SetupLabel(ref label, ref sdkComponent, ref uiTransformComponent);
         }
 
-        private static void SetupLabel(Label labelToSetup, PBUiText model, UITransformComponent uiTransformComponent)
+        private static void SetupLabel(ref Label labelToSetup, ref PBUiText model, ref UITransformComponent uiTransformComponent)
         {
             labelToSetup.pickingMode = PickingMode.Ignore;
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
index 281732166e..700d3bb6ca 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
@@ -40,35 +40,36 @@ protected override void Update(float t)
         private void InstantiateNonExistingUITransform(in Entity entity, ref PBUiTransform sdkComponent)
         {
             var uiTransformComponent = new UITransformComponent();
-            InstantiateEmptyVisualElement(ref uiTransformComponent, ref sdkComponent);
+            InstantiateEmptyVisualElement(entity, ref uiTransformComponent, ref sdkComponent);
             World.Add(entity, uiTransformComponent);
         }
 
         [Query]
         [All(typeof(PBUiTransform), typeof(UITransformComponent))]
-        private void TrySetupExistingUITransform(ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
+        private void TrySetupExistingUITransform(in Entity entity, ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
         {
             if (!sdkComponent.IsDirty)
                 return;
 
             if (ReferenceEquals(uiTransformComponent.Transform, null))
-                InstantiateEmptyVisualElement(ref uiTransformComponent, ref sdkComponent);
+                InstantiateEmptyVisualElement(entity, ref uiTransformComponent, ref sdkComponent);
             else
-                SetupVisualElement(uiTransformComponent.Transform, sdkComponent);
+                SetupVisualElement(ref uiTransformComponent.Transform, ref sdkComponent);
 
             sdkComponent.IsDirty = false;
         }
 
-        private void InstantiateEmptyVisualElement(ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
+        private void InstantiateEmptyVisualElement(Entity entity, ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
         {
             var transform = transformsPool.Get();
+            transform.name = $"UITransform (Entity {entity.Id})";
             canvas.rootVisualElement.Add(transform);
             uiTransformComponent.Transform = transform;
 
-            SetupVisualElement(transform, sdkComponent);
+            SetupVisualElement(ref transform, ref sdkComponent);
         }
 
-        private static void SetupVisualElement(VisualElement visualElementToSetup, PBUiTransform model)
+        private static void SetupVisualElement(ref VisualElement visualElementToSetup, ref PBUiTransform model)
         {
             visualElementToSetup.style.display = UiElementUtils.GetDisplay(model.Display);
             visualElementToSetup.style.overflow = UiElementUtils.GetOverflow(model.Overflow);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
index ce6f8dac12..9e7818d1b2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
@@ -36,14 +36,14 @@ protected override void Update(float t)
         [Query]
         [None(typeof(PBUiTransform), typeof(DeleteEntityIntention))]
         private void HandleUITransformRemoval(ref UITransformComponent uiTransformComponent) =>
-            RemoveVisualElement(uiTransformComponent);
+            RemoveVisualElement(ref uiTransformComponent);
 
         [Query]
         [All(typeof(DeleteEntityIntention))]
         private void HandleEntityDestruction(ref UITransformComponent uiTransformComponent) =>
-            RemoveVisualElement(uiTransformComponent);
+            RemoveVisualElement(ref uiTransformComponent);
 
-        private void RemoveVisualElement(UITransformComponent uiTransformComponent)
+        private void RemoveVisualElement(ref UITransformComponent uiTransformComponent)
         {
             if (!poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool))
                 return;

From f7e5325973eaa0c900dd4730768aa2a7563fc3de Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 16:00:58 +0100
Subject: [PATCH 19/54] UITransform: parenting and sorting

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  2 +
 .../SceneUI/Components/UITextComponent.cs     |  1 -
 .../Components/UITransformComponent.cs        | 14 ++--
 .../Systems/UITransformInstantiationSystem.cs |  4 +-
 .../Systems/UITransformParentingSystem.cs     | 64 +++++++++++++++++++
 .../UITransformParentingSystem.cs.meta        |  3 +
 .../Systems/UITransformSortingSystem.cs       | 48 ++++++++++++++
 .../Systems/UITransformSortingSystem.cs.meta  |  3 +
 8 files changed, 131 insertions(+), 8 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 2a97b543ff..7b31f0be24 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -37,6 +37,8 @@ public SceneUIPlugin(
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
+            UITransformParentingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
+            UITransformSortingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
index 2ba44a7d05..c993755ec5 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITextComponent.cs
@@ -7,7 +7,6 @@ namespace DCL.SDKComponents.SceneUI.Components
     public struct UITextComponent: IPoolableComponentProvider<Label>
     {
         public Label Label;
-        public Label PoolableComponent => Label;
 
         Label IPoolableComponentProvider<Label>.PoolableComponent => Label;
         Type IPoolableComponentProvider<Label>.PoolableComponentType => typeof(Label);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
index f2fd08ff28..545156b065 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
@@ -1,4 +1,5 @@
-using DCL.Optimization.Pools;
+using Arch.Core;
+using DCL.Optimization.Pools;
 using System;
 using UnityEngine.UIElements;
 
@@ -7,11 +8,14 @@ namespace DCL.SDKComponents.SceneUI.Components
     public struct UITransformComponent : IPoolableComponentProvider<VisualElement>
     {
         public VisualElement Transform;
-        public VisualElement PoolableComponent => Transform;
-        
+        public EntityReference Parent;
+
         VisualElement IPoolableComponentProvider<VisualElement>.PoolableComponent => Transform;
         Type IPoolableComponentProvider<VisualElement>.PoolableComponentType => typeof(VisualElement);
-        
-        public void Dispose() { }
+
+        public void Dispose()
+        {
+
+        }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
index 700d3bb6ca..7b1fb2777c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
@@ -55,16 +55,16 @@ private void TrySetupExistingUITransform(in Entity entity, ref UITransformCompon
                 InstantiateEmptyVisualElement(entity, ref uiTransformComponent, ref sdkComponent);
             else
                 SetupVisualElement(ref uiTransformComponent.Transform, ref sdkComponent);
-
-            sdkComponent.IsDirty = false;
         }
 
         private void InstantiateEmptyVisualElement(Entity entity, ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
         {
             var transform = transformsPool.Get();
             transform.name = $"UITransform (Entity {entity.Id})";
+            UiElementUtils.SetElementDefaultStyle(transform.style);
             canvas.rootVisualElement.Add(transform);
             uiTransformComponent.Transform = transform;
+            uiTransformComponent.Parent = EntityReference.Null;
 
             SetupVisualElement(ref transform, ref sdkComponent);
         }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
new file mode 100644
index 0000000000..10bce5ac62
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
@@ -0,0 +1,64 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using CRDT;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.Abstract;
+using ECS.Groups;
+using System.Collections.Generic;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateAfter(typeof(UITransformInstantiationSystem))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITransformParentingSystem : BaseUnityLoopSystem
+    {
+        private readonly Entity sceneRoot;
+        private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
+
+        public UITransformParentingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
+        {
+            this.sceneRoot = sceneRoot;
+            this.entitiesMap = entitiesMap;
+        }
+
+        protected override void Update(float t)
+        {
+            DoParentingQuery(World);
+        }
+
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
+        private void DoParenting(in Entity entity, ref PBUiTransform sdkTransform, ref UITransformComponent transformComponent)
+        {
+            if (!sdkTransform.IsDirty)
+                return;
+
+            if (entitiesMap.TryGetValue(sdkTransform.Parent, out Entity newParentEntity) &&
+                newParentEntity != sceneRoot &&
+                !transformComponent.Transform.Contains(World.Get<UITransformComponent>(newParentEntity).Transform)) // TODO: This check shouldn't be needed!
+                SetNewChild(ref transformComponent, World.Reference(entity), newParentEntity);
+        }
+
+        private void SetNewChild(ref UITransformComponent childComponent, EntityReference childEntityReference, Entity parentEntity)
+        {
+            if (childComponent.Parent == parentEntity)
+                return;
+
+            if (!World.IsAlive(parentEntity))
+            {
+                ReportHub.LogError(GetReportCategory(), $"Trying to parent entity {childEntityReference.Entity} to a dead entity parent");
+                return;
+            }
+
+            UITransformComponent parentComponent = World.Get<UITransformComponent>(parentEntity);
+            parentComponent.Transform.Add(childComponent.Transform);
+            childComponent.Parent = World.Reference(parentEntity);
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta
new file mode 100644
index 0000000000..422cc8ea42
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e944ca581bf3405eafa09685cc8e97d7
+timeCreated: 1704446407
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
new file mode 100644
index 0000000000..204cefe36d
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
@@ -0,0 +1,48 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using CRDT;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.Abstract;
+using ECS.Groups;
+using System.Collections.Generic;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateAfter(typeof(UITransformParentingSystem))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITransformSortingSystem : BaseUnityLoopSystem
+    {
+        private readonly Entity sceneRoot;
+        private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
+
+        public UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
+        {
+            this.sceneRoot = sceneRoot;
+            this.entitiesMap = entitiesMap;
+        }
+
+        protected override void Update(float t)
+        {
+            DoSortingQuery(World);
+        }
+
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
+        private void DoSorting(ref PBUiTransform sdkTransform, ref UITransformComponent transformComponent)
+        {
+            if (!sdkTransform.IsDirty)
+                return;
+
+            if (entitiesMap.TryGetValue(sdkTransform.RightOf, out Entity rightOfEntity) && rightOfEntity != sceneRoot)
+                transformComponent.Transform.PlaceInFront(World.Get<UITransformComponent>(rightOfEntity).Transform);
+
+            sdkTransform.IsDirty = false;
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta
new file mode 100644
index 0000000000..dc69c7323c
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 12d14da9ccfd4c21bcc0b814f57c4768
+timeCreated: 1704456816
\ No newline at end of file

From 7e141d87c35061d4d73a8e751ca70399bb649a49 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 17:05:58 +0100
Subject: [PATCH 20/54] Code refactor

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |   1 +
 .../Systems/UITextInstantiationSystem.cs      |  51 ++-----
 .../Systems/UITransformInstantiationSystem.cs | 126 ++----------------
 .../Systems/UITransformParentingSystem.cs     |  12 +-
 .../Systems/UITransformSortingSystem.cs       |  12 +-
 .../Systems/UITransformUpdateSystem.cs        |  38 ++++++
 .../Systems/UITransformUpdateSystem.cs.meta   |   3 +
 .../SceneUI/Utils/UiElementUtils.cs           | 120 +++++++++++++++--
 8 files changed, 184 insertions(+), 179 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 7b31f0be24..b1195b6956 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -39,6 +39,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITransformParentingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
             UITransformSortingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
+            UITransformUpdateSystem.InjectToWorld(ref builder);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
index 413a383606..14caa005ba 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
@@ -5,7 +5,6 @@
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
-using DCL.SDKComponents.SceneUI.Defaults;
 using DCL.SDKComponents.SceneUI.Groups;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
@@ -27,58 +26,34 @@ private UITextInstantiationSystem(World world,IComponentPoolsRegistry poolsRegis
 
         protected override void Update(float t)
         {
-            InstantiateNonExistingUITextQuery(World);
-            TrySetupExistingUITextQuery(World);
+            InstantiateUITextQuery(World);
+            UpdateUITextQuery(World);
         }
 
         [Query]
         [All(typeof(PBUiText), typeof(PBUiTransform), typeof(UITransformComponent))]
         [None(typeof(UITextComponent))]
-        private void InstantiateNonExistingUIText(in Entity entity, ref PBUiText sdkComponent, ref UITransformComponent transform)
-        {
-            var uiTextComponent = new UITextComponent();
-            InstantiateLabel(entity, ref uiTextComponent, ref sdkComponent, ref transform);
-            World.Add(entity, uiTextComponent);
-        }
-
-        [Query]
-        [All(typeof(PBUiText), typeof(UITransformComponent), typeof(UITextComponent))]
-        private void TrySetupExistingUIText(in Entity entity, ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
-        {
-            if (!sdkComponent.IsDirty)
-                return;
-
-            if (ReferenceEquals(uiTextComponent.Label, null))
-                InstantiateLabel(entity, ref uiTextComponent, ref sdkComponent, ref uiTransformComponent);
-            else
-                SetupLabel(ref uiTextComponent.Label, ref sdkComponent, ref uiTransformComponent);
-
-            sdkComponent.IsDirty = false;
-        }
-
-        private void InstantiateLabel(in Entity entity, ref UITextComponent uiTextComponent, ref PBUiText sdkComponent, ref UITransformComponent uiTransformComponent)
+        private void InstantiateUIText(in Entity entity, ref UITransformComponent uiTransformComponent)
         {
             var label = labelsPool.Get();
             label.name = $"UIText (Entity {entity.Id})";
+            label.pickingMode = PickingMode.Ignore;
             UiElementUtils.SetElementDefaultStyle(label.style);
             uiTransformComponent.Transform.Add(label);
+            var uiTextComponent = new UITextComponent();
             uiTextComponent.Label = label;
-
-            SetupLabel(ref label, ref sdkComponent, ref uiTransformComponent);
+            World.Add(entity, uiTextComponent);
         }
 
-        private static void SetupLabel(ref Label labelToSetup, ref PBUiText model, ref UITransformComponent uiTransformComponent)
+        [Query]
+        [All(typeof(PBUiText), typeof(UITransformComponent), typeof(UITextComponent))]
+        private void UpdateUIText(ref UITextComponent uiTextComponent, ref PBUiText sdkModel, ref UITransformComponent uiTransformComponent)
         {
-            labelToSetup.pickingMode = PickingMode.Ignore;
-
-            if (uiTransformComponent.Transform.style.width.keyword == StyleKeyword.Auto || uiTransformComponent.Transform.style.height.keyword == StyleKeyword.Auto)
-                labelToSetup.style.position = new StyleEnum<Position>(Position.Relative);
+            if (!sdkModel.IsDirty)
+                return;
 
-            labelToSetup.text = model.Value;
-            labelToSetup.style.color = model.GetColor();
-            labelToSetup.style.fontSize = model.GetFontSize();
-            labelToSetup.style.unityTextAlign = model.GetTextAlign();
-            //labelToSetup.style.unityFont = model.GetFont();
+            UiElementUtils.SetupLabel(ref uiTextComponent.Label, ref sdkModel, ref uiTransformComponent);
+            sdkModel.IsDirty = false;
         }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
index 7b1fb2777c..e101a2e76f 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
@@ -6,8 +6,6 @@
 using DCL.ECSComponents;
 using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
-using DCL.SDKComponents.SceneUI.Defaults;
-using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
 using ECS.Groups;
 using UnityEngine.UIElements;
@@ -30,127 +28,21 @@ private UITransformInstantiationSystem(World world, UIDocument canvas, IComponen
 
         protected override void Update(float t)
         {
-            InstantiateNonExistingUITransformQuery(World);
-            TrySetupExistingUITransformQuery(World);
+            InstantiateUITransformQuery(World);
         }
 
         [Query]
         [All(typeof(PBUiTransform))]
         [None(typeof(UITransformComponent))]
-        private void InstantiateNonExistingUITransform(in Entity entity, ref PBUiTransform sdkComponent)
+        private void InstantiateUITransform(in Entity entity)
         {
-            var uiTransformComponent = new UITransformComponent();
-            InstantiateEmptyVisualElement(entity, ref uiTransformComponent, ref sdkComponent);
-            World.Add(entity, uiTransformComponent);
-        }
-
-        [Query]
-        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
-        private void TrySetupExistingUITransform(in Entity entity, ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
-        {
-            if (!sdkComponent.IsDirty)
-                return;
-
-            if (ReferenceEquals(uiTransformComponent.Transform, null))
-                InstantiateEmptyVisualElement(entity, ref uiTransformComponent, ref sdkComponent);
-            else
-                SetupVisualElement(ref uiTransformComponent.Transform, ref sdkComponent);
-        }
-
-        private void InstantiateEmptyVisualElement(Entity entity, ref UITransformComponent uiTransformComponent, ref PBUiTransform sdkComponent)
-        {
-            var transform = transformsPool.Get();
-            transform.name = $"UITransform (Entity {entity.Id})";
-            UiElementUtils.SetElementDefaultStyle(transform.style);
-            canvas.rootVisualElement.Add(transform);
-            uiTransformComponent.Transform = transform;
-            uiTransformComponent.Parent = EntityReference.Null;
-
-            SetupVisualElement(ref transform, ref sdkComponent);
-        }
-
-        private static void SetupVisualElement(ref VisualElement visualElementToSetup, ref PBUiTransform model)
-        {
-            visualElementToSetup.style.display = UiElementUtils.GetDisplay(model.Display);
-            visualElementToSetup.style.overflow = UiElementUtils.GetOverflow(model.Overflow);
-
-            // Pointer blocking
-            visualElementToSetup.pickingMode = model.PointerFilter == PointerFilterMode.PfmBlock ? PickingMode.Position : PickingMode.Ignore;
-
-            // Flex
-            visualElementToSetup.style.flexDirection = UiElementUtils.GetFlexDirection(model.FlexDirection);
-            if (model.FlexBasisUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.flexBasis = model.FlexBasisUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.FlexBasis, UiElementUtils.GetUnit(model.FlexBasisUnit));
-
-            visualElementToSetup.style.flexGrow = model.FlexGrow;
-            visualElementToSetup.style.flexShrink = model.GetFlexShrink();
-            visualElementToSetup.style.flexWrap = UiElementUtils.GetWrap(model.GetFlexWrap());
-
-            // Align
-            visualElementToSetup.style.alignContent = UiElementUtils.GetAlign(model.GetAlignContent());
-            visualElementToSetup.style.alignItems = UiElementUtils.GetAlign(model.GetAlignItems());
-            visualElementToSetup.style.alignSelf = UiElementUtils.GetAlign(model.AlignSelf);
-            visualElementToSetup.style.justifyContent = UiElementUtils.GetJustify(model.JustifyContent);
-
-            // Layout size
-            if (model.HeightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.height = model.HeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Height, UiElementUtils.GetUnit(model.HeightUnit));
-
-            if (model.WidthUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.width = model.WidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Width, UiElementUtils.GetUnit(model.WidthUnit));
-
-            if (model.MaxWidthUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.maxWidth = model.MaxWidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxWidth, UiElementUtils.GetUnit(model.MaxWidthUnit));
-
-            if (model.MaxHeightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.maxHeight = model.MaxHeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxHeight, UiElementUtils.GetUnit(model.MaxHeightUnit));
-
-            if (model.MinHeightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.minHeight = new Length(model.MinHeight, UiElementUtils.GetUnit(model.MinHeightUnit));
-
-            if (model.MinWidthUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.minWidth = new Length(model.MinWidth, UiElementUtils.GetUnit(model.MinWidthUnit));
-
-            // Paddings
-            if (model.PaddingBottomUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.paddingBottom = new Length(model.PaddingBottom, UiElementUtils.GetUnit(model.PaddingBottomUnit));
-
-            if (model.PaddingLeftUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.paddingLeft = new Length(model.PaddingLeft, UiElementUtils.GetUnit(model.PaddingLeftUnit));
-
-            if (model.PaddingRightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.paddingRight = new Length(model.PaddingRight, UiElementUtils.GetUnit(model.PaddingRightUnit));
-
-            if (model.PaddingTopUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.paddingTop = new Length(model.PaddingTop, UiElementUtils.GetUnit(model.PaddingTopUnit));
-
-            // Margins
-            if (model.MarginLeftUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.marginLeft = new Length(model.MarginLeft, UiElementUtils.GetUnit(model.MarginLeftUnit));
-
-            if (model.MarginRightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.marginRight = new Length(model.MarginRight, UiElementUtils.GetUnit(model.MarginRightUnit));
-
-            if (model.MarginBottomUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.marginBottom = new Length(model.MarginBottom, UiElementUtils.GetUnit(model.MarginBottomUnit));
-
-            if (model.MarginTopUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.marginTop = new Length(model.MarginTop, UiElementUtils.GetUnit(model.MarginTopUnit));
-
-            // Position
-            visualElementToSetup.style.position = UiElementUtils.GetPosition(model.PositionType);
-
-            if (model.PositionTopUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.top = new Length(model.PositionTop, UiElementUtils.GetUnit(model.PositionTopUnit));
-
-            if (model.PositionBottomUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.bottom = new Length(model.PositionBottom, UiElementUtils.GetUnit(model.PositionBottomUnit));
-
-            if (model.PositionRightUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.right = new Length(model.PositionRight, UiElementUtils.GetUnit(model.PositionRightUnit));
-
-            if (model.PositionLeftUnit != YGUnit.YguUndefined)
-                visualElementToSetup.style.left = new Length(model.PositionLeft, UiElementUtils.GetUnit(model.PositionLeftUnit));
+            VisualElement newTransform = transformsPool.Get();
+            newTransform.name = $"UITransform (Entity {entity.Id})";
+            canvas.rootVisualElement.Add(newTransform);
+            var transformComponent = new UITransformComponent();
+            transformComponent.Transform = newTransform;
+            transformComponent.Parent = EntityReference.Null;
+            World.Add(entity, transformComponent);
         }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
index 10bce5ac62..9292e479c6 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
@@ -29,20 +29,20 @@ public UITransformParentingSystem(World world, IReadOnlyDictionary<CRDTEntity, E
 
         protected override void Update(float t)
         {
-            DoParentingQuery(World);
+            DoUITransformParentingQuery(World);
         }
 
         [Query]
         [All(typeof(PBUiTransform), typeof(UITransformComponent))]
-        private void DoParenting(in Entity entity, ref PBUiTransform sdkTransform, ref UITransformComponent transformComponent)
+        private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel, ref UITransformComponent uiTransformComponent)
         {
-            if (!sdkTransform.IsDirty)
+            if (!sdkModel.IsDirty)
                 return;
 
-            if (entitiesMap.TryGetValue(sdkTransform.Parent, out Entity newParentEntity) &&
+            if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) &&
                 newParentEntity != sceneRoot &&
-                !transformComponent.Transform.Contains(World.Get<UITransformComponent>(newParentEntity).Transform)) // TODO: This check shouldn't be needed!
-                SetNewChild(ref transformComponent, World.Reference(entity), newParentEntity);
+                !uiTransformComponent.Transform.Contains(World.Get<UITransformComponent>(newParentEntity).Transform)) // TODO: This check shouldn't be needed!
+                SetNewChild(ref uiTransformComponent, World.Reference(entity), newParentEntity);
         }
 
         private void SetNewChild(ref UITransformComponent childComponent, EntityReference childEntityReference, Entity parentEntity)
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
index 204cefe36d..f4ed97ae2a 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
@@ -29,20 +29,18 @@ public UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Ent
 
         protected override void Update(float t)
         {
-            DoSortingQuery(World);
+            DoUITransformSortingQuery(World);
         }
 
         [Query]
         [All(typeof(PBUiTransform), typeof(UITransformComponent))]
-        private void DoSorting(ref PBUiTransform sdkTransform, ref UITransformComponent transformComponent)
+        private void DoUITransformSorting(ref PBUiTransform sdkModel, ref UITransformComponent uiTransformComponent)
         {
-            if (!sdkTransform.IsDirty)
+            if (!sdkModel.IsDirty)
                 return;
 
-            if (entitiesMap.TryGetValue(sdkTransform.RightOf, out Entity rightOfEntity) && rightOfEntity != sceneRoot)
-                transformComponent.Transform.PlaceInFront(World.Get<UITransformComponent>(rightOfEntity).Transform);
-
-            sdkTransform.IsDirty = false;
+            if (entitiesMap.TryGetValue(sdkModel.RightOf, out Entity rightOfEntity) && rightOfEntity != sceneRoot)
+                uiTransformComponent.Transform.PlaceInFront(World.Get<UITransformComponent>(rightOfEntity).Transform);
         }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs
new file mode 100644
index 0000000000..469229403d
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs
@@ -0,0 +1,38 @@
+using Arch.Core;
+using Arch.System;
+using Arch.SystemGroups;
+using Arch.SystemGroups.Throttling;
+using DCL.Diagnostics;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using ECS.Abstract;
+using ECS.Groups;
+using DCL.SDKComponents.SceneUI.Utils;
+
+namespace DCL.SDKComponents.SceneUI.Systems
+{
+    [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
+    [UpdateAfter(typeof(UITransformSortingSystem))]
+    [LogCategory(ReportCategory.SCENE_UI)]
+    [ThrottlingEnabled]
+    public partial class UITransformUpdateSystem : BaseUnityLoopSystem
+    {
+        public UITransformUpdateSystem(World world) : base(world) { }
+
+        protected override void Update(float _)
+        {
+            UpdateUITransformQuery(World);
+        }
+
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
+        private void UpdateUITransform(ref PBUiTransform sdkModel, ref UITransformComponent uiTransformComponent)
+        {
+            if (!sdkModel.IsDirty)
+                return;
+
+            UiElementUtils.SetupVisualElement(ref uiTransformComponent.Transform, ref sdkModel);
+            sdkModel.IsDirty = false;
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta
new file mode 100644
index 0000000000..9702b7fe89
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: be5fca2920cd4f55ba66bef5c023ba8c
+timeCreated: 1704467302
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index 2b14b7ce98..bdada1ab00 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -1,10 +1,108 @@
 using UnityEngine.UIElements;
 using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Defaults;
 
 namespace DCL.SDKComponents.SceneUI.Utils
 {
     public static class UiElementUtils
     {
+        public static void SetupVisualElement(ref VisualElement visualElementToSetup, ref PBUiTransform model)
+        {
+            visualElementToSetup.style.display = GetDisplay(model.Display);
+            visualElementToSetup.style.overflow = GetOverflow(model.Overflow);
+
+            // Pointer blocking
+            visualElementToSetup.pickingMode = model.PointerFilter == PointerFilterMode.PfmBlock ? PickingMode.Position : PickingMode.Ignore;
+
+            // Flex
+            visualElementToSetup.style.flexDirection = GetFlexDirection(model.FlexDirection);
+            if (model.FlexBasisUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.flexBasis = model.FlexBasisUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.FlexBasis, GetUnit(model.FlexBasisUnit));
+
+            visualElementToSetup.style.flexGrow = model.FlexGrow;
+            visualElementToSetup.style.flexShrink = model.GetFlexShrink();
+            visualElementToSetup.style.flexWrap = GetWrap(model.GetFlexWrap());
+
+            // Align
+            visualElementToSetup.style.alignContent = GetAlign(model.GetAlignContent());
+            visualElementToSetup.style.alignItems = GetAlign(model.GetAlignItems());
+            visualElementToSetup.style.alignSelf = GetAlign(model.AlignSelf);
+            visualElementToSetup.style.justifyContent = GetJustify(model.JustifyContent);
+
+            // Layout size
+            if (model.HeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.height = model.HeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Height, GetUnit(model.HeightUnit));
+
+            if (model.WidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.width = model.WidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Width, GetUnit(model.WidthUnit));
+
+            if (model.MaxWidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.maxWidth = model.MaxWidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxWidth, GetUnit(model.MaxWidthUnit));
+
+            if (model.MaxHeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.maxHeight = model.MaxHeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxHeight, GetUnit(model.MaxHeightUnit));
+
+            if (model.MinHeightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.minHeight = new Length(model.MinHeight, GetUnit(model.MinHeightUnit));
+
+            if (model.MinWidthUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.minWidth = new Length(model.MinWidth, GetUnit(model.MinWidthUnit));
+
+            // Paddings
+            if (model.PaddingBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingBottom = new Length(model.PaddingBottom, GetUnit(model.PaddingBottomUnit));
+
+            if (model.PaddingLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingLeft = new Length(model.PaddingLeft, GetUnit(model.PaddingLeftUnit));
+
+            if (model.PaddingRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingRight = new Length(model.PaddingRight, GetUnit(model.PaddingRightUnit));
+
+            if (model.PaddingTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.paddingTop = new Length(model.PaddingTop, GetUnit(model.PaddingTopUnit));
+
+            // Margins
+            if (model.MarginLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginLeft = new Length(model.MarginLeft, GetUnit(model.MarginLeftUnit));
+
+            if (model.MarginRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginRight = new Length(model.MarginRight, GetUnit(model.MarginRightUnit));
+
+            if (model.MarginBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginBottom = new Length(model.MarginBottom, GetUnit(model.MarginBottomUnit));
+
+            if (model.MarginTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.marginTop = new Length(model.MarginTop, GetUnit(model.MarginTopUnit));
+
+            // Position
+            visualElementToSetup.style.position = GetPosition(model.PositionType);
+
+            if (model.PositionTopUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.top = new Length(model.PositionTop, GetUnit(model.PositionTopUnit));
+
+            if (model.PositionBottomUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.bottom = new Length(model.PositionBottom, GetUnit(model.PositionBottomUnit));
+
+            if (model.PositionRightUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.right = new Length(model.PositionRight, GetUnit(model.PositionRightUnit));
+
+            if (model.PositionLeftUnit != YGUnit.YguUndefined)
+                visualElementToSetup.style.left = new Length(model.PositionLeft, GetUnit(model.PositionLeftUnit));
+        }
+
+        public static void SetupLabel(ref Label labelToSetup, ref PBUiText model, ref UITransformComponent uiTransformComponent)
+        {
+            if (uiTransformComponent.Transform.style.width.keyword == StyleKeyword.Auto || uiTransformComponent.Transform.style.height.keyword == StyleKeyword.Auto)
+                labelToSetup.style.position = new StyleEnum<Position>(Position.Relative);
+
+            labelToSetup.text = model.Value;
+            labelToSetup.style.color = model.GetColor();
+            labelToSetup.style.fontSize = model.GetFontSize();
+            labelToSetup.style.unityTextAlign = model.GetTextAlign();
+            //labelToSetup.style.unityFont = model.GetFont();
+        }
+
         public static void SetElementDefaultStyle(IStyle elementStyle)
         {
             elementStyle.right = 0;
@@ -18,7 +116,10 @@ public static void SetElementDefaultStyle(IStyle elementStyle)
             elementStyle.alignItems = new StyleEnum<Align>(Align.Center);
         }
 
-        public static LengthUnit GetUnit(YGUnit unit)
+        public static void ReleaseUIElement(VisualElement visualElement) =>
+            visualElement.RemoveFromHierarchy();
+
+        private static LengthUnit GetUnit(YGUnit unit)
         {
             switch (unit)
             {
@@ -29,7 +130,7 @@ public static LengthUnit GetUnit(YGUnit unit)
             }
         }
 
-        public static StyleEnum<Overflow> GetOverflow(YGOverflow overflow)
+        private static StyleEnum<Overflow> GetOverflow(YGOverflow overflow)
         {
             switch (overflow)
             {
@@ -40,7 +141,7 @@ public static StyleEnum<Overflow> GetOverflow(YGOverflow overflow)
             }
         }
 
-        public static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
+        private static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
         {
             switch (display)
             {
@@ -51,7 +152,7 @@ public static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
             }
         }
 
-        public static StyleEnum<Justify> GetJustify(YGJustify justify)
+        private static StyleEnum<Justify> GetJustify(YGJustify justify)
         {
             switch (justify)
             {
@@ -70,7 +171,7 @@ public static StyleEnum<Justify> GetJustify(YGJustify justify)
             }
         }
 
-        public static StyleEnum<Wrap> GetWrap(YGWrap wrap)
+        private static StyleEnum<Wrap> GetWrap(YGWrap wrap)
         {
             switch (wrap)
             {
@@ -85,7 +186,7 @@ public static StyleEnum<Wrap> GetWrap(YGWrap wrap)
             }
         }
 
-        public static StyleEnum<FlexDirection> GetFlexDirection(YGFlexDirection direction)
+        private static StyleEnum<FlexDirection> GetFlexDirection(YGFlexDirection direction)
         {
             switch (direction)
             {
@@ -102,7 +203,7 @@ public static StyleEnum<FlexDirection> GetFlexDirection(YGFlexDirection directio
             }
         }
 
-        public static StyleEnum<Position> GetPosition(YGPositionType positionType)
+        private static StyleEnum<Position> GetPosition(YGPositionType positionType)
         {
             switch (positionType)
             {
@@ -113,7 +214,7 @@ public static StyleEnum<Position> GetPosition(YGPositionType positionType)
             }
         }
 
-        public static StyleEnum<Align> GetAlign(YGAlign align)
+        private static StyleEnum<Align> GetAlign(YGAlign align)
         {
             switch (align)
             {
@@ -131,8 +232,5 @@ public static StyleEnum<Align> GetAlign(YGAlign align)
                     return Align.Auto;
             }
         }
-
-        public static void ReleaseUIElement(VisualElement visualElement) =>
-            visualElement.RemoveFromHierarchy();
     }
 }

From 25a85a86a61773a1ecdc0552ca2a82eff581378b Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 17:12:02 +0100
Subject: [PATCH 21/54] Folders reorganization

---
 .../Assets/DCL/PluginSystem/World/SceneUIPlugin.cs     |  7 +++++++
 .../Groups/SceneUIComponentInstantiationGroup.cs       |  1 +
 .../DCL/SDKComponents/SceneUI/Systems/UIText.meta      |  3 +++
 .../Systems/{ => UIText}/UITextInstantiationSystem.cs  |  2 +-
 .../{ => UIText}/UITextInstantiationSystem.cs.meta     |  0
 .../Systems/{ => UIText}/UITextReleaseSystem.cs        | 10 +++++-----
 .../Systems/{ => UIText}/UITextReleaseSystem.cs.meta   |  0
 .../DCL/SDKComponents/SceneUI/Systems/UITransform.meta |  3 +++
 .../UITransformInstantiationSystem.cs                  |  2 +-
 .../UITransformInstantiationSystem.cs.meta             |  0
 .../{ => UITransform}/UITransformParentingSystem.cs    |  4 ++--
 .../UITransformParentingSystem.cs.meta                 |  0
 .../{ => UITransform}/UITransformReleaseSystem.cs      | 10 +++++-----
 .../{ => UITransform}/UITransformReleaseSystem.cs.meta |  0
 .../{ => UITransform}/UITransformSortingSystem.cs      |  4 ++--
 .../{ => UITransform}/UITransformSortingSystem.cs.meta |  0
 .../{ => UITransform}/UITransformUpdateSystem.cs       |  6 +++---
 .../{ => UITransform}/UITransformUpdateSystem.cs.meta  |  0
 18 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText.meta
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UIText}/UITextInstantiationSystem.cs (97%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UIText}/UITextInstantiationSystem.cs.meta (100%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UIText}/UITextReleaseSystem.cs (97%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UIText}/UITextReleaseSystem.cs.meta (100%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform.meta
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformInstantiationSystem.cs (96%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformInstantiationSystem.cs.meta (100%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformParentingSystem.cs (92%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformParentingSystem.cs.meta (100%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformReleaseSystem.cs (97%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformReleaseSystem.cs.meta (100%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformSortingSystem.cs (87%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformSortingSystem.cs.meta (100%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformUpdateSystem.cs (89%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/{ => UITransform}/UITransformUpdateSystem.cs.meta (100%)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index b1195b6956..2ca6d35782 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -8,6 +8,13 @@
 using ECS.LifeCycle;
 using System.Collections.Generic;
 using UnityEngine.UIElements;
+using UITextInstantiationSystem = DCL.SDKComponents.SceneUI.Systems.UIText.UITextInstantiationSystem;
+using UITextReleaseSystem = DCL.SDKComponents.SceneUI.Systems.UIText.UITextReleaseSystem;
+using UITransformInstantiationSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformInstantiationSystem;
+using UITransformParentingSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformParentingSystem;
+using UITransformReleaseSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformReleaseSystem;
+using UITransformSortingSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformSortingSystem;
+using UITransformUpdateSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformUpdateSystem;
 
 namespace DCL.PluginSystem.World
 {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
index b445d3244b..18dccdefe4 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Groups/SceneUIComponentInstantiationGroup.cs
@@ -2,6 +2,7 @@
 using Arch.SystemGroups.Throttling;
 using DCL.SDKComponents.SceneUI.Systems;
 using ECS.Groups;
+using UITransformInstantiationSystem = DCL.SDKComponents.SceneUI.Systems.UITransform.UITransformInstantiationSystem;
 
 namespace DCL.SDKComponents.SceneUI.Groups
 {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText.meta
new file mode 100644
index 0000000000..e28af93e55
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 63a1674e451544b5ae15ba755716d050
+timeCreated: 1704470810
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
similarity index 97%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
index 14caa005ba..6c5e54f4dd 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
@@ -11,7 +11,7 @@
 using UnityEngine.UIElements;
 using Entity = Arch.Core.Entity;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UIText
 {
     [UpdateInGroup(typeof(SceneUIComponentInstantiationGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextInstantiationSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
similarity index 97%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
index 65bce81d9c..55df9ba60b 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
@@ -1,18 +1,18 @@
 using Arch.Core;
+using Arch.System;
 using Arch.SystemGroups;
 using Arch.SystemGroups.Throttling;
 using DCL.Diagnostics;
-using DCL.Optimization.Pools;
-using ECS.Abstract;
-using ECS.Groups;
-using Arch.System;
 using DCL.ECSComponents;
+using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Groups;
+using ECS.Abstract;
+using ECS.Groups;
 using ECS.LifeCycle.Components;
 using UnityEngine.UIElements;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UIText
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [UpdateBefore(typeof(SceneUIComponentInstantiationGroup))]
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITextReleaseSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform.meta
new file mode 100644
index 0000000000..dad0e2a26e
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d2575f61c2af4f1a89d6695e218176fc
+timeCreated: 1704470859
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
similarity index 96%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
index e101a2e76f..e018066ba7 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
@@ -10,7 +10,7 @@
 using ECS.Groups;
 using UnityEngine.UIElements;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [LogCategory(ReportCategory.SCENE_UI)]
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformInstantiationSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
similarity index 92%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
index 9292e479c6..5ae00b69dc 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
@@ -10,7 +10,7 @@
 using ECS.Groups;
 using System.Collections.Generic;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [UpdateAfter(typeof(UITransformInstantiationSystem))]
@@ -21,7 +21,7 @@ public partial class UITransformParentingSystem : BaseUnityLoopSystem
         private readonly Entity sceneRoot;
         private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
 
-        public UITransformParentingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
+        private UITransformParentingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
         {
             this.sceneRoot = sceneRoot;
             this.entitiesMap = entitiesMap;
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformParentingSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
similarity index 97%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
index 9e7818d1b2..2dac34b028 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
@@ -1,17 +1,17 @@
 using Arch.Core;
+using Arch.System;
 using Arch.SystemGroups;
 using Arch.SystemGroups.Throttling;
-using DCL.Optimization.Pools;
-using ECS.Abstract;
-using ECS.Groups;
-using Arch.System;
 using DCL.Diagnostics;
 using DCL.ECSComponents;
+using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
+using ECS.Abstract;
+using ECS.Groups;
 using ECS.LifeCycle.Components;
 using UnityEngine.UIElements;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [UpdateBefore(typeof(UITransformInstantiationSystem))]
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformReleaseSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
similarity index 87%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
index f4ed97ae2a..37191ddfdf 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
@@ -10,7 +10,7 @@
 using ECS.Groups;
 using System.Collections.Generic;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [UpdateAfter(typeof(UITransformParentingSystem))]
@@ -21,7 +21,7 @@ public partial class UITransformSortingSystem : BaseUnityLoopSystem
         private readonly Entity sceneRoot;
         private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
 
-        public UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
+        private UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
         {
             this.sceneRoot = sceneRoot;
             this.entitiesMap = entitiesMap;
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformSortingSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs.meta
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
similarity index 89%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
index 469229403d..9cc80dde6b 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
@@ -5,11 +5,11 @@
 using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
 using ECS.Groups;
-using DCL.SDKComponents.SceneUI.Utils;
 
-namespace DCL.SDKComponents.SceneUI.Systems
+namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
     [UpdateInGroup(typeof(SyncedSimulationSystemGroup))]
     [UpdateAfter(typeof(UITransformSortingSystem))]
@@ -17,7 +17,7 @@ namespace DCL.SDKComponents.SceneUI.Systems
     [ThrottlingEnabled]
     public partial class UITransformUpdateSystem : BaseUnityLoopSystem
     {
-        public UITransformUpdateSystem(World world) : base(world) { }
+        private UITransformUpdateSystem(World world) : base(world) { }
 
         protected override void Update(float _)
         {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransformUpdateSystem.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs.meta

From a8c0d25a06b2d08de26b13fc588c36600b36d34e Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 17:17:19 +0100
Subject: [PATCH 22/54] Folders reorganization (II)

---
 .../SceneUI/Utils/{ProtoConvertUtils.cs => Extensions.cs}       | 2 +-
 .../Utils/{ProtoConvertUtils.cs.meta => Extensions.cs.meta}     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/{ProtoConvertUtils.cs => Extensions.cs} (96%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/{ProtoConvertUtils.cs.meta => Extensions.cs.meta} (100%)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/Extensions.cs
similarity index 96%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/Extensions.cs
index c4ce533239..d4dfe9f8a2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/Extensions.cs
@@ -3,7 +3,7 @@
 
 namespace DCL.SDKComponents.SceneUI.Utils
 {
-    public static class ProtoConvertUtils
+    public static class Extensions
     {
         public static TextAnchor ToUnityTextAlign(this TextAlignMode align)
         {
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/Extensions.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/ProtoConvertUtils.cs.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/Extensions.cs.meta

From 7ec42a5c21bb7efb8b0a87eb4a5b39efc044ca38 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 18:07:34 +0100
Subject: [PATCH 23/54] Update SceneUIPlugin.cs

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 2ca6d35782..18b8868fac 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -2,7 +2,6 @@
 using DCL.Optimization.Pools;
 using DCL.PluginSystem.World.Dependencies;
 using DCL.SDKComponents.SceneUI.Components;
-using DCL.SDKComponents.SceneUI.Systems;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.ComponentsPooling.Systems;
 using ECS.LifeCycle;

From b2613907280560b03c080531c89fff53e5674162 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 5 Jan 2024 18:18:52 +0100
Subject: [PATCH 24/54] Fix missing conflicts from last merge

---
 .../Assets/Scenes/DynamicSceneLoading.unity   | 74 +++++++++++++++++++
 .../Dynamic/DynamicSceneLoaderSettings.asset  |  3 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index 4d64b518fc..4585437731 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -279,6 +279,8 @@ MonoBehaviour:
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
+  scenesUiRoot: {fileID: 1632626102}
+  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
   realmLauncher: {fileID: 234607244}
   settings: {fileID: 11400000, guid: 2e1d2c350e04ac3428300d032c5ee567, type: 2}
   dynamicSettings:
@@ -1476,6 +1478,78 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1001 &1632626101
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_Name
+      value: ScenesUIRootCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+--- !u!114 &1632626102 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+  m_PrefabInstance: {fileID: 1632626101}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1648087548
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
index 678465659e..36567546fc 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset
@@ -23,5 +23,6 @@ MonoBehaviour:
   - https://worlds-content-server.decentraland.org/world/olavra.dcl.eth
   - https://worlds-content-server.decentraland.org/world/yemel.dcl.eth
   - https://worlds-content-server.decentraland.org/world/MetadyneLabs.dcl.eth
+  - http://127.0.0.1:8000
   <AuthWebSocketUrl>k__BackingField: https://auth-api.decentraland.zone
-  <AuthSignatureUrl>k__BackingField: https://decentraland.zone/auth/requests
\ No newline at end of file
+  <AuthSignatureUrl>k__BackingField: https://decentraland.zone/auth/requests

From 5b0cc98335c668af62d401b3d5c7c32bf35a37f2 Mon Sep 17 00:00:00 2001
From: Mikhail Agapov <mikhail.agapov@decentraland.org>
Date: Mon, 8 Jan 2024 15:23:39 +0300
Subject: [PATCH 25/54] Add an option to clear PB components on Get

---
 .../SDKComponentBuilderExtensions.cs           | 18 +++++++++++++-----
 .../Scripts/Global/ComponentsContainer.cs      |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Explorer/Assets/Scripts/CrdtEcsBridge/Components/SDKComponentBuilderExtensions.cs b/Explorer/Assets/Scripts/CrdtEcsBridge/Components/SDKComponentBuilderExtensions.cs
index 2577d41bf5..fddbd213c8 100644
--- a/Explorer/Assets/Scripts/CrdtEcsBridge/Components/SDKComponentBuilderExtensions.cs
+++ b/Explorer/Assets/Scripts/CrdtEcsBridge/Components/SDKComponentBuilderExtensions.cs
@@ -51,11 +51,19 @@ public static SDKComponentBuilder<T> WithProtobufSerializer<T>(this SDKComponent
         ///     A shortcut to create a standard suite for Protobuf components
         /// </summary>
         /// <returns></returns>
-        public static SDKComponentBridge AsProtobufComponent<T>(this SDKComponentBuilder<T> sdkComponentBuilder)
-            where T: class, IMessage<T>, IDirtyMarker, new() =>
-            sdkComponentBuilder.WithProtobufSerializer()
-                               .WithPool(SetAsDirty)
-                               .Build();
+        public static SDKComponentBridge AsProtobufComponent<T>(this SDKComponentBuilder<T> sdkComponentBuilder, bool clearComponent = false)
+            where T: class, IMessage<T>, IDirtyMarker, new()
+        {
+            // We clear "on get" because it's called from the background thread unlike "on release"
+            Action<T> onGet = SetAsDirty;
+
+            if (clearComponent)
+                onGet += ClearProtobufComponent;
+
+            return sdkComponentBuilder.WithProtobufSerializer()
+                                      .WithPool(onGet)
+                                      .Build();
+        }
 
         /// <summary>
         ///     A shortcut to create a standard suite for Protobuf component which is added as result from Renderer
diff --git a/Explorer/Assets/Scripts/Global/ComponentsContainer.cs b/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
index e083670e41..ccc178a5f6 100644
--- a/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
+++ b/Explorer/Assets/Scripts/Global/ComponentsContainer.cs
@@ -38,7 +38,7 @@ public static ComponentsContainer Create()
                .Add(SDKComponentBuilder<PBTextShape>.Create(ComponentID.TEXT_SHAPE).AsProtobufComponent())
                .Add(SDKComponentBuilder<PBMaterial>.Create(ComponentID.MATERIAL).AsProtobufComponent())
                .Add(SDKComponentBuilder<PBRaycast>.Create(ComponentID.RAYCAST).AsProtobufComponent())
-               .Add(SDKComponentBuilder<PBUiTransform>.Create(ComponentID.UI_TRANSFORM).AsProtobufComponent())
+               .Add(SDKComponentBuilder<PBUiTransform>.Create(ComponentID.UI_TRANSFORM).AsProtobufComponent(true))
                .Add(SDKComponentBuilder<PBUiText>.Create(ComponentID.UI_TEXT).AsProtobufComponent())
 
                 // Special logic for pooling/releasing PBRaycastResult

From cc4310891452cc75cc3b4c7ea64befcf15f7281e Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 8 Jan 2024 13:43:32 +0100
Subject: [PATCH 26/54] Set default values in UiElementUtils.SetupVisualElement
 function

---
 .../SceneUI/Utils/UiElementUtils.cs           | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index bdada1ab00..a2ebb40d33 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -33,62 +33,98 @@ public static void SetupVisualElement(ref VisualElement visualElementToSetup, re
             // Layout size
             if (model.HeightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.height = model.HeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Height, GetUnit(model.HeightUnit));
+            else
+                visualElementToSetup.style.height = StyleKeyword.Null;
 
             if (model.WidthUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.width = model.WidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.Width, GetUnit(model.WidthUnit));
+            else
+                visualElementToSetup.style.width = StyleKeyword.Null;
 
             if (model.MaxWidthUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.maxWidth = model.MaxWidthUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxWidth, GetUnit(model.MaxWidthUnit));
+            else
+                visualElementToSetup.style.maxWidth = StyleKeyword.Null;
 
             if (model.MaxHeightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.maxHeight = model.MaxHeightUnit == YGUnit.YguAuto ? new StyleLength(StyleKeyword.Auto) : new Length(model.MaxHeight, GetUnit(model.MaxHeightUnit));
+            else
+                visualElementToSetup.style.maxHeight = StyleKeyword.Null;
 
             if (model.MinHeightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.minHeight = new Length(model.MinHeight, GetUnit(model.MinHeightUnit));
+            else
+                visualElementToSetup.style.minHeight = StyleKeyword.Null;
 
             if (model.MinWidthUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.minWidth = new Length(model.MinWidth, GetUnit(model.MinWidthUnit));
+            else
+                visualElementToSetup.style.minWidth = StyleKeyword.Null;
 
             // Paddings
             if (model.PaddingBottomUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.paddingBottom = new Length(model.PaddingBottom, GetUnit(model.PaddingBottomUnit));
+            else
+                visualElementToSetup.style.paddingBottom = StyleKeyword.Null;
 
             if (model.PaddingLeftUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.paddingLeft = new Length(model.PaddingLeft, GetUnit(model.PaddingLeftUnit));
+            else
+                visualElementToSetup.style.paddingLeft = StyleKeyword.Null;
 
             if (model.PaddingRightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.paddingRight = new Length(model.PaddingRight, GetUnit(model.PaddingRightUnit));
+            else
+                visualElementToSetup.style.paddingRight = StyleKeyword.Null;
 
             if (model.PaddingTopUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.paddingTop = new Length(model.PaddingTop, GetUnit(model.PaddingTopUnit));
+            else
+                visualElementToSetup.style.paddingTop = StyleKeyword.Null;
 
             // Margins
             if (model.MarginLeftUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.marginLeft = new Length(model.MarginLeft, GetUnit(model.MarginLeftUnit));
+            else
+                visualElementToSetup.style.marginLeft = StyleKeyword.Null;
 
             if (model.MarginRightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.marginRight = new Length(model.MarginRight, GetUnit(model.MarginRightUnit));
+            else
+                visualElementToSetup.style.marginRight = StyleKeyword.Null;
 
             if (model.MarginBottomUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.marginBottom = new Length(model.MarginBottom, GetUnit(model.MarginBottomUnit));
+            else
+                visualElementToSetup.style.marginBottom = StyleKeyword.Null;
 
             if (model.MarginTopUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.marginTop = new Length(model.MarginTop, GetUnit(model.MarginTopUnit));
+            else
+                visualElementToSetup.style.marginTop = StyleKeyword.Null;
 
             // Position
             visualElementToSetup.style.position = GetPosition(model.PositionType);
 
             if (model.PositionTopUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.top = new Length(model.PositionTop, GetUnit(model.PositionTopUnit));
+            else
+                visualElementToSetup.style.top = StyleKeyword.Null;
 
             if (model.PositionBottomUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.bottom = new Length(model.PositionBottom, GetUnit(model.PositionBottomUnit));
+            else
+                visualElementToSetup.style.bottom = StyleKeyword.Null;
 
             if (model.PositionRightUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.right = new Length(model.PositionRight, GetUnit(model.PositionRightUnit));
+            else
+                visualElementToSetup.style.right = StyleKeyword.Null;
 
             if (model.PositionLeftUnit != YGUnit.YguUndefined)
                 visualElementToSetup.style.left = new Length(model.PositionLeft, GetUnit(model.PositionLeftUnit));
+            else
+                visualElementToSetup.style.left = StyleKeyword.Null;
         }
 
         public static void SetupLabel(ref Label labelToSetup, ref PBUiText model, ref UITransformComponent uiTransformComponent)

From 831848db4f399c718d40ce44224848f30b9dcd94 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 8 Jan 2024 13:44:25 +0100
Subject: [PATCH 27/54] Remove unneeded conditional

---
 .../SceneUI/Systems/UITransform/UITransformParentingSystem.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
index 5ae00b69dc..2a7ceea06c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
@@ -39,9 +39,7 @@ private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel
             if (!sdkModel.IsDirty)
                 return;
 
-            if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) &&
-                newParentEntity != sceneRoot &&
-                !uiTransformComponent.Transform.Contains(World.Get<UITransformComponent>(newParentEntity).Transform)) // TODO: This check shouldn't be needed!
+            if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) && newParentEntity != sceneRoot)
                 SetNewChild(ref uiTransformComponent, World.Reference(entity), newParentEntity);
         }
 

From 5d34067c1ae64b717ae53883dfa23e81f5725686 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Mon, 8 Jan 2024 19:29:09 +0100
Subject: [PATCH 28/54] Apply UITransform sibling

---
 .../Components/UITransformComponent.cs        |  6 +++++-
 .../UITransformInstantiationSystem.cs         |  2 ++
 .../UITransform/UITransformParentingSystem.cs |  4 ++++
 .../UITransform/UITransformSortingSystem.cs   | 20 +++++++++++++++++--
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
index 545156b065..ed9df288f2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
@@ -1,6 +1,8 @@
 using Arch.Core;
 using DCL.Optimization.Pools;
 using System;
+using System.Collections.Generic;
+using UnityEngine.Pool;
 using UnityEngine.UIElements;
 
 namespace DCL.SDKComponents.SceneUI.Components
@@ -9,13 +11,15 @@ public struct UITransformComponent : IPoolableComponentProvider<VisualElement>
     {
         public VisualElement Transform;
         public EntityReference Parent;
+        public int RightOf;
+        public HashSet<EntityReference> Children;
 
         VisualElement IPoolableComponentProvider<VisualElement>.PoolableComponent => Transform;
         Type IPoolableComponentProvider<VisualElement>.PoolableComponentType => typeof(VisualElement);
 
         public void Dispose()
         {
-
+            HashSetPool<EntityReference>.Release(Children);
         }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
index e018066ba7..31decd5196 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
@@ -8,6 +8,7 @@
 using DCL.SDKComponents.SceneUI.Components;
 using ECS.Abstract;
 using ECS.Groups;
+using UnityEngine.Pool;
 using UnityEngine.UIElements;
 
 namespace DCL.SDKComponents.SceneUI.Systems.UITransform
@@ -42,6 +43,7 @@ private void InstantiateUITransform(in Entity entity)
             var transformComponent = new UITransformComponent();
             transformComponent.Transform = newTransform;
             transformComponent.Parent = EntityReference.Null;
+            transformComponent.Children = HashSetPool<EntityReference>.Get();
             World.Add(entity, transformComponent);
         }
     }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
index 2a7ceea06c..7bd9d247fd 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
@@ -40,7 +40,10 @@ private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel
                 return;
 
             if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) && newParentEntity != sceneRoot)
+            {
                 SetNewChild(ref uiTransformComponent, World.Reference(entity), newParentEntity);
+                uiTransformComponent.RightOf = sdkModel.RightOf;
+            }
         }
 
         private void SetNewChild(ref UITransformComponent childComponent, EntityReference childEntityReference, Entity parentEntity)
@@ -56,6 +59,7 @@ private void SetNewChild(ref UITransformComponent childComponent, EntityReferenc
 
             UITransformComponent parentComponent = World.Get<UITransformComponent>(parentEntity);
             parentComponent.Transform.Add(childComponent.Transform);
+            parentComponent.Children.Add(childEntityReference);
             childComponent.Parent = World.Reference(parentEntity);
         }
     }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
index 37191ddfdf..72800a5925 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
@@ -21,6 +21,8 @@ public partial class UITransformSortingSystem : BaseUnityLoopSystem
         private readonly Entity sceneRoot;
         private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
 
+        private List<UITransformComponent> transformList = new ();
+
         private UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
         {
             this.sceneRoot = sceneRoot;
@@ -39,8 +41,22 @@ private void DoUITransformSorting(ref PBUiTransform sdkModel, ref UITransformCom
             if (!sdkModel.IsDirty)
                 return;
 
-            if (entitiesMap.TryGetValue(sdkModel.RightOf, out Entity rightOfEntity) && rightOfEntity != sceneRoot)
-                uiTransformComponent.Transform.PlaceInFront(World.Get<UITransformComponent>(rightOfEntity).Transform);
+            SortUITransform(ref uiTransformComponent);
+
+            if (uiTransformComponent.Parent == EntityReference.Null)
+                return;
+
+            foreach (EntityReference brotherEntity in World.Get<UITransformComponent>(uiTransformComponent.Parent).Children)
+                SortUITransform(ref World.Get<UITransformComponent>(brotherEntity));
+        }
+
+        private void SortUITransform(ref UITransformComponent uiTransform)
+        {
+            if (!entitiesMap.TryGetValue(uiTransform.RightOf, out Entity entityOnLeft) || entityOnLeft == sceneRoot)
+                return;
+
+            var uiTransformOnLeft = World.Get<UITransformComponent>(entityOnLeft);
+            uiTransform.Transform.PlaceInFront(uiTransformOnLeft.Transform);
         }
     }
 }

From 10e10d099481ec583dbef2ef51b0bae026e2902e Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 10:54:16 +0100
Subject: [PATCH 29/54] Fix missing conflicts from last merge

---
 .../Assets/Scenes/DynamicSceneLoading.unity   | 238 ++++++++++--------
 .../Global/Dynamic/DynamicSceneLoader.cs      |   5 +-
 2 files changed, 133 insertions(+), 110 deletions(-)

diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index 122b3f6d8e..cf86dee678 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -97,8 +97,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: ae63551eafe11944f8527ceb84841c83,
-    type: 2}
+  m_LightingDataAsset: {fileID: 112000000, guid: ae63551eafe11944f8527ceb84841c83, type: 2}
   m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings:
@@ -134,7 +133,7 @@ GameObject:
   m_Component:
   - component: {fileID: 158563622}
   m_Layer: 0
-  m_Name: '---------------- Base Environment ---------------'
+  m_Name: ---------------- Base Environment ---------------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -153,7 +152,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &170878723
 GameObject:
@@ -276,12 +275,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aa1edce87d5d4c41bbc1550b42e82900, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  globalPluginSettingsContainer: {fileID: 11400000, guid: 7575a56449e4af444b9c13267319c95d,
-    type: 2}
-  scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92,
-    type: 2}
+  globalPluginSettingsContainer: {fileID: 11400000, guid: 7575a56449e4af444b9c13267319c95d, type: 2}
+  scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
+  scenesUiRoot: {fileID: 2134614891}
+  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
   skyBoxSceneData: {fileID: 705507997}
   realmLauncher: {fileID: 234607244}
   settings: {fileID: 11400000, guid: 2e1d2c350e04ac3428300d032c5ee567, type: 2}
@@ -628,14 +627,12 @@ CanvasRenderer:
   m_CullTransparentMesh: 1
 --- !u!108 &705507994 stripped
 Light:
-  m_CorrespondingSourceObject: {fileID: 7432390511473013031, guid: ff887d043bcc0b94a8782b218200d650,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 7432390511473013031, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
   m_PrefabInstance: {fileID: 2120228937440095928}
   m_PrefabAsset: {fileID: 0}
 --- !u!114 &705507997 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3815596445066857224, guid: ff887d043bcc0b94a8782b218200d650,
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 3815596445066857224, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
   m_PrefabInstance: {fileID: 2120228937440095928}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
@@ -675,8 +672,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PanelSettings: {fileID: 11400000, guid: 45c1f1517231a0d4aaa851c5466f3bbf, type: 2}
   m_ParentUI: {fileID: 0}
-  sourceAsset: {fileID: 9197481963319205126, guid: 2a0aec8d6f95bf34ba66a7d0b5f1f158,
-    type: 3}
+  sourceAsset: {fileID: 9197481963319205126, guid: 2a0aec8d6f95bf34ba66a7d0b5f1f158, type: 3}
   m_SortingOrder: 0
 --- !u!4 &946305964
 Transform:
@@ -754,8 +750,7 @@ MonoBehaviour:
   m_text: Realm
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2}
-  m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad,
-    type: 2}
+  m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -875,7 +870,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1281082863
 MonoBehaviour:
@@ -893,25 +888,17 @@ MonoBehaviour:
   m_MoveRepeatDelay: 0.5
   m_MoveRepeatRate: 0.1
   m_XRTrackingOrigin: {fileID: 0}
-  m_ActionsAsset: {fileID: -944628639613478452, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_PointAction: {fileID: 8247508314672399740, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_PointAction: {fileID: 8247508314672399740, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
   m_MoveAction: {fileID: 0}
   m_SubmitAction: {fileID: 0}
   m_CancelAction: {fileID: 0}
-  m_LeftClickAction: {fileID: -872110275332013132, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_MiddleClickAction: {fileID: 7660870786041202592, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_RightClickAction: {fileID: -5657700683146742393, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_ScrollWheelAction: {fileID: 743484021006385890, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_TrackedDevicePositionAction: {fileID: 1315051935247086908, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
-  m_TrackedDeviceOrientationAction: {fileID: -2150570120027286643, guid: 6cec26357c7fb8f44b03ce452209387d,
-    type: 3}
+  m_LeftClickAction: {fileID: -872110275332013132, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_MiddleClickAction: {fileID: 7660870786041202592, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_RightClickAction: {fileID: -5657700683146742393, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_ScrollWheelAction: {fileID: 743484021006385890, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 1315051935247086908, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: -2150570120027286643, guid: 6cec26357c7fb8f44b03ce452209387d, type: 3}
   m_DeselectOnBackgroundClick: 1
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0
@@ -1383,7 +1370,7 @@ RectTransform:
   - {fileID: 2095941040}
   - {fileID: 1277831542}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1488,7 +1475,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1800558273}
   m_Layer: 0
-  m_Name: '---------------------- UI -----------------------'
+  m_Name: ---------------------- UI -----------------------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1668,7 +1655,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2042493840
 GameObject:
@@ -1731,8 +1718,7 @@ MonoBehaviour:
   m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2}
-  m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec,
-    type: 2}
+  m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1950,7 +1936,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2104274357}
   m_Layer: 0
-  m_Name: '---------------- Runtime Objects ----------------'
+  m_Name: ---------------- Runtime Objects ----------------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1969,8 +1955,80 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2134614890
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+      propertyPath: m_Name
+      value: ScenesUIRootCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+--- !u!114 &2134614891 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
+  m_PrefabInstance: {fileID: 2134614890}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &2120228937440095928
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1979,63 +2037,51 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 5319140435606112328, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 5319140435606112328, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_Name
       value: Directional Light
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0.92387956
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0.38268343
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 45
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650,
-        type: 3}
+    - target: {fileID: 8165004788851571507, guid: ff887d043bcc0b94a8782b218200d650, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
@@ -2052,103 +2098,79 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 6261767294566073009, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 6261767294566073009, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalScale.x
       value: 500
       objectReference: {fileID: 0}
-    - target: {fileID: 6261767294566073009, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 6261767294566073009, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalScale.z
       value: 500
       objectReference: {fileID: 0}
-    - target: {fileID: 6367988842618399763, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 6367988842618399763, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8849659727847101794, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8849659727847101794, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_Name
       value: Floor
       objectReference: {fileID: 0}
-    - target: {fileID: 8849659727847101794, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8849659727847101794, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalScale.x
       value: 500
       objectReference: {fileID: 0}
-    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalScale.z
       value: 500
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8887605237264433693, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d,
-        type: 3}
+    - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index d8610f1481..a8319fec97 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -26,6 +26,8 @@ public class DynamicSceneLoader : MonoBehaviour
         [Space]
         [SerializeField] private UIDocument uiToolkitRoot;
         [SerializeField] private UIDocument debugUiRoot;
+        [SerializeField] private UIDocument scenesUiRoot;
+        [SerializeField] private StyleSheet scenesUiStyleSheet;
 
         [Space]
         [SerializeField] private SkyBoxSceneData skyBoxSceneData;
@@ -86,8 +88,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer,
-                    identityCache, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUiRoot, scenesUiStyleSheet, identityCache, ct);
 
                 if (!isLoaded)
                 {

From 2cd929002919c0ebb846e927b12f926404430f68 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 12:33:48 +0100
Subject: [PATCH 30/54] Outline detection of the current scene

---
 .../ECS/SceneLifeCycle/IScenesCache.cs        | 47 ++++++++++++++++++
 .../ECS/SceneLifeCycle/IScenesCache.cs.meta   |  3 ++
 .../ECS/SceneLifeCycle/SceneLifeCycle.asmdef  |  3 +-
 .../Systems/ControlSceneUpdateLoopSystem.cs   |  7 ++-
 .../Systems/UnloadSceneSystem.cs              | 12 ++++-
 .../Systems/UpdateCurrentSceneSystem.cs       | 48 +++++++++++++++++++
 .../Systems/UpdateCurrentSceneSystem.cs.meta  |  3 ++
 .../ControlSceneUpdateLoopSystemShould.cs     |  2 +-
 .../Tests/UnloadSceneSystemShould.cs          |  2 +-
 .../Global/Dynamic/DynamicWorldContainer.cs   |  8 ++--
 .../Global/Dynamic/GlobalWorldFactory.cs      | 11 +++--
 .../Scripts/Global/Dynamic/RealmController.cs | 10 +++-
 .../EmptyScene/EmptySceneFacade.cs            |  5 ++
 .../Scripts/SceneRunner/Scene/ISceneFacade.cs |  2 +
 .../SceneRunner/Scene/ISceneStateProvider.cs  |  5 ++
 .../SceneRunner/Scene/SceneStateProvider.cs   |  5 ++
 .../Assets/Scripts/SceneRunner/SceneFacade.cs |  5 ++
 17 files changed, 164 insertions(+), 14 deletions(-)
 create mode 100644 Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs.meta
 create mode 100644 Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
 create mode 100644 Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs.meta

diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs
new file mode 100644
index 0000000000..d9db1f3051
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs
@@ -0,0 +1,47 @@
+using DCL.Optimization.Pools;
+using SceneRunner.Scene;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ECS.SceneLifeCycle
+{
+    public interface IScenesCache
+    {
+        IReadOnlyCollection<ISceneFacade> Scenes { get; }
+
+        void Add(ISceneFacade sceneFacade, IReadOnlyList<Vector2Int> parcels);
+
+        void Remove(IReadOnlyList<Vector2Int> parcels);
+
+        bool TryGetByParcel(Vector2Int parcel, out ISceneFacade sceneFacade);
+
+        void Clear();
+    }
+
+    public class ScenesCache : IScenesCache
+    {
+        private readonly Dictionary<Vector2Int, ISceneFacade> scenesByParcels = new (PoolConstants.SCENES_COUNT * 2);
+
+        public IReadOnlyCollection<ISceneFacade> Scenes => scenesByParcels.Values;
+
+        public void Add(ISceneFacade sceneFacade, IReadOnlyList<Vector2Int> parcels)
+        {
+            for (var i = 0; i < parcels.Count; i++)
+                scenesByParcels.Add(parcels[i], sceneFacade);
+        }
+
+        public void Remove(IReadOnlyList<Vector2Int> parcels)
+        {
+            for (var i = 0; i < parcels.Count; i++)
+                scenesByParcels.Remove(parcels[i]);
+        }
+
+        public bool TryGetByParcel(Vector2Int parcel, out ISceneFacade sceneFacade) =>
+            scenesByParcels.TryGetValue(parcel, out sceneFacade);
+
+        public void Clear()
+        {
+            scenesByParcels.Clear();
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs.meta b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs.meta
new file mode 100644
index 0000000000..83d67648f6
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/IScenesCache.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 373e870f736b44cc85b15b70174a4887
+timeCreated: 1704799216
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/SceneLifeCycle.asmdef b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/SceneLifeCycle.asmdef
index 4fabcd855d..0d6ede3faf 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/SceneLifeCycle.asmdef
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/SceneLifeCycle.asmdef
@@ -10,7 +10,8 @@
         "GUID:9e314663ce958b746873cb22d57ede55",
         "GUID:101b8b6ebaf64668909b49c4b7a1420d",
       "GUID:275e22790c04e9b47a5085d7b0c4432a",
-      "GUID:3640f3c0b42946b0b8794a1ed8e06ca5"
+      "GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
+      "GUID:286980af24684da6acc1caa413039811"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/ControlSceneUpdateLoopSystem.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/ControlSceneUpdateLoopSystem.cs
index 317f0fec0e..c48caf6bbf 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/ControlSceneUpdateLoopSystem.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/ControlSceneUpdateLoopSystem.cs
@@ -27,12 +27,16 @@ public partial class ControlSceneUpdateLoopSystem : BaseUnityLoopSystem
         private readonly IRealmPartitionSettings realmPartitionSettings;
         private readonly CancellationToken destroyCancellationToken;
 
+        private readonly IScenesCache scenesCache;
+
         internal ControlSceneUpdateLoopSystem(World world,
             IRealmPartitionSettings realmPartitionSettings,
-            CancellationToken destroyCancellationToken) : base(world)
+            CancellationToken destroyCancellationToken,
+            IScenesCache scenesCache) : base(world)
         {
             this.realmPartitionSettings = realmPartitionSettings;
             this.destroyCancellationToken = destroyCancellationToken;
+            this.scenesCache = scenesCache;
         }
 
         protected override void Update(float t)
@@ -69,6 +73,7 @@ async UniTaskVoid RunOnThreadPoolAsync()
                 RunOnThreadPoolAsync().Forget();
 
                 // So we know the scene has started
+                scenesCache.Add(scene, promise.LoadingIntention.DefinitionComponent.Parcels);
                 World.Add(entity, scene);
             }
         }
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UnloadSceneSystem.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UnloadSceneSystem.cs
index 5a7cce6676..880fed90dd 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UnloadSceneSystem.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UnloadSceneSystem.cs
@@ -6,6 +6,7 @@
 using ECS.Groups;
 using ECS.LifeCycle.Components;
 using ECS.SceneLifeCycle.Components;
+using ECS.SceneLifeCycle.SceneDefinition;
 using ECS.StreamableLoading.Common;
 using SceneRunner.Scene;
 
@@ -17,7 +18,12 @@ namespace ECS.SceneLifeCycle.Systems
     [UpdateInGroup(typeof(CleanUpGroup))]
     public partial class UnloadSceneSystem : BaseUnityLoopSystem
     {
-        internal UnloadSceneSystem(World world) : base(world) { }
+        private readonly IScenesCache scenesCache;
+
+        internal UnloadSceneSystem(World world, IScenesCache scenesCache) : base(world)
+        {
+            this.scenesCache = scenesCache;
+        }
 
         protected override void Update(float t)
         {
@@ -27,10 +33,12 @@ protected override void Update(float t)
 
         [Query]
         [All(typeof(DeleteEntityIntention))]
-        private void UnloadLoadedScene(in Entity entity, ref ISceneFacade sceneFacade)
+        private void UnloadLoadedScene(in Entity entity, ref SceneDefinitionComponent definitionComponent, ref ISceneFacade sceneFacade)
         {
             sceneFacade.DisposeAsync().Forget();
 
+            scenesCache.Remove(definitionComponent.Parcels);
+
             // Keep definition so it won't be downloaded again = Cache in ECS itself
             World.Remove<ISceneFacade, AssetPromise<ISceneFacade, GetSceneFacadeIntention>, DeleteEntityIntention>(entity);
         }
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
new file mode 100644
index 0000000000..61a89572ff
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
@@ -0,0 +1,48 @@
+using Arch.Core;
+using Arch.SystemGroups;
+using ECS.Abstract;
+using ECS.Unity.Transforms.Components;
+using SceneRunner.Scene;
+using UnityEngine;
+using Utility;
+
+namespace ECS.SceneLifeCycle.Systems
+{
+    /// <summary>
+    ///     Detects the scene the player is currently in
+    /// </summary>
+    [UpdateInGroup(typeof(RealmGroup))]
+    public partial class UpdateCurrentSceneSystem : BaseUnityLoopSystem
+    {
+        private readonly Entity playerEntity;
+        private readonly IScenesCache scenesCache;
+
+        private Vector2Int lastParcelProcessed = new (int.MinValue, int.MinValue);
+
+        internal UpdateCurrentSceneSystem(World world, IScenesCache scenesCache, Entity playerEntity) : base(world)
+        {
+            this.scenesCache = scenesCache;
+            this.playerEntity = playerEntity;
+        }
+
+        protected override void Update(float t)
+        {
+            Vector3 playerPos = World.Get<TransformComponent>(playerEntity).Transform.position;
+            Vector2Int parcel = ParcelMathHelper.FloorToParcel(playerPos);
+
+            if (lastParcelProcessed == parcel) return;
+
+            // Reset the previous current scene, it's ok if it's not cached (already)
+            if (scenesCache.TryGetByParcel(lastParcelProcessed, out ISceneFacade sceneFacade))
+                sceneFacade.SetIsCurrent(false);
+
+            if (scenesCache.TryGetByParcel(parcel, out sceneFacade))
+            {
+                sceneFacade.SetIsCurrent(true);
+                lastParcelProcessed = parcel;
+            }
+
+            // if scene was not in cache yet don't set lastParcelProcessed so the cache will be polled again
+        }
+    }
+}
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs.meta b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs.meta
new file mode 100644
index 0000000000..c0d7fc2959
--- /dev/null
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: df6a727b1b594382b2f9dacc5bc45004
+timeCreated: 1704799449
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
index 754c28911f..714c3c7e3f 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
@@ -23,7 +23,7 @@ public class ControlSceneUpdateLoopSystemShould : UnitySystemTestBase<ControlSce
         public void SetUp()
         {
             realmPartitionSettings = Substitute.For<IRealmPartitionSettings>();
-            system = new ControlSceneUpdateLoopSystem(world, realmPartitionSettings, CancellationToken.None);
+            system = new ControlSceneUpdateLoopSystem(world, realmPartitionSettings, CancellationToken.None, new ScenesCache());
         }
 
         [Test]
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
index bdb9581e45..eef3d71b38 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
@@ -15,7 +15,7 @@ public class UnloadSceneSystemShould : UnitySystemTestBase<UnloadSceneSystem>
         [SetUp]
         public void SetUp()
         {
-            system = new UnloadSceneSystem(world);
+            system = new UnloadSceneSystem(world, new ScenesCache());
         }
 
         [Test]
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs
index d7477ed8c9..39a47c9c06 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs
@@ -8,13 +8,13 @@
 using DCL.PluginSystem;
 using DCL.PluginSystem.Global;
 using DCL.SkyBox;
-using DCL.Web3Authentication;
 using DCL.Profiles;
 using DCL.Web3Authentication.Authenticators;
 using DCL.Web3Authentication.Identities;
 using DCL.WebRequests.Analytics;
 using ECS;
 using ECS.Prioritization.Components;
+using ECS.SceneLifeCycle;
 using MVC;
 using MVC.PopupsController.PopupCloser;
 using SceneRunner.EmptyScene;
@@ -105,16 +105,18 @@ public void Dispose()
 
             globalPlugins.AddRange(staticContainer.SharedPlugins);
 
+            IScenesCache scenesCache = new ScenesCache();
+
             container.RealmController = new RealmController(
                 staticContainer.WebRequestsContainer.WebRequestController,
                 parcelServiceContainer.TeleportController,
                 parcelServiceContainer.RetrieveSceneFromFixedRealm,
                 parcelServiceContainer.RetrieveSceneFromVolatileWorld,
-                sceneLoadRadius, staticLoadPositions, realmData);
+                sceneLoadRadius, staticLoadPositions, realmData, scenesCache);
 
             container.GlobalWorldFactory = new GlobalWorldFactory(in staticContainer, staticContainer.RealmPartitionSettings,
                 exposedGlobalDataContainer.CameraSamplingData, realmSamplingData, ASSET_BUNDLES_URL, realmData, globalPlugins,
-                debugBuilder);
+                debugBuilder, scenesCache);
 
             container.GlobalPlugins = globalPlugins;
             container.EmptyScenesWorldFactory = new EmptyScenesWorldFactory(staticContainer.SingletonSharedDependencies, staticContainer.ECSWorldPlugins);
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs b/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
index f4ff35b307..d326d29cc6 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
@@ -25,6 +25,7 @@
 using ECS.Prioritization;
 using ECS.Prioritization.Components;
 using ECS.Prioritization.Systems;
+using ECS.SceneLifeCycle;
 using ECS.SceneLifeCycle.Components;
 using ECS.SceneLifeCycle.IncreasingRadius;
 using ECS.SceneLifeCycle.SceneDefinition;
@@ -70,12 +71,13 @@ public class GlobalWorldFactory
         private readonly IDebugContainerBuilder debugContainerBuilder;
         private readonly IConcurrentBudgetProvider memoryBudgetProvider;
         private readonly StaticSettings staticSettings;
+        private readonly IScenesCache scenesCache;
 
         public GlobalWorldFactory(in StaticContainer staticContainer,
             IRealmPartitionSettings realmPartitionSettings,
             CameraSamplingData cameraSamplingData, RealmSamplingData realmSamplingData,
             URLDomain assetBundlesURL, IRealmData realmData, IReadOnlyList<IDCLGlobalPlugin> globalPlugins,
-            IDebugContainerBuilder debugContainerBuilder)
+            IDebugContainerBuilder debugContainerBuilder, IScenesCache scenesCache)
         {
             partitionedWorldsAggregateFactory = staticContainer.SingletonSharedDependencies.AggregateFactory;
             componentPoolsRegistry = staticContainer.ComponentsContainer.ComponentPoolsRegistry;
@@ -89,6 +91,7 @@ public GlobalWorldFactory(in StaticContainer staticContainer,
             this.globalPlugins = globalPlugins;
             this.debugContainerBuilder = debugContainerBuilder;
             this.realmData = realmData;
+            this.scenesCache = scenesCache;
 
             memoryBudgetProvider = staticContainer.SingletonSharedDependencies.MemoryBudgetProvider;
             physicsTickProvider = staticContainer.PhysicsTickProvider;
@@ -147,8 +150,8 @@ public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory e
             CreateEmptyPointersInFixedRealmSystem.InjectToWorld(ref builder, jobsMathHelper, realmPartitionSettings);
 
             ResolveStaticPointersSystem.InjectToWorld(ref builder);
-            UnloadSceneSystem.InjectToWorld(ref builder);
-            ControlSceneUpdateLoopSystem.InjectToWorld(ref builder, realmPartitionSettings, destroyCancellationSource.Token);
+            UnloadSceneSystem.InjectToWorld(ref builder, scenesCache);
+            ControlSceneUpdateLoopSystem.InjectToWorld(ref builder, realmPartitionSettings, destroyCancellationSource.Token, scenesCache);
 
             IComponentPool<PartitionComponent> partitionComponentPool = componentPoolsRegistry.GetReferenceTypePool<PartitionComponent>();
             PartitionSceneEntitiesSystem.InjectToWorld(ref builder, partitionComponentPool, partitionSettings, cameraSamplingData);
@@ -164,6 +167,8 @@ public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory e
 
             OwnAvatarLoaderFromDebugMenuSystem.InjectToWorld(ref builder, playerEntity, debugContainerBuilder, realmData);
 
+            UpdateCurrentSceneSystem.InjectToWorld(ref builder, scenesCache, playerEntity);
+
             var pluginArgs = new GlobalPluginArguments(playerEntity);
 
             foreach (IDCLGlobalPlugin plugin in globalPlugins)
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/RealmController.cs b/Explorer/Assets/Scripts/Global/Dynamic/RealmController.cs
index 0f34b2e279..99a8fd79cc 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/RealmController.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/RealmController.cs
@@ -6,6 +6,7 @@
 using DCL.ParcelsService;
 using DCL.WebRequests;
 using ECS;
+using ECS.SceneLifeCycle;
 using ECS.SceneLifeCycle.Components;
 using ECS.SceneLifeCycle.SceneDefinition;
 using Ipfs;
@@ -38,10 +39,11 @@ public class RealmController : IRealmController
         private readonly RetrieveSceneFromFixedRealm retrieveSceneFromFixedRealm;
         private readonly RetrieveSceneFromVolatileWorld retrieveSceneFromVolatileWorld;
         private readonly TeleportController teleportController;
+        private readonly IScenesCache scenesCache;
         private GlobalWorld globalWorld;
 
         public RealmController(IWebRequestController webRequestController, TeleportController teleportController, RetrieveSceneFromFixedRealm retrieveSceneFromFixedRealm, RetrieveSceneFromVolatileWorld retrieveSceneFromVolatileWorld, int sceneLoadRadius,
-            IReadOnlyList<int2> staticLoadPositions, RealmData realmData)
+            IReadOnlyList<int2> staticLoadPositions, RealmData realmData, IScenesCache scenesCache)
         {
             this.webRequestController = webRequestController;
             this.sceneLoadRadius = sceneLoadRadius;
@@ -50,6 +52,7 @@ public RealmController(IWebRequestController webRequestController, TeleportContr
             this.teleportController = teleportController;
             this.retrieveSceneFromFixedRealm = retrieveSceneFromFixedRealm;
             this.retrieveSceneFromVolatileWorld = retrieveSceneFromVolatileWorld;
+            this.scenesCache = scenesCache;
         }
 
         public void SetupWorld(GlobalWorld globalWorld)
@@ -142,8 +145,11 @@ public async UniTask DisposeGlobalWorldAsync()
 
         private void FindLoadedScenes(World world)
         {
-            // Dispose all scenes
             allScenes.Clear();
+            allScenes.AddRange(scenesCache.Scenes);
+
+            // Dispose all scenes
+            scenesCache.Clear();
 
             // find all loaded scenes
             world.Query(in SCENES, (ref ISceneFacade scene) => allScenes.Add(scene));
diff --git a/Explorer/Assets/Scripts/SceneRunner/EmptyScene/EmptySceneFacade.cs b/Explorer/Assets/Scripts/SceneRunner/EmptyScene/EmptySceneFacade.cs
index b904b5544c..6b8ab1c913 100644
--- a/Explorer/Assets/Scripts/SceneRunner/EmptyScene/EmptySceneFacade.cs
+++ b/Explorer/Assets/Scripts/SceneRunner/EmptyScene/EmptySceneFacade.cs
@@ -101,6 +101,11 @@ public void SetTargetFPS(int fps)
             // has no effect
         }
 
+        public void SetIsCurrent(bool isCurrent)
+        {
+            // has no effect
+        }
+
         UniTask ISceneFacade.StartScene() =>
 
             // Should be never called as it corresponds to JS logic
diff --git a/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneFacade.cs b/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneFacade.cs
index 3d148c9631..59b043e0b2 100644
--- a/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneFacade.cs
+++ b/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneFacade.cs
@@ -17,6 +17,8 @@ public interface ISceneFacade : IUniTaskAsyncDisposable
         /// <param name="fps">Target FPS</param>
         void SetTargetFPS(int fps);
 
+        void SetIsCurrent(bool isCurrent);
+
         internal UniTask StartScene();
 
         internal UniTask Tick(float dt);
diff --git a/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneStateProvider.cs b/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneStateProvider.cs
index 023582769c..f0ecd4e7cc 100644
--- a/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneStateProvider.cs
+++ b/Explorer/Assets/Scripts/SceneRunner/Scene/ISceneStateProvider.cs
@@ -2,6 +2,11 @@ namespace SceneRunner.Scene
 {
     public interface ISceneStateProvider
     {
+        /// <summary>
+        ///     Is this scene the player's currently on?
+        /// </summary>
+        bool IsCurrent { get; set; }
+
         SceneState State { get; set; }
 
         uint TickNumber { get; set; }
diff --git a/Explorer/Assets/Scripts/SceneRunner/Scene/SceneStateProvider.cs b/Explorer/Assets/Scripts/SceneRunner/Scene/SceneStateProvider.cs
index 2c67751e47..a850896713 100644
--- a/Explorer/Assets/Scripts/SceneRunner/Scene/SceneStateProvider.cs
+++ b/Explorer/Assets/Scripts/SceneRunner/Scene/SceneStateProvider.cs
@@ -4,6 +4,11 @@ public class SceneStateProvider : ISceneStateProvider
     {
         private SceneEngineStartInfo engineStartInfo;
 
+        /// <summary>
+        ///     <inheritdoc cref="ISceneStateProvider.IsCurrent" />
+        /// </summary>
+        public bool IsCurrent { get; set; }
+
         public SceneState State { get; set; } = SceneState.NotStarted;
 
         public uint TickNumber { get; set; }
diff --git a/Explorer/Assets/Scripts/SceneRunner/SceneFacade.cs b/Explorer/Assets/Scripts/SceneRunner/SceneFacade.cs
index 1237fa24ad..1dbf7dde96 100644
--- a/Explorer/Assets/Scripts/SceneRunner/SceneFacade.cs
+++ b/Explorer/Assets/Scripts/SceneRunner/SceneFacade.cs
@@ -184,6 +184,11 @@ private static void AssertIsNotMainThread(string funcName)
                 throw new ThreadStateException($"Execution after calling {funcName} must be off the main thread");
         }
 
+        public void SetIsCurrent(bool isCurrent)
+        {
+            sceneStateProvider.IsCurrent = isCurrent;
+        }
+
         public async UniTask DisposeAsync()
         {
             // Because of multithreading Disposing is not synced with the update loop

From 364be7be6f82b258e58555fc7dbbbf5d325a2c5f Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 17:00:55 +0100
Subject: [PATCH 31/54] Fix tests

---
 .../SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs  | 2 +-
 .../Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
index 714c3c7e3f..7d7d92d547 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/ControlSceneUpdateLoopSystemShould.cs
@@ -23,7 +23,7 @@ public class ControlSceneUpdateLoopSystemShould : UnitySystemTestBase<ControlSce
         public void SetUp()
         {
             realmPartitionSettings = Substitute.For<IRealmPartitionSettings>();
-            system = new ControlSceneUpdateLoopSystem(world, realmPartitionSettings, CancellationToken.None, new ScenesCache());
+            system = new ControlSceneUpdateLoopSystem(world, realmPartitionSettings, CancellationToken.None, Substitute.For<IScenesCache>());
         }
 
         [Test]
diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
index eef3d71b38..97106af6dd 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/UnloadSceneSystemShould.cs
@@ -15,7 +15,7 @@ public class UnloadSceneSystemShould : UnitySystemTestBase<UnloadSceneSystem>
         [SetUp]
         public void SetUp()
         {
-            system = new UnloadSceneSystem(world, new ScenesCache());
+            system = new UnloadSceneSystem(world, Substitute.For<IScenesCache>());
         }
 
         [Test]

From e9e039164a878c2b7847f03cab86f3997097c80a Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 17:06:16 +0100
Subject: [PATCH 32/54] Hide scene UI when we're out of the scene

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  4 ++--
 .../DCL/SDKComponents/SceneUI/SceneUI.asmdef  |  3 ++-
 .../UIText/UITextInstantiationSystem.cs       |  2 +-
 .../UITransform/UITransformUpdateSystem.cs    | 21 ++++++++++++++++++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 18b8868fac..51af02d842 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -45,9 +45,9 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITransformParentingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
             UITransformSortingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
-            UITransformUpdateSystem.InjectToWorld(ref builder);
+            UITransformUpdateSystem.InjectToWorld(ref builder, sharedDependencies.SceneStateProvider);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
-            UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
+            UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry, sharedDependencies.SceneStateProvider);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
 
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<VisualElement, UITransformComponent>.InjectToWorld(ref builder, componentPoolsRegistry));
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
index 09b67c5d1c..6c05cc4ff0 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/SceneUI.asmdef
@@ -17,7 +17,8 @@
         "GUID:56e8195b069a4dca9c4c4f313c65f526",
         "GUID:393a5d2fbaa249d09c260018aaeb4fc0",
         "GUID:166b65e6dfc848bb9fb075f53c293a38",
-        "GUID:101b8b6ebaf64668909b49c4b7a1420d"
+        "GUID:101b8b6ebaf64668909b49c4b7a1420d",
+        "GUID:286980af24684da6acc1caa413039811"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
index 6c5e54f4dd..9255e101f4 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
@@ -19,7 +19,7 @@ public partial class UITextInstantiationSystem : BaseUnityLoopSystem
     {
         private readonly IComponentPool<Label> labelsPool;
 
-        private UITextInstantiationSystem(World world,IComponentPoolsRegistry poolsRegistry) : base(world)
+        private UITextInstantiationSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
         }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
index 9cc80dde6b..595e0ae34a 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
@@ -8,6 +8,8 @@
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.Abstract;
 using ECS.Groups;
+using SceneRunner.Scene;
+using UnityEngine.UIElements;
 
 namespace DCL.SDKComponents.SceneUI.Systems.UITransform
 {
@@ -17,11 +19,17 @@ namespace DCL.SDKComponents.SceneUI.Systems.UITransform
     [ThrottlingEnabled]
     public partial class UITransformUpdateSystem : BaseUnityLoopSystem
     {
-        private UITransformUpdateSystem(World world) : base(world) { }
+        private readonly ISceneStateProvider sceneStateProvider;
+
+        private UITransformUpdateSystem(World world, ISceneStateProvider sceneStateProvider) : base(world)
+        {
+            this.sceneStateProvider = sceneStateProvider;
+        }
 
         protected override void Update(float _)
         {
             UpdateUITransformQuery(World);
+            CheckUITransformOutOfSceneQuery(World);
         }
 
         [Query]
@@ -34,5 +42,16 @@ private void UpdateUITransform(ref PBUiTransform sdkModel, ref UITransformCompon
             UiElementUtils.SetupVisualElement(ref uiTransformComponent.Transform, ref sdkModel);
             sdkModel.IsDirty = false;
         }
+
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent))]
+        private void CheckUITransformOutOfScene(ref UITransformComponent uiTransformComponent)
+        {
+            if ((sceneStateProvider.IsCurrent && uiTransformComponent.Transform.style.display == DisplayStyle.Flex) ||
+                (!sceneStateProvider.IsCurrent && uiTransformComponent.Transform.style.display == DisplayStyle.None))
+                return;
+
+            uiTransformComponent.Transform.style.display = !sceneStateProvider.IsCurrent ? DisplayStyle.None : DisplayStyle.Flex;
+        }
     }
 }

From 23b470d3556245d47c8544fae22454a0aa8aef16 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 17:09:35 +0100
Subject: [PATCH 33/54] Hide scene UI when we're out of the scene (II)

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 51af02d842..51e33190ec 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -47,7 +47,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
             UITransformSortingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
             UITransformUpdateSystem.InjectToWorld(ref builder, sharedDependencies.SceneStateProvider);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
-            UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry, sharedDependencies.SceneStateProvider);
+            UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
 
             finalizeWorldSystems.Add(ReleasePoolableComponentSystem<VisualElement, UITransformComponent>.InjectToWorld(ref builder, componentPoolsRegistry));

From ad24a39947706717e1b0c4399ca9a92765af6610 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Tue, 9 Jan 2024 18:43:21 +0100
Subject: [PATCH 34/54] Hide scene UI when we're out of the scene (III)

---
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   |  2 +-
 .../Components/UITransformComponent.cs        |  1 +
 .../UITransformInstantiationSystem.cs         |  1 +
 .../UITransform/UITransformUpdateSystem.cs    | 21 +++++++++++++++----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 51e33190ec..8c0c468a64 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -45,7 +45,7 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
             UITransformParentingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
             UITransformSortingSystem.InjectToWorld(ref builder, sharedDependencies.EntitiesMap, persistentEntities.SceneRoot);
-            UITransformUpdateSystem.InjectToWorld(ref builder, sharedDependencies.SceneStateProvider);
+            UITransformUpdateSystem.InjectToWorld(ref builder, canvas, sharedDependencies.SceneStateProvider);
             UITransformReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextInstantiationSystem.InjectToWorld(ref builder, componentPoolsRegistry);
             UITextReleaseSystem.InjectToWorld(ref builder, componentPoolsRegistry);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
index ed9df288f2..7a6cf8cd02 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
@@ -13,6 +13,7 @@ public struct UITransformComponent : IPoolableComponentProvider<VisualElement>
         public EntityReference Parent;
         public int RightOf;
         public HashSet<EntityReference> Children;
+        public bool IsHidden;
 
         VisualElement IPoolableComponentProvider<VisualElement>.PoolableComponent => Transform;
         Type IPoolableComponentProvider<VisualElement>.PoolableComponentType => typeof(VisualElement);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
index 31decd5196..96aa1944cc 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
@@ -44,6 +44,7 @@ private void InstantiateUITransform(in Entity entity)
             transformComponent.Transform = newTransform;
             transformComponent.Parent = EntityReference.Null;
             transformComponent.Children = HashSetPool<EntityReference>.Get();
+            transformComponent.IsHidden = false;
             World.Add(entity, transformComponent);
         }
     }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
index 595e0ae34a..d54891b024 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
@@ -19,10 +19,12 @@ namespace DCL.SDKComponents.SceneUI.Systems.UITransform
     [ThrottlingEnabled]
     public partial class UITransformUpdateSystem : BaseUnityLoopSystem
     {
+        private readonly UIDocument canvas;
         private readonly ISceneStateProvider sceneStateProvider;
 
-        private UITransformUpdateSystem(World world, ISceneStateProvider sceneStateProvider) : base(world)
+        private UITransformUpdateSystem(World world, UIDocument canvas, ISceneStateProvider sceneStateProvider) : base(world)
         {
+            this.canvas = canvas;
             this.sceneStateProvider = sceneStateProvider;
         }
 
@@ -47,11 +49,22 @@ private void UpdateUITransform(ref PBUiTransform sdkModel, ref UITransformCompon
         [All(typeof(PBUiTransform), typeof(UITransformComponent))]
         private void CheckUITransformOutOfScene(ref UITransformComponent uiTransformComponent)
         {
-            if ((sceneStateProvider.IsCurrent && uiTransformComponent.Transform.style.display == DisplayStyle.Flex) ||
-                (!sceneStateProvider.IsCurrent && uiTransformComponent.Transform.style.display == DisplayStyle.None))
+            // Ignore all the child transforms
+            if (uiTransformComponent.Parent != EntityReference.Null)
                 return;
 
-            uiTransformComponent.Transform.style.display = !sceneStateProvider.IsCurrent ? DisplayStyle.None : DisplayStyle.Flex;
+            // Depending on the scene state, we add or remove the root transform from the canvas
+            switch (sceneStateProvider.IsCurrent)
+            {
+                case false when !uiTransformComponent.IsHidden:
+                    canvas.rootVisualElement.Remove(uiTransformComponent.Transform);
+                    uiTransformComponent.IsHidden = true;
+                    break;
+                case true when uiTransformComponent.IsHidden:
+                    canvas.rootVisualElement.Add(uiTransformComponent.Transform);
+                    uiTransformComponent.IsHidden = false;
+                    break;
+            }
         }
     }
 }

From 58fcebc92e534c5a28e262e2dbb9fb5bbef7992e Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 10 Jan 2024 13:29:37 +0100
Subject: [PATCH 35/54] UIText test coverage

---
 .../UIText/UITextInstantiationSystem.cs       |  2 +-
 .../DCL/SDKComponents/SceneUI/Tests.meta      |  3 +
 .../SceneUI/Tests/UIText.Tests.asmdef         | 34 ++++++++
 .../SceneUI/Tests/UIText.Tests.asmdef.meta}   |  5 +-
 .../Tests/UITextInstantiationSystemShould.cs  | 83 +++++++++++++++++++
 .../UITextInstantiationSystemShould.cs.meta   |  3 +
 .../ECS/TestSuite/ECS.TestSuite.asmdef        |  4 +-
 .../ECS/TestSuite/UnitySystemTestBase.cs      | 13 +++
 8 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef
 rename Explorer/Assets/{AddressableAssetsData/ProfileDataSourceSettings.asset.meta => DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta} (54%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs.meta

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
index 9255e101f4..49b536b096 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextInstantiationSystem.cs
@@ -19,7 +19,7 @@ public partial class UITextInstantiationSystem : BaseUnityLoopSystem
     {
         private readonly IComponentPool<Label> labelsPool;
 
-        private UITextInstantiationSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
+        public UITextInstantiationSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             labelsPool = poolsRegistry.GetReferenceTypePool<Label>();
         }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests.meta
new file mode 100644
index 0000000000..73ce173a8c
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4701b45241af4c4a92592b07c9d6cc30
+timeCreated: 1704882575
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef
new file mode 100644
index 0000000000..1e628eee57
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef
@@ -0,0 +1,34 @@
+{
+    "name": "UIText.Tests",
+    "rootNamespace": "",
+    "references": [
+        "GUID:27619889b8ba8c24980f49ee34dbb44a",
+        "GUID:0acc523941302664db1f4e527237feb3",
+        "GUID:a3c61f15599a43ae9de508c9c4dd5530",
+        "GUID:7f6c11dd1400cef4f838168f18ce244a",
+        "GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
+        "GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
+        "GUID:4794e238ed0f65142a4aea5848b513e5",
+        "GUID:3c7b57a14671040bd8c549056adc04f5",
+        "GUID:275e22790c04e9b47a5085d7b0c4432a"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll",
+        "NSubstitute.dll",
+        "Arch.dll",
+        "Arch.System.dll",
+        "Google.Protobuf.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta
similarity index 54%
rename from Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta
index 761988bff9..b4ec683d8d 100644
--- a/Explorer/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta
@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: ebe2a662356314f05b03623e66ea7c24
-NativeFormatImporter:
+guid: a42b7a5887546eb46aa7b5eff67d27b8
+AssemblyDefinitionImporter:
   externalObjects: {}
-  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
new file mode 100644
index 0000000000..33dbccb39e
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
@@ -0,0 +1,83 @@
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Defaults;
+using DCL.SDKComponents.SceneUI.Systems.UIText;
+using Decentraland.Common;
+using ECS.TestSuite;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using UnityEngine.UIElements;
+using Entity = Arch.Core.Entity;
+
+namespace DCL.SDKComponents.SceneUI.Tests
+{
+    public class UITextInstantiationSystemShould : UnitySystemTestBase<UITextInstantiationSystem>
+    {
+        private IComponentPoolsRegistry poolsRegistry;
+        private Entity entity;
+        private UITransformComponent uiTransformComponent;
+
+        [SetUp]
+        public void SetUp()
+        {
+            poolsRegistry = new ComponentPoolsRegistry(
+                new Dictionary<Type, IComponentPool>
+                {
+                    { typeof(Label), new ComponentPool<Label>() },
+                }, null);
+
+            system = new UITextInstantiationSystem(world, poolsRegistry);
+
+            entity = world.Create();
+            uiTransformComponent = AddUITransformToEntity(entity);
+        }
+
+        [Test]
+        public void InstantiateUIText()
+        {
+            //Arrange
+            var input = new PBUiText();
+
+            //Act
+            world.Add(entity, input);
+            system.Update(0);
+
+            //Assert
+            ref UITextComponent uiTextComponent = ref world.Get<UITextComponent>(entity);
+            Assert.IsNotNull(uiTextComponent.Label);
+            Assert.AreEqual($"UIText (Entity {entity.Id})", uiTextComponent.Label.name);
+            Assert.AreEqual(PickingMode.Ignore, uiTextComponent.Label.pickingMode);
+            Assert.IsTrue(uiTransformComponent.Transform.Contains(uiTextComponent.Label));
+        }
+
+        [Test]
+        public void UpdateUIText()
+        {
+            //Arrange
+            var input = new PBUiText();
+            world.Add(entity, input);
+            system.Update(0);
+            const int NUMBER_OF_UPDATES = 3;
+
+            for (var i = 0; i < NUMBER_OF_UPDATES; i++)
+            {
+                //Act
+                input.Value = $"Test text {i}";
+                input.Color = new Color4 { R = i, G = 1, B = 1, A = 1 };
+                input.FontSize = i + 1;
+                input.TextAlign = (TextAlignMode) i;
+                input.IsDirty = true;
+                system.Update(0);
+
+                //Assert
+                ref UITextComponent uiTextComponent = ref world.Get<UITextComponent>(entity);
+                Assert.AreEqual(input.Value, uiTextComponent.Label.text);
+                Assert.IsTrue(input.GetColor() == uiTextComponent.Label.style.color);
+                Assert.IsTrue(input.GetFontSize() == uiTextComponent.Label.style.fontSize);
+                Assert.IsTrue(input.GetTextAlign() == uiTextComponent.Label.style.unityTextAlign);
+            }
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs.meta
new file mode 100644
index 0000000000..9ebaae2abf
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b090959b7a6544ac9fe1755923757954
+timeCreated: 1704883186
\ No newline at end of file
diff --git a/Explorer/Assets/Scripts/ECS/TestSuite/ECS.TestSuite.asmdef b/Explorer/Assets/Scripts/ECS/TestSuite/ECS.TestSuite.asmdef
index b5449aab95..f48a852949 100644
--- a/Explorer/Assets/Scripts/ECS/TestSuite/ECS.TestSuite.asmdef
+++ b/Explorer/Assets/Scripts/ECS/TestSuite/ECS.TestSuite.asmdef
@@ -15,7 +15,9 @@
     "GUID:007bff6000804d90ac597452fb69a4ee",
     "GUID:275e22790c04e9b47a5085d7b0c4432a",
     "GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
-    "GUID:5ab29fa8ae5769b49ab29e390caca7a4"
+    "GUID:5ab29fa8ae5769b49ab29e390caca7a4",
+    "GUID:7f6c11dd1400cef4f838168f18ce244a",
+    "GUID:3c7b57a14671040bd8c549056adc04f5"
   ],
   "includePlatforms": [
     "Editor"
diff --git a/Explorer/Assets/Scripts/ECS/TestSuite/UnitySystemTestBase.cs b/Explorer/Assets/Scripts/ECS/TestSuite/UnitySystemTestBase.cs
index 957153519d..2eb9516821 100644
--- a/Explorer/Assets/Scripts/ECS/TestSuite/UnitySystemTestBase.cs
+++ b/Explorer/Assets/Scripts/ECS/TestSuite/UnitySystemTestBase.cs
@@ -1,9 +1,12 @@
 using Arch.Core;
 using CrdtEcsBridge.Components.Transform;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
 using ECS.Abstract;
 using ECS.Unity.Transforms.Components;
 using NUnit.Framework;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace ECS.TestSuite
 {
@@ -39,5 +42,15 @@ protected TransformComponent AddTransformToEntity(in Entity entity, bool isDirty
             world.Add(entity, transformComponent, new SDKTransform { IsDirty = isDirty, Position = Vector3.zero, Rotation = Quaternion.identity, Scale = Vector3.one });
             return transformComponent;
         }
+
+        protected UITransformComponent AddUITransformToEntity(in Entity entity, bool isDirty = false)
+        {
+            var uiTransformComponent = new UITransformComponent();
+            uiTransformComponent.Transform = new VisualElement();
+            uiTransformComponent.Transform.name = $"{entity.Id}";
+
+            world.Add(entity, uiTransformComponent, new PBUiTransform { IsDirty = isDirty });
+            return uiTransformComponent;
+        }
     }
 }

From a1604f1acdfd3f8259ac303bfa64ff184332c110 Mon Sep 17 00:00:00 2001
From: Mikhail Agapov <mikhail.agapov@decentraland.org>
Date: Wed, 10 Jan 2024 15:39:44 +0300
Subject: [PATCH 36/54] Reset processed parcel on realm invalidation

---
 .../Systems/UpdateCurrentSceneSystem.cs        | 18 ++++++++++++++++--
 .../Global/Dynamic/GlobalWorldFactory.cs       |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
index 61a89572ff..92922a0f74 100644
--- a/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
+++ b/Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/UpdateCurrentSceneSystem.cs
@@ -15,18 +15,32 @@ namespace ECS.SceneLifeCycle.Systems
     public partial class UpdateCurrentSceneSystem : BaseUnityLoopSystem
     {
         private readonly Entity playerEntity;
+        private readonly IRealmData realmData;
         private readonly IScenesCache scenesCache;
 
-        private Vector2Int lastParcelProcessed = new (int.MinValue, int.MinValue);
+        private Vector2Int lastParcelProcessed;
 
-        internal UpdateCurrentSceneSystem(World world, IScenesCache scenesCache, Entity playerEntity) : base(world)
+        internal UpdateCurrentSceneSystem(World world, IRealmData realmData, IScenesCache scenesCache, Entity playerEntity) : base(world)
         {
+            this.realmData = realmData;
             this.scenesCache = scenesCache;
             this.playerEntity = playerEntity;
+            ResetProcessedParcel();
+        }
+
+        private void ResetProcessedParcel()
+        {
+            lastParcelProcessed = new Vector2Int(int.MinValue, int.MinValue);
         }
 
         protected override void Update(float t)
         {
+            if (!realmData.Configured)
+            {
+                ResetProcessedParcel();
+                return;
+            }
+
             Vector3 playerPos = World.Get<TransformComponent>(playerEntity).Transform.position;
             Vector2Int parcel = ParcelMathHelper.FloorToParcel(playerPos);
 
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs b/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
index 90fe08ecff..56a56001eb 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/GlobalWorldFactory.cs
@@ -167,7 +167,7 @@ public GlobalWorld Create(ISceneFactory sceneFactory, IEmptyScenesWorldFactory e
 
             OwnAvatarLoaderFromDebugMenuSystem.InjectToWorld(ref builder, playerEntity, debugContainerBuilder, realmData);
 
-            UpdateCurrentSceneSystem.InjectToWorld(ref builder, scenesCache, playerEntity);
+            UpdateCurrentSceneSystem.InjectToWorld(ref builder, realmData, scenesCache, playerEntity);
 
             var pluginArgs = new GlobalPluginArguments(playerEntity);
 

From 4227475e5c5c1a6084eb0d9dfe25d9a44c604fc8 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 10 Jan 2024 14:51:53 +0100
Subject: [PATCH 37/54] UITransformInstantiation test coverage

---
 .../UITransformInstantiationSystem.cs         |  2 +-
 ...Text.Tests.asmdef => SceneUI.Tests.asmdef} | 10 ++-
 ....asmdef.meta => SceneUI.Tests.asmdef.meta} |  2 +-
 .../Tests/UITextInstantiationSystemShould.cs  |  1 -
 .../UITransformInstantiationSystemShould.cs   | 65 +++++++++++++++++++
 ...TransformInstantiationSystemShould.cs.meta |  3 +
 6 files changed, 78 insertions(+), 5 deletions(-)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/{UIText.Tests.asmdef => SceneUI.Tests.asmdef} (71%)
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/{UIText.Tests.asmdef.meta => SceneUI.Tests.asmdef.meta} (76%)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs.meta

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
index 96aa1944cc..4beb603f62 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformInstantiationSystem.cs
@@ -21,7 +21,7 @@ public partial class UITransformInstantiationSystem : BaseUnityLoopSystem
         private readonly UIDocument canvas;
         private readonly IComponentPool<VisualElement> transformsPool;
 
-        private UITransformInstantiationSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
+        public UITransformInstantiationSystem(World world, UIDocument canvas, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
             this.canvas = canvas;
             transformsPool = poolsRegistry.GetReferenceTypePool<VisualElement>();
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
similarity index 71%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
index 1e628eee57..893d51255c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "UIText.Tests",
+    "name": "SceneUI.Tests",
     "rootNamespace": "",
     "references": [
         "GUID:27619889b8ba8c24980f49ee34dbb44a",
@@ -10,7 +10,13 @@
         "GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
         "GUID:4794e238ed0f65142a4aea5848b513e5",
         "GUID:3c7b57a14671040bd8c549056adc04f5",
-        "GUID:275e22790c04e9b47a5085d7b0c4432a"
+        "GUID:275e22790c04e9b47a5085d7b0c4432a",
+        "GUID:fc4fd35fb877e904d8cedee73b2256f6",
+        "GUID:7213a1d35667f9b40be6aca8cbfcee23",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23",
+        "GUID:593a5b492d29ac6448b1ebf7f035ef33",
+        "GUID:9e24947de15b9834991c9d8411ea37cf",
+        "GUID:84651a3751eca9349aac36a66bba901b"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta
similarity index 76%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta
index b4ec683d8d..be16b56e38 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UIText.Tests.asmdef.meta
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a42b7a5887546eb46aa7b5eff67d27b8
+guid: b38e70d374555cf40836e82d5b646743
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
index 33dbccb39e..3c464a64de 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
@@ -29,7 +29,6 @@ public void SetUp()
                 }, null);
 
             system = new UITextInstantiationSystem(world, poolsRegistry);
-
             entity = world.Create();
             uiTransformComponent = AddUITransformToEntity(entity);
         }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
new file mode 100644
index 0000000000..a982fda9dc
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
@@ -0,0 +1,65 @@
+using Arch.Core;
+using Cysharp.Threading.Tasks;
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Systems.UITransform;
+using ECS.TestSuite;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEngine.AddressableAssets;
+using Object = UnityEngine.Object;
+
+namespace DCL.SDKComponents.SceneUI.Tests
+{
+    public class UITransformInstantiationSystemShould : UnitySystemTestBase<UITransformInstantiationSystem>
+    {
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+
+        private IComponentPoolsRegistry poolsRegistry;
+        private Entity entity;
+        private UIDocument canvas;
+
+        [SetUp]
+        public async void SetUp()
+        {
+            canvas = Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+
+            poolsRegistry = new ComponentPoolsRegistry(
+                new Dictionary<Type, IComponentPool>
+                {
+                    { typeof(VisualElement), new ComponentPool<VisualElement>() },
+                }, null);
+
+            system = new UITransformInstantiationSystem(world, canvas, poolsRegistry);
+            entity = world.Create();
+        }
+
+        [Test]
+        public async Task InstantiateUITransform()
+        {
+            // For some reason SetUp is not awaited, probably a Unity's bug
+            await UniTask.WaitUntil(() => system != null && entity != null);
+
+            //Arrange
+            var input = new PBUiTransform();
+
+            //Act
+            world.Add(entity, input);
+            system.Update(0);
+
+            //Assert
+            UITransformComponent uiTransformComponent = world.Get<UITransformComponent>(entity);
+            Assert.IsNotNull(uiTransformComponent.Transform);
+            Assert.AreEqual($"UITransform (Entity {entity.Id})", uiTransformComponent.Transform.name);
+            Assert.IsTrue(canvas.rootVisualElement.Contains(uiTransformComponent.Transform));
+            Assert.AreEqual(EntityReference.Null, uiTransformComponent.Parent);
+            Assert.AreEqual(0, uiTransformComponent.Children.Count);
+            Assert.IsFalse(uiTransformComponent.IsHidden);
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs.meta
new file mode 100644
index 0000000000..f7d14ef98b
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1dec83c1747d4013afa4a9c4941b3139
+timeCreated: 1704890042
\ No newline at end of file

From 0b7bc8d56b44fc56573dae38e4a8209e03b77d74 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Wed, 10 Jan 2024 18:14:22 +0100
Subject: [PATCH 38/54] UITransformUpdate test coverage

---
 .../UITransform/UITransformUpdateSystem.cs    |  2 +-
 .../SceneUI/Tests/SceneUI.Tests.asmdef        |  4 +-
 .../Tests/UITextInstantiationSystemShould.cs  | 12 ++--
 .../UITransformInstantiationSystemShould.cs   | 39 ++---------
 .../Tests/UITransformSystemTestBase.cs        | 55 +++++++++++++++
 .../Tests/UITransformSystemTestBase.cs.meta   |  3 +
 .../Tests/UITransformUpdateSystemShould.cs    | 67 +++++++++++++++++++
 .../UITransformUpdateSystemShould.cs.meta     |  3 +
 .../SceneUI/Utils/UiElementUtils.cs           |  2 +-
 9 files changed, 145 insertions(+), 42 deletions(-)
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs.meta
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs.meta

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
index d54891b024..c5797f0b1f 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
@@ -22,7 +22,7 @@ public partial class UITransformUpdateSystem : BaseUnityLoopSystem
         private readonly UIDocument canvas;
         private readonly ISceneStateProvider sceneStateProvider;
 
-        private UITransformUpdateSystem(World world, UIDocument canvas, ISceneStateProvider sceneStateProvider) : base(world)
+        public UITransformUpdateSystem(World world, UIDocument canvas, ISceneStateProvider sceneStateProvider) : base(world)
         {
             this.canvas = canvas;
             this.sceneStateProvider = sceneStateProvider;
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
index 893d51255c..80f845893a 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
@@ -16,7 +16,9 @@
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
         "GUID:593a5b492d29ac6448b1ebf7f035ef33",
         "GUID:9e24947de15b9834991c9d8411ea37cf",
-        "GUID:84651a3751eca9349aac36a66bba901b"
+        "GUID:84651a3751eca9349aac36a66bba901b",
+        "GUID:0f4c0f120707fb74497f5d581b9858f8",
+        "GUID:286980af24684da6acc1caa413039811"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
index 3c464a64de..50afb6019c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITextInstantiationSystemShould.cs
@@ -36,14 +36,14 @@ public void SetUp()
         [Test]
         public void InstantiateUIText()
         {
-            //Arrange
+            // Arrange
             var input = new PBUiText();
 
-            //Act
+            // Act
             world.Add(entity, input);
             system.Update(0);
 
-            //Assert
+            // Assert
             ref UITextComponent uiTextComponent = ref world.Get<UITextComponent>(entity);
             Assert.IsNotNull(uiTextComponent.Label);
             Assert.AreEqual($"UIText (Entity {entity.Id})", uiTextComponent.Label.name);
@@ -54,7 +54,7 @@ public void InstantiateUIText()
         [Test]
         public void UpdateUIText()
         {
-            //Arrange
+            // Arrange
             var input = new PBUiText();
             world.Add(entity, input);
             system.Update(0);
@@ -62,7 +62,7 @@ public void UpdateUIText()
 
             for (var i = 0; i < NUMBER_OF_UPDATES; i++)
             {
-                //Act
+                // Act
                 input.Value = $"Test text {i}";
                 input.Color = new Color4 { R = i, G = 1, B = 1, A = 1 };
                 input.FontSize = i + 1;
@@ -70,7 +70,7 @@ public void UpdateUIText()
                 input.IsDirty = true;
                 system.Update(0);
 
-                //Assert
+                // Assert
                 ref UITextComponent uiTextComponent = ref world.Get<UITextComponent>(entity);
                 Assert.AreEqual(input.Value, uiTextComponent.Label.text);
                 Assert.IsTrue(input.GetColor() == uiTextComponent.Label.style.color);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
index a982fda9dc..36068e87f4 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
@@ -1,58 +1,31 @@
 using Arch.Core;
 using Cysharp.Threading.Tasks;
-using DCL.ECSComponents;
-using DCL.Optimization.Pools;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Systems.UITransform;
-using ECS.TestSuite;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEngine.AddressableAssets;
-using Object = UnityEngine.Object;
 
 namespace DCL.SDKComponents.SceneUI.Tests
 {
-    public class UITransformInstantiationSystemShould : UnitySystemTestBase<UITransformInstantiationSystem>
+    public class UITransformInstantiationSystemShould : UITransformSystemTestBase<UITransformInstantiationSystem>
     {
-        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
-
-        private IComponentPoolsRegistry poolsRegistry;
-        private Entity entity;
-        private UIDocument canvas;
-
         [SetUp]
         public async void SetUp()
         {
-            canvas = Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-
-            poolsRegistry = new ComponentPoolsRegistry(
-                new Dictionary<Type, IComponentPool>
-                {
-                    { typeof(VisualElement), new ComponentPool<VisualElement>() },
-                }, null);
-
+            await base.Initialize();
             system = new UITransformInstantiationSystem(world, canvas, poolsRegistry);
-            entity = world.Create();
         }
 
         [Test]
         public async Task InstantiateUITransform()
         {
             // For some reason SetUp is not awaited, probably a Unity's bug
-            await UniTask.WaitUntil(() => system != null && entity != null);
-
-            //Arrange
-            var input = new PBUiTransform();
+            await UniTask.WaitUntil(() => system != null);
 
-            //Act
-            world.Add(entity, input);
-            system.Update(0);
+            // Act
+            base.CreateUITransform();
 
-            //Assert
+            // Assert
             UITransformComponent uiTransformComponent = world.Get<UITransformComponent>(entity);
             Assert.IsNotNull(uiTransformComponent.Transform);
             Assert.AreEqual($"UITransform (Entity {entity.Id})", uiTransformComponent.Transform.name);
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
new file mode 100644
index 0000000000..35bf79992e
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
@@ -0,0 +1,55 @@
+using Arch.Core;
+using Cysharp.Threading.Tasks;
+using DCL.ECSComponents;
+using DCL.Optimization.Pools;
+using DCL.SDKComponents.SceneUI.Systems.UITransform;
+using ECS.Abstract;
+using ECS.TestSuite;
+using NSubstitute;
+using SceneRunner.Scene;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace DCL.SDKComponents.SceneUI.Tests
+{
+    public abstract class UITransformSystemTestBase<TSystem> : UnitySystemTestBase<TSystem> where TSystem : BaseUnityLoopSystem
+    {
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+
+        protected IComponentPoolsRegistry poolsRegistry;
+        protected Entity entity;
+        protected UIDocument canvas;
+        protected ISceneStateProvider sceneStateProvider;
+
+        protected async UniTask Initialize()
+        {
+            poolsRegistry = new ComponentPoolsRegistry(
+                new Dictionary<Type, IComponentPool>
+                {
+                    { typeof(VisualElement), new ComponentPool<VisualElement>() },
+                }, null);
+
+            entity = world.Create();
+            canvas = Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+            sceneStateProvider = Substitute.For<ISceneStateProvider>();
+        }
+
+        protected PBUiTransform CreateUITransform()
+        {
+            UITransformInstantiationSystem instantiationSystem;
+            if (system is UITransformInstantiationSystem transformInstantiationSystem)
+                instantiationSystem = transformInstantiationSystem;
+            else
+                instantiationSystem = new UITransformInstantiationSystem(world, canvas, poolsRegistry);
+
+            var input = new PBUiTransform();
+            world.Add(entity, input);
+            instantiationSystem.Update(0);
+            return input;
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs.meta
new file mode 100644
index 0000000000..809c0888e8
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e5bf497ffae0418abf04dd0cfb658412
+timeCreated: 1704900863
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
new file mode 100644
index 0000000000..099307953d
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
@@ -0,0 +1,67 @@
+using Cysharp.Threading.Tasks;
+using DCL.ECSComponents;
+using DCL.SDKComponents.SceneUI.Components;
+using DCL.SDKComponents.SceneUI.Systems.UITransform;
+using DCL.SDKComponents.SceneUI.Utils;
+using NUnit.Framework;
+using System.Threading.Tasks;
+
+namespace DCL.SDKComponents.SceneUI.Tests
+{
+    public class UITransformUpdateSystemShould : UITransformSystemTestBase<UITransformUpdateSystem>
+    {
+        [SetUp]
+        public async void SetUp()
+        {
+            await base.Initialize();
+            system = new UITransformUpdateSystem(world, canvas, sceneStateProvider);
+        }
+
+        [Test]
+        public async Task UpdateUITransform()
+        {
+            // For some reason SetUp is not awaited, probably a Unity's bug
+            await UniTask.WaitUntil(() => system != null);
+
+            // Arrange
+            var input = base.CreateUITransform();
+            const int NUMBER_OF_UPDATES = 3;
+            sceneStateProvider.IsCurrent = true;
+
+            for (var i = 0; i < NUMBER_OF_UPDATES; i++)
+            {
+                // Act
+                input.Display = (YGDisplay) i;
+                // Space to set the properties that we want to test
+                // ...
+                input.IsDirty = true;
+                system.Update(0);
+
+                // Assert
+                UITransformComponent uiTransformComponent = world.Get<UITransformComponent>(entity);
+                Assert.AreEqual(UiElementUtils.GetDisplay(input.Display), uiTransformComponent.Transform.style.display);
+            }
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task CheckUITransformOutOfScene(bool isCurrentScene)
+        {
+            // For some reason SetUp is not awaited, probably a Unity's bug
+            await UniTask.WaitUntil(() => system != null);
+
+            // Arrange
+            var input = base.CreateUITransform();
+            sceneStateProvider.IsCurrent = isCurrentScene;
+            var uiTransformComponent = world.Get<UITransformComponent>(entity);
+            uiTransformComponent.IsHidden = isCurrentScene;
+
+            // Act
+            system.Update(0);
+
+            // Assert
+            Assert.AreEqual(isCurrentScene, canvas.rootVisualElement.Contains(uiTransformComponent.Transform));
+        }
+    }
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs.meta
new file mode 100644
index 0000000000..099d029b2f
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6f064e9c63bf41ff96a03e6c97947b96
+timeCreated: 1704903575
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
index a2ebb40d33..32e738dbf8 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Utils/UiElementUtils.cs
@@ -177,7 +177,7 @@ private static StyleEnum<Overflow> GetOverflow(YGOverflow overflow)
             }
         }
 
-        private static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
+        public static StyleEnum<DisplayStyle> GetDisplay(YGDisplay display)
         {
             switch (display)
             {

From 50c59db4e594780e0a11c7fca633898d9ed160ac Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 13:40:20 +0100
Subject: [PATCH 39/54] Apply feedback: Remove redundant conditional

---
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs  | 9 +++------
 .../Global/Tests/PlayMode/IntegrationTestsSuite.cs       | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 8c0c468a64..4a0cd942e6 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -28,12 +28,9 @@ public SceneUIPlugin(
             ECSWorldSingletonSharedDependencies singletonSharedDependencies)
         {
             this.canvas = canvas;
-            if (this.canvas.rootVisualElement != null)
-            {
-                this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
-                this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
-                this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
-            }
+            this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
+            this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
+            this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
             componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement);
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index d4844ecf3f..4289093961 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -22,7 +22,7 @@ public static class IntegrationTestsSuite
         {
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
-            UIDocument scenesUIRootCanvas = (await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+            UIDocument scenesUIRootCanvas = Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
             StyleSheet scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
 
             return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,

From aa32f6931c5338b18dfda4a7553aa30bc13dd05f Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 13:47:13 +0100
Subject: [PATCH 40/54] Apply feedback: Remove unneeded RightOf from
 UITransformComponent

---
 .../SceneUI/Components/UITransformComponent.cs            | 1 -
 .../Systems/UITransform/UITransformParentingSystem.cs     | 3 ---
 .../Systems/UITransform/UITransformSortingSystem.cs       | 8 ++++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
index 7a6cf8cd02..674d2e1c79 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Components/UITransformComponent.cs
@@ -11,7 +11,6 @@ public struct UITransformComponent : IPoolableComponentProvider<VisualElement>
     {
         public VisualElement Transform;
         public EntityReference Parent;
-        public int RightOf;
         public HashSet<EntityReference> Children;
         public bool IsHidden;
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
index 7bd9d247fd..caa16a65e2 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
@@ -40,10 +40,7 @@ private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel
                 return;
 
             if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) && newParentEntity != sceneRoot)
-            {
                 SetNewChild(ref uiTransformComponent, World.Reference(entity), newParentEntity);
-                uiTransformComponent.RightOf = sdkModel.RightOf;
-            }
         }
 
         private void SetNewChild(ref UITransformComponent childComponent, EntityReference childEntityReference, Entity parentEntity)
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
index 72800a5925..04ddfbaade 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
@@ -41,18 +41,18 @@ private void DoUITransformSorting(ref PBUiTransform sdkModel, ref UITransformCom
             if (!sdkModel.IsDirty)
                 return;
 
-            SortUITransform(ref uiTransformComponent);
+            SortUITransform(ref sdkModel, ref uiTransformComponent);
 
             if (uiTransformComponent.Parent == EntityReference.Null)
                 return;
 
             foreach (EntityReference brotherEntity in World.Get<UITransformComponent>(uiTransformComponent.Parent).Children)
-                SortUITransform(ref World.Get<UITransformComponent>(brotherEntity));
+                SortUITransform(ref sdkModel, ref World.Get<UITransformComponent>(brotherEntity));
         }
 
-        private void SortUITransform(ref UITransformComponent uiTransform)
+        private void SortUITransform(ref PBUiTransform sdkModel, ref UITransformComponent uiTransform)
         {
-            if (!entitiesMap.TryGetValue(uiTransform.RightOf, out Entity entityOnLeft) || entityOnLeft == sceneRoot)
+            if (!entitiesMap.TryGetValue(sdkModel.RightOf, out Entity entityOnLeft) || entityOnLeft == sceneRoot)
                 return;
 
             var uiTransformOnLeft = World.Get<UITransformComponent>(entityOnLeft);

From a45ab5896a52e294383518914f7abcc20253cd45 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 14:12:55 +0100
Subject: [PATCH 41/54] Apply feedback: Store pool in release ctor

---
 .../SceneUI/Systems/UIText/UITextReleaseSystem.cs      | 10 ++++------
 .../Systems/UITransform/UITransformReleaseSystem.cs    | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
index 55df9ba60b..7c53d1d8d3 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UIText/UITextReleaseSystem.cs
@@ -20,11 +20,11 @@ namespace DCL.SDKComponents.SceneUI.Systems.UIText
     [ThrottlingEnabled]
     public partial class UITextReleaseSystem : BaseUnityLoopSystem
     {
-        private readonly IComponentPoolsRegistry poolsRegistry;
+        private IComponentPool componentPool;
 
         private UITextReleaseSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
-            this.poolsRegistry = poolsRegistry;
+            poolsRegistry.TryGetPool(typeof(Label), out IComponentPool componentPool);
         }
 
         protected override void Update(float t)
@@ -46,10 +46,8 @@ private void HandleEntityDestruction(ref UITextComponent uiTextComponent) =>
 
         private void RemoveLabel(UITextComponent uiTextComponent)
         {
-            if (!poolsRegistry.TryGetPool(typeof(Label), out IComponentPool componentPool))
-                return;
-
-            componentPool.Release(uiTextComponent.Label);
+            if (componentPool != null)
+                componentPool.Release(uiTextComponent.Label);
         }
     }
 }
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
index 2dac34b028..4b963e741c 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformReleaseSystem.cs
@@ -19,11 +19,11 @@ namespace DCL.SDKComponents.SceneUI.Systems.UITransform
     [ThrottlingEnabled]
     public partial class UITransformReleaseSystem : BaseUnityLoopSystem
     {
-        private readonly IComponentPoolsRegistry poolsRegistry;
+        private IComponentPool componentPool;
 
         private UITransformReleaseSystem(World world, IComponentPoolsRegistry poolsRegistry) : base(world)
         {
-            this.poolsRegistry = poolsRegistry;
+            poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool);
         }
 
         protected override void Update(float t)
@@ -45,10 +45,8 @@ private void HandleEntityDestruction(ref UITransformComponent uiTransformCompone
 
         private void RemoveVisualElement(ref UITransformComponent uiTransformComponent)
         {
-            if (!poolsRegistry.TryGetPool(typeof(VisualElement), out IComponentPool componentPool))
-                return;
-
-            componentPool.Release(uiTransformComponent.Transform);
+            if (componentPool != null)
+                componentPool.Release(uiTransformComponent.Transform);
         }
     }
 }

From 8a1cc98ec2c8cd9ec259b9abf4caa5eac5f9ca2a Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 14:26:46 +0100
Subject: [PATCH 42/54] Apply feedback: Implement missing logic that removes a
 child from the old UITransform parent

---
 .../UITransform/UITransformParentingSystem.cs | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
index caa16a65e2..8734ffcf42 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformParentingSystem.cs
@@ -8,6 +8,7 @@
 using DCL.SDKComponents.SceneUI.Components;
 using ECS.Abstract;
 using ECS.Groups;
+using ECS.LifeCycle.Components;
 using System.Collections.Generic;
 
 namespace DCL.SDKComponents.SceneUI.Systems.UITransform
@@ -29,9 +30,20 @@ private UITransformParentingSystem(World world, IReadOnlyDictionary<CRDTEntity,
 
         protected override void Update(float t)
         {
+            OrphanChildrenOfDeletedEntityQuery(World);
             DoUITransformParentingQuery(World);
         }
 
+        [Query]
+        [All(typeof(PBUiTransform), typeof(UITransformComponent), typeof(DeleteEntityIntention))]
+        private void OrphanChildrenOfDeletedEntity(ref UITransformComponent uiTransformComponentToBeDeleted)
+        {
+            foreach (EntityReference childEntity in uiTransformComponentToBeDeleted.Children)
+                SetNewChild(ref World.Get<UITransformComponent>(childEntity.Entity), childEntity, sceneRoot);
+
+            uiTransformComponentToBeDeleted.Children.Clear();
+        }
+
         [Query]
         [All(typeof(PBUiTransform), typeof(UITransformComponent))]
         private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel, ref UITransformComponent uiTransformComponent)
@@ -39,8 +51,19 @@ private void DoUITransformParenting(in Entity entity, ref PBUiTransform sdkModel
             if (!sdkModel.IsDirty)
                 return;
 
-            if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity) && newParentEntity != sceneRoot)
-                SetNewChild(ref uiTransformComponent, World.Reference(entity), newParentEntity);
+            Entity parentReference = sceneRoot;
+
+            if (entitiesMap.TryGetValue(sdkModel.Parent, out Entity newParentEntity))
+            {
+                parentReference = newParentEntity;
+
+                //We have to remove the child from the old parent
+                if (uiTransformComponent.Parent != parentReference)
+                    RemoveFromParent(uiTransformComponent, World.Reference(entity));
+
+                if (parentReference != sceneRoot)
+                    SetNewChild(ref uiTransformComponent, World.Reference(entity), parentReference);
+            }
         }
 
         private void SetNewChild(ref UITransformComponent childComponent, EntityReference childEntityReference, Entity parentEntity)
@@ -56,8 +79,14 @@ private void SetNewChild(ref UITransformComponent childComponent, EntityReferenc
 
             UITransformComponent parentComponent = World.Get<UITransformComponent>(parentEntity);
             parentComponent.Transform.Add(childComponent.Transform);
-            parentComponent.Children.Add(childEntityReference);
             childComponent.Parent = World.Reference(parentEntity);
+            parentComponent.Children.Add(childEntityReference);
+        }
+
+        private void RemoveFromParent(UITransformComponent childComponent, EntityReference childEntityReference)
+        {
+            if (childComponent.Parent.IsAlive(World))
+                World.Get<UITransformComponent>(childComponent.Parent.Entity).Children.Remove(childEntityReference);
         }
     }
 }

From d9d3e99db54c231e35a6851bf508b2c2d2e7f718 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 14:28:11 +0100
Subject: [PATCH 43/54] Apply feedback: Remove leftover code

---
 .../SceneUI/Systems/UITransform/UITransformSortingSystem.cs     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
index 04ddfbaade..d175d7fe79 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformSortingSystem.cs
@@ -21,8 +21,6 @@ public partial class UITransformSortingSystem : BaseUnityLoopSystem
         private readonly Entity sceneRoot;
         private readonly IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap;
 
-        private List<UITransformComponent> transformList = new ();
-
         private UITransformSortingSystem(World world, IReadOnlyDictionary<CRDTEntity, Entity> entitiesMap, Entity sceneRoot) : base(world)
         {
             this.sceneRoot = sceneRoot;

From 8d87f3ad96b37c47d0799b1269d20cea35dc3090 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 15:56:08 +0100
Subject: [PATCH 44/54] Apply feedback: Avoid to execute always
 CheckUITransformOutOfSceneQuery

---
 .../Systems/UITransform/UITransformUpdateSystem.cs        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
index c5797f0b1f..90876c6a72 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Systems/UITransform/UITransformUpdateSystem.cs
@@ -21,6 +21,7 @@ public partial class UITransformUpdateSystem : BaseUnityLoopSystem
     {
         private readonly UIDocument canvas;
         private readonly ISceneStateProvider sceneStateProvider;
+        private bool? lastIsCurrentScene;
 
         public UITransformUpdateSystem(World world, UIDocument canvas, ISceneStateProvider sceneStateProvider) : base(world)
         {
@@ -31,7 +32,12 @@ public UITransformUpdateSystem(World world, UIDocument canvas, ISceneStateProvid
         protected override void Update(float _)
         {
             UpdateUITransformQuery(World);
-            CheckUITransformOutOfSceneQuery(World);
+
+            if (lastIsCurrentScene != sceneStateProvider.IsCurrent)
+            {
+                lastIsCurrentScene = sceneStateProvider.IsCurrent;
+                CheckUITransformOutOfSceneQuery(World);
+            }
         }
 
         [Query]

From c61537d2faa218c200e73b72d9d0fd740fa022bf Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 16:59:27 +0100
Subject: [PATCH 45/54] Apply feedback: Add maxSize to AddComponentPool method

---
 .../Optimization/Pools/IComponentPoolsRegistry.cs             | 4 ++--
 Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Optimization/Pools/IComponentPoolsRegistry.cs b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Optimization/Pools/IComponentPoolsRegistry.cs
index 9622890dbd..342dd674dd 100644
--- a/Explorer/Assets/DCL/PerformanceAndDiagnostics/Optimization/Pools/IComponentPoolsRegistry.cs
+++ b/Explorer/Assets/DCL/PerformanceAndDiagnostics/Optimization/Pools/IComponentPoolsRegistry.cs
@@ -33,9 +33,9 @@ public interface IComponentPoolsRegistry : IDisposable
 
     public static class ComponentPoolsRegistryExtensions
     {
-        public static void AddComponentPool<T>(this IComponentPoolsRegistry componentPoolsRegistry, Action<T> onGet = null, Action<T> onRelease = null) where T: class, new()
+        public static void AddComponentPool<T>(this IComponentPoolsRegistry componentPoolsRegistry, Action<T> onGet = null, Action<T> onRelease = null, int maxSize = 10000) where T: class, new()
         {
-            componentPoolsRegistry.AddComponentPool(new ComponentPool<T>(onGet, onRelease));
+            componentPoolsRegistry.AddComponentPool(new ComponentPool<T>(onGet, onRelease, maxSize: maxSize));
         }
     }
 }
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 4a0cd942e6..98050e6072 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -33,8 +33,8 @@ public SceneUIPlugin(
             this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
 
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
-            componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement);
-            componentPoolsRegistry.AddComponentPool<Label>(onRelease: UiElementUtils.ReleaseUIElement);
+            componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement, maxSize: 200);
+            componentPoolsRegistry.AddComponentPool<Label>(onRelease: UiElementUtils.ReleaseUIElement, maxSize: 100);
         }
 
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)

From dfa907088b280335f2541eb242807ecf66140ca5 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 17:36:41 +0100
Subject: [PATCH 46/54] Apply feedback: Set tests as PlayMode

---
 .../SceneUI/Tests/SceneUI.Tests.asmdef        | 42 -------------------
 .../SceneUI/Tests/SceneUI.Tests.asmref        |  3 ++
 ....asmdef.meta => SceneUI.Tests.asmref.meta} |  4 +-
 .../Tests/PlayMode/DCL.PlayMode.Tests.asmdef  |  3 +-
 4 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
 create mode 100644 Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref
 rename Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/{SceneUI.Tests.asmdef.meta => SceneUI.Tests.asmref.meta} (56%)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
deleted file mode 100644
index 80f845893a..0000000000
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "SceneUI.Tests",
-    "rootNamespace": "",
-    "references": [
-        "GUID:27619889b8ba8c24980f49ee34dbb44a",
-        "GUID:0acc523941302664db1f4e527237feb3",
-        "GUID:a3c61f15599a43ae9de508c9c4dd5530",
-        "GUID:7f6c11dd1400cef4f838168f18ce244a",
-        "GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
-        "GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
-        "GUID:4794e238ed0f65142a4aea5848b513e5",
-        "GUID:3c7b57a14671040bd8c549056adc04f5",
-        "GUID:275e22790c04e9b47a5085d7b0c4432a",
-        "GUID:fc4fd35fb877e904d8cedee73b2256f6",
-        "GUID:7213a1d35667f9b40be6aca8cbfcee23",
-        "GUID:f51ebe6a0ceec4240a699833d6309b23",
-        "GUID:593a5b492d29ac6448b1ebf7f035ef33",
-        "GUID:9e24947de15b9834991c9d8411ea37cf",
-        "GUID:84651a3751eca9349aac36a66bba901b",
-        "GUID:0f4c0f120707fb74497f5d581b9858f8",
-        "GUID:286980af24684da6acc1caa413039811"
-    ],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": true,
-    "precompiledReferences": [
-        "nunit.framework.dll",
-        "NSubstitute.dll",
-        "Arch.dll",
-        "Arch.System.dll",
-        "Google.Protobuf.dll"
-    ],
-    "autoReferenced": false,
-    "defineConstraints": [
-        "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref
new file mode 100644
index 0000000000..a92db790d7
--- /dev/null
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref
@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:7213a1d35667f9b40be6aca8cbfcee23"
+}
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref.meta
similarity index 56%
rename from Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta
rename to Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref.meta
index be16b56e38..92596c94bd 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmdef.meta
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/SceneUI.Tests.asmref.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b38e70d374555cf40836e82d5b646743
-AssemblyDefinitionImporter:
+guid: 11630481d74e16b41832e2728684fd44
+AssemblyDefinitionReferenceImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Explorer/Assets/DCL/Tests/PlayMode/DCL.PlayMode.Tests.asmdef b/Explorer/Assets/DCL/Tests/PlayMode/DCL.PlayMode.Tests.asmdef
index 5eaf046b7f..e9d9ba382b 100644
--- a/Explorer/Assets/DCL/Tests/PlayMode/DCL.PlayMode.Tests.asmdef
+++ b/Explorer/Assets/DCL/Tests/PlayMode/DCL.PlayMode.Tests.asmdef
@@ -41,7 +41,8 @@
         "GUID:56e8195b069a4dca9c4c4f313c65f526",
         "GUID:c0dd0d10738d4ad4a9de57c559d0ca1b",
         "GUID:db9f6ca714dd4f9b9755c0faa3a8f24c",
-        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:7f6c11dd1400cef4f838168f18ce244a"
     ],
     "includePlatforms": [],
     "excludePlatforms": [

From 3fff4be9ef384b4ce18935fd28823466475adbc3 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 17:59:59 +0100
Subject: [PATCH 47/54] Remove unneeded inspector reference to
 ScenesUIRootCanvas and ScenesUIStyleSheet

---
 .../Assets/Scenes/DynamicSceneLoading.unity   | 86 ++-----------------
 .../Assets/Scenes/StaticSceneLoader.unity     | 74 ----------------
 .../Global/Dynamic/DynamicSceneLoader.cs      | 16 ++--
 .../Global/Static/StaticSceneLauncher.cs      | 17 ++--
 4 files changed, 28 insertions(+), 165 deletions(-)

diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
index b7f64c3fb5..70792759f3 100644
--- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity
+++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity
@@ -152,7 +152,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &170878723
 GameObject:
@@ -279,8 +279,6 @@ MonoBehaviour:
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
   uiToolkitRoot: {fileID: 1901323878}
   debugUiRoot: {fileID: 946305963}
-  scenesUiRoot: {fileID: 2134614891}
-  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
   skyBoxSceneData: {fileID: 705507997}
   realmLauncher: {fileID: 234607244}
   settings: {fileID: 11400000, guid: 2e1d2c350e04ac3428300d032c5ee567, type: 2}
@@ -875,7 +873,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1281082863
 MonoBehaviour:
@@ -1375,7 +1373,7 @@ RectTransform:
   - {fileID: 2095941040}
   - {fileID: 1277831542}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1660,7 +1658,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2042493840
 GameObject:
@@ -1960,80 +1958,8 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2134614890
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_Name
-      value: ScenesUIRootCanvas
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
---- !u!114 &2134614891 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-  m_PrefabInstance: {fileID: 2134614890}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &2120228937440095928
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2137,7 +2063,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3}
       propertyPath: m_LocalPosition.x
diff --git a/Explorer/Assets/Scenes/StaticSceneLoader.unity b/Explorer/Assets/Scenes/StaticSceneLoader.unity
index ad0ac7ab1c..d924ee90f3 100644
--- a/Explorer/Assets/Scenes/StaticSceneLoader.unity
+++ b/Explorer/Assets/Scenes/StaticSceneLoader.unity
@@ -179,8 +179,6 @@ MonoBehaviour:
     - sdk6-basic-scene
   globalPluginSettingsContainer: {fileID: 11400000, guid: 7575a56449e4af444b9c13267319c95d, type: 2}
   scenePluginSettingsContainer: {fileID: 11400000, guid: 52a2a6abe420a8b4db9dc55df4b42e92, type: 2}
-  scenesUiRoot: {fileID: 1254164264}
-  scenesUiStyleSheet: {fileID: 7433441132597879392, guid: 295cf8ad8d171d849863eccaf581c9e7, type: 3}
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
@@ -436,78 +434,6 @@ MonoBehaviour:
     mipBias: 0
     varianceClampScale: 0.9
     contrastAdaptiveSharpening: 0
---- !u!1001 &1254164263
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4780495006830554941, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8765448689815683113, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-      propertyPath: m_Name
-      value: ScenesUIRootCanvas
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
---- !u!114 &1254164264 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3889322179606995116, guid: e0f5a4ab5d8f74640ae94adb6824bd45, type: 3}
-  m_PrefabInstance: {fileID: 1254164263}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2137356830
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index a8319fec97..9b93e9da10 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -3,13 +3,13 @@
 using DCL.Browser;
 using DCL.PluginSystem;
 using DCL.PluginSystem.Global;
-using DCL.Web3Authentication;
 using DCL.SkyBox;
 using DCL.Web3Authentication.Authenticators;
 using DCL.Web3Authentication.Identities;
 using System;
 using System.Threading;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
 using UnityEngine.UIElements;
 using Utility;
 
@@ -20,14 +20,15 @@ namespace Global.Dynamic
     /// </summary>
     public class DynamicSceneLoader : MonoBehaviour
     {
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
+
         [Header("Settings")]
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
         [Space]
         [SerializeField] private UIDocument uiToolkitRoot;
         [SerializeField] private UIDocument debugUiRoot;
-        [SerializeField] private UIDocument scenesUiRoot;
-        [SerializeField] private StyleSheet scenesUiStyleSheet;
 
         [Space]
         [SerializeField] private SkyBoxSceneData skyBoxSceneData;
@@ -39,9 +40,14 @@ public class DynamicSceneLoader : MonoBehaviour
         private DynamicWorldContainer? dynamicWorldContainer;
         private GlobalWorld? globalWorld;
         private IWeb3VerifiedAuthenticator? web3Authenticator;
+        private UIDocument scenesUIcanvas;
+        private StyleSheet scenesUIStyleSheet;
 
-        private void Awake()
+        private async void Awake()
         {
+            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
             realmLauncher.Initialize(settings.Realms);
 
             InitializationFlowAsync(destroyCancellationToken).Forget();
@@ -88,7 +94,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUiRoot, scenesUiStyleSheet, identityCache, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUIcanvas, scenesUIStyleSheet, identityCache, ct);
 
                 if (!isLoaded)
                 {
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index d96483fe6a..0035ecdfe5 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -1,12 +1,12 @@
 using Cysharp.Threading.Tasks;
 using DCL.PluginSystem;
-using DCL.Web3Authentication;
 using DCL.Web3Authentication.Authenticators;
 using DCL.Web3Authentication.Identities;
 using SceneRunner.Scene;
 using System;
 using System.Threading;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
 using UnityEngine.UIElements;
 
 namespace Global.Static
@@ -16,19 +16,24 @@ namespace Global.Static
     /// </summary>
     public class StaticSceneLauncher : MonoBehaviour
     {
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
+
         [SerializeField] private SceneLauncher sceneLauncher;
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
-        [SerializeField] private UIDocument scenesUiRoot;
-        [SerializeField] private StyleSheet scenesUiStyleSheet;
 
         private ISceneFacade sceneFacade;
-
         private StaticContainer staticContainer;
         private IWeb3Authenticator? web3Authenticator;
+        private UIDocument scenesUIcanvas;
+        private StyleSheet scenesUIStyleSheet;
 
-        private void Awake()
+        private async void Awake()
         {
+            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
             InitializationFlowAsync(destroyCancellationToken).Forget();
         }
 
@@ -51,7 +56,7 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
                 SceneSharedContainer sceneSharedContainer;
 
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
-                    scenesUiRoot, scenesUiStyleSheet, identityCache, ct);
+                    scenesUIcanvas, scenesUIStyleSheet, identityCache, ct);
                 sceneLauncher.Initialize(sceneSharedContainer, destroyCancellationToken);
             }
             catch (OperationCanceledException) { }

From 1a15e6291e75727d761b87b82207f9e04152d092 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 19:21:50 +0100
Subject: [PATCH 48/54] Update UITransformSystemTestBase.cs

---
 .../SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
index 35bf79992e..a6ee2523cc 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformSystemTestBase.cs
@@ -9,6 +9,7 @@
 using SceneRunner.Scene;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.UIElements;
@@ -25,7 +26,7 @@ public abstract class UITransformSystemTestBase<TSystem> : UnitySystemTestBase<T
         protected UIDocument canvas;
         protected ISceneStateProvider sceneStateProvider;
 
-        protected async UniTask Initialize()
+        protected async Task Initialize()
         {
             poolsRegistry = new ComponentPoolsRegistry(
                 new Dictionary<Type, IComponentPool>

From a0fec46c11f3a331c4e61b6b7657899c66fb77d8 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Thu, 11 Jan 2024 19:40:25 +0100
Subject: [PATCH 49/54] Fix conflicts from last merge

---
 .../Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs b/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
index f69712794b..3a34b89120 100644
--- a/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
+++ b/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
@@ -18,12 +18,16 @@
 using System.Threading;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
 
 namespace DCL.SDKComponents.AudioSources.Tests.PlayMode
 {
     public class SDKAudioSourcesAutomatedTests
     {
+        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
+        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
         private const string TEST_SCENE = "Dance-floor";
         private const int TARGET_FPS = 60;
 
@@ -106,7 +110,13 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
             CancellationToken ct)
         {
             // First load the common global plugin
-            (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(globalSettingsContainer, web3IdentityCache, ethereumApi, ct);
+            (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(
+                globalSettingsContainer,
+                Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>(),
+                await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET),
+                web3IdentityCache,
+                ethereumApi,
+                ct);
 
             if (!isLoaded)
                 GameReports.PrintIsDead();

From d9665a8e0586e0e627e7826b20c059f7a1e432e4 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 12 Jan 2024 09:53:58 +0100
Subject: [PATCH 50/54] Fix code conventions tests

---
 .../Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs   | 8 ++++----
 .../Assets/Scripts/Global/Static/StaticSceneLauncher.cs   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index 2329559603..31986b3f16 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -45,11 +45,8 @@ public class DynamicSceneLoader : MonoBehaviour
         private UIDocument scenesUIcanvas;
         private StyleSheet scenesUIStyleSheet;
 
-        private async void Awake()
+        private void Awake()
         {
-            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
             realmLauncher.Initialize(settings.Realms);
 
             InitializationFlowAsync(destroyCancellationToken).Forget();
@@ -100,6 +97,9 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
+                scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+                scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
                 (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUIcanvas, scenesUIStyleSheet, identityCache, web3VerifiedAuthenticator, ct);
 
                 if (!isLoaded)
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 95e0efaa70..7bf890aecc 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -37,11 +37,8 @@ public class StaticSceneLauncher : MonoBehaviour
         private UIDocument scenesUIcanvas;
         private StyleSheet scenesUIStyleSheet;
 
-        private async void Awake()
+        private void Awake()
         {
-            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
             InitializationFlowAsync(destroyCancellationToken).Forget();
         }
 
@@ -90,6 +87,9 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
 
                 SceneSharedContainer sceneSharedContainer;
 
+                scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+                scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
                     scenesUIcanvas, scenesUIStyleSheet, identityCache, dappWeb3Authenticator, ct);
 

From 2955e8a53fcbb3b75abe5d52c1804a6264902330 Mon Sep 17 00:00:00 2001
From: Mikhail Agapov <mikhail.agapov@decentraland.org>
Date: Fri, 12 Jan 2024 11:57:35 +0300
Subject: [PATCH 51/54] Fix async tests

* Upgrade TestFramework to 1.4.2
  * Async Setup/Teardown issue fixed
  * More stable
---
 .../UITransformInstantiationSystemShould.cs   | 10 +++-----
 .../Tests/UITransformUpdateSystemShould.cs    | 25 +++++++------------
 .../Global/Dynamic/DynamicSceneLoader.cs      | 16 +++++-------
 .../Global/Static/StaticSceneLauncher.cs      | 12 ++++-----
 Explorer/Packages/manifest.json               |  4 +--
 Explorer/Packages/packages-lock.json          |  8 +++---
 6 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
index 36068e87f4..157cf359ce 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformInstantiationSystemShould.cs
@@ -1,5 +1,4 @@
 using Arch.Core;
-using Cysharp.Threading.Tasks;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Systems.UITransform;
 using NUnit.Framework;
@@ -10,18 +9,15 @@ namespace DCL.SDKComponents.SceneUI.Tests
     public class UITransformInstantiationSystemShould : UITransformSystemTestBase<UITransformInstantiationSystem>
     {
         [SetUp]
-        public async void SetUp()
+        public async Task SetUp()
         {
-            await base.Initialize();
+            await Initialize();
             system = new UITransformInstantiationSystem(world, canvas, poolsRegistry);
         }
 
         [Test]
-        public async Task InstantiateUITransform()
+        public void InstantiateUITransform()
         {
-            // For some reason SetUp is not awaited, probably a Unity's bug
-            await UniTask.WaitUntil(() => system != null);
-
             // Act
             base.CreateUITransform();
 
diff --git a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
index 099307953d..2a0042f68f 100644
--- a/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
+++ b/Explorer/Assets/DCL/SDKComponents/SceneUI/Tests/UITransformUpdateSystemShould.cs
@@ -1,10 +1,8 @@
-using Cysharp.Threading.Tasks;
-using DCL.ECSComponents;
+using DCL.ECSComponents;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Systems.UITransform;
 using DCL.SDKComponents.SceneUI.Utils;
 using NUnit.Framework;
-using System.Threading.Tasks;
 
 namespace DCL.SDKComponents.SceneUI.Tests
 {
@@ -13,25 +11,23 @@ public class UITransformUpdateSystemShould : UITransformSystemTestBase<UITransfo
         [SetUp]
         public async void SetUp()
         {
-            await base.Initialize();
+            await Initialize();
             system = new UITransformUpdateSystem(world, canvas, sceneStateProvider);
         }
 
         [Test]
-        public async Task UpdateUITransform()
+        public void UpdateUITransform()
         {
-            // For some reason SetUp is not awaited, probably a Unity's bug
-            await UniTask.WaitUntil(() => system != null);
-
             // Arrange
-            var input = base.CreateUITransform();
+            PBUiTransform input = CreateUITransform();
             const int NUMBER_OF_UPDATES = 3;
             sceneStateProvider.IsCurrent = true;
 
             for (var i = 0; i < NUMBER_OF_UPDATES; i++)
             {
                 // Act
-                input.Display = (YGDisplay) i;
+                input.Display = (YGDisplay)i;
+
                 // Space to set the properties that we want to test
                 // ...
                 input.IsDirty = true;
@@ -46,15 +42,12 @@ public async Task UpdateUITransform()
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public async Task CheckUITransformOutOfScene(bool isCurrentScene)
+        public void CheckUITransformOutOfScene(bool isCurrentScene)
         {
-            // For some reason SetUp is not awaited, probably a Unity's bug
-            await UniTask.WaitUntil(() => system != null);
-
             // Arrange
-            var input = base.CreateUITransform();
+            PBUiTransform input = CreateUITransform();
             sceneStateProvider.IsCurrent = isCurrentScene;
-            var uiTransformComponent = world.Get<UITransformComponent>(entity);
+            UITransformComponent uiTransformComponent = world.Get<UITransformComponent>(entity);
             uiTransformComponent.IsHidden = isCurrentScene;
 
             // Act
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index 2329559603..6f857b3d78 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -3,15 +3,14 @@
 using DCL.Browser;
 using DCL.PluginSystem;
 using DCL.PluginSystem.Global;
+using DCL.SkyBox;
 using DCL.Web3.Authenticators;
 using DCL.Web3.Identities;
-using DCL.SkyBox;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
-
 using UnityEngine.UIElements;
 using Utility;
 
@@ -42,16 +41,10 @@ public class DynamicSceneLoader : MonoBehaviour
         private DynamicWorldContainer? dynamicWorldContainer;
         private GlobalWorld? globalWorld;
         private IWeb3VerifiedAuthenticator? web3Authenticator;
-        private UIDocument scenesUIcanvas;
-        private StyleSheet scenesUIStyleSheet;
 
-        private async void Awake()
+        private void Awake()
         {
-            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
             realmLauncher.Initialize(settings.Realms);
-
             InitializationFlowAsync(destroyCancellationToken).Forget();
         }
 
@@ -84,6 +77,9 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
         {
             try
             {
+                UIDocument? scenesUICanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+                StyleSheet? scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
                 var identityCache = new ProxyIdentityCache(new MemoryWeb3IdentityCache(),
                     new PlayerPrefsIdentityProvider(new PlayerPrefsIdentityProvider.DecentralandIdentityWithNethereumAccountJsonSerializer()));
 
@@ -100,7 +96,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUIcanvas, scenesUIStyleSheet, identityCache, web3VerifiedAuthenticator, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUICanvas, scenesUIStyleSheet, identityCache, web3VerifiedAuthenticator, ct);
 
                 if (!isLoaded)
                 {
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 95e0efaa70..5d67a11c7b 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -34,14 +34,9 @@ public class StaticSceneLauncher : MonoBehaviour
         private ISceneFacade sceneFacade;
         private StaticContainer staticContainer;
         private IWeb3Authenticator? web3Authenticator;
-        private UIDocument scenesUIcanvas;
-        private StyleSheet scenesUIStyleSheet;
 
-        private async void Awake()
+        private void Awake()
         {
-            scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
             InitializationFlowAsync(destroyCancellationToken).Forget();
         }
 
@@ -55,6 +50,9 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
         {
             try
             {
+                UIDocument? scenesUICanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
+                StyleSheet? scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
+
                 IWeb3IdentityCache identityCache;
 
                 if (useStoredCredentials
@@ -91,7 +89,7 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
                 SceneSharedContainer sceneSharedContainer;
 
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
-                    scenesUIcanvas, scenesUIStyleSheet, identityCache, dappWeb3Authenticator, ct);
+                    scenesUICanvas, scenesUIStyleSheet, identityCache, dappWeb3Authenticator, ct);
 
                 sceneLauncher.Initialize(sceneSharedContainer, destroyCancellationToken);
             }
diff --git a/Explorer/Packages/manifest.json b/Explorer/Packages/manifest.json
index 289d304d9c..bd7c700515 100644
--- a/Explorer/Packages/manifest.json
+++ b/Explorer/Packages/manifest.json
@@ -21,8 +21,8 @@
     "com.unity.memoryprofiler": "1.0.0",
     "com.unity.profiling.core": "1.0.2",
     "com.unity.render-pipelines.universal": "14.0.8",
-    "com.unity.test-framework": "2.0.1-pre.18",
-    "com.unity.test-framework.performance": "3.0.0-pre.2",
+    "com.unity.test-framework": "1.4.2",
+    "com.unity.test-framework.performance": "3.0.3",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.5",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
diff --git a/Explorer/Packages/packages-lock.json b/Explorer/Packages/packages-lock.json
index c20d6b4482..6921259f68 100644
--- a/Explorer/Packages/packages-lock.json
+++ b/Explorer/Packages/packages-lock.json
@@ -130,7 +130,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.2",
+      "version": "2.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -307,18 +307,18 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "2.0.1-pre.18",
+      "version": "1.4.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "2.0.2",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework.performance": {
-      "version": "3.0.0-pre.2",
+      "version": "3.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {

From 6bb77ce397215887496c835ee138d0b12471a3c0 Mon Sep 17 00:00:00 2001
From: Santi Andrade <sandrade@decentraland.org>
Date: Fri, 12 Jan 2024 10:32:49 +0100
Subject: [PATCH 52/54] Update StaticSceneLauncher.cs

---
 Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 385d758816..5d67a11c7b 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -88,9 +88,6 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
 
                 SceneSharedContainer sceneSharedContainer;
 
-                scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-                scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
                     scenesUICanvas, scenesUIStyleSheet, identityCache, dappWeb3Authenticator, ct);
 

From 23e7998e8a39e527da3bff0f4f3cc3b7fd78ec40 Mon Sep 17 00:00:00 2001
From: Mikhail Agapov <mikhail.agapov@decentraland.org>
Date: Fri, 12 Jan 2024 12:43:30 +0300
Subject: [PATCH 53/54] Isolate Scene Canvas inside the corresponding plugin

* No need to pass it
* Remove direct usage of Addressable API
---
 Explorer/Assets/DCL/AssetsProvision/UI.meta   |  3 ++
 .../UI/AssetReferenceStyleSheet.cs            | 12 +++++
 .../UI/AssetReferenceStyleSheet.cs.meta       |  3 ++
 .../{ => UI}/AssetReferenceVisualTreeAsset.cs |  0
 .../AssetReferenceVisualTreeAsset.cs.meta     |  0
 .../DCL/AssetsProvision/UI/UIDocumentRef.cs   | 11 +++++
 .../AssetsProvision/UI/UIDocumentRef.cs.meta  |  3 ++
 .../DCL/PluginSystem/World/SceneUIPlugin.cs   | 46 ++++++++++++++-----
 .../World/World Plugins Container.asset       | 14 ++++++
 .../PlayMode/SDKAudioSourcesAutomatedTests.cs |  4 --
 .../Global/Dynamic/DynamicSceneLoader.cs      |  9 +---
 .../Global/Static/StaticSceneLauncher.cs      | 19 +-------
 .../Assets/Scripts/Global/StaticContainer.cs  |  6 +--
 .../Integration Tests World Container.asset   | 21 +++++++--
 .../Tests/PlayMode/IntegrationTestsSuite.cs   |  9 +---
 15 files changed, 104 insertions(+), 56 deletions(-)
 create mode 100644 Explorer/Assets/DCL/AssetsProvision/UI.meta
 create mode 100644 Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs
 create mode 100644 Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs.meta
 rename Explorer/Assets/DCL/AssetsProvision/{ => UI}/AssetReferenceVisualTreeAsset.cs (100%)
 rename Explorer/Assets/DCL/AssetsProvision/{ => UI}/AssetReferenceVisualTreeAsset.cs.meta (100%)
 create mode 100644 Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs
 create mode 100644 Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs.meta

diff --git a/Explorer/Assets/DCL/AssetsProvision/UI.meta b/Explorer/Assets/DCL/AssetsProvision/UI.meta
new file mode 100644
index 0000000000..41c0bec055
--- /dev/null
+++ b/Explorer/Assets/DCL/AssetsProvision/UI.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9e66e5e5c76b427fbb335117260d0289
+timeCreated: 1705051518
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs
new file mode 100644
index 0000000000..88f29f2ba9
--- /dev/null
+++ b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs
@@ -0,0 +1,12 @@
+using System;
+using UnityEngine.AddressableAssets;
+using UnityEngine.UIElements;
+
+namespace DCL.AssetsProvision
+{
+    [Serializable]
+    public class AssetReferenceStyleSheet : AssetReferenceT<StyleSheet>
+    {
+        public AssetReferenceStyleSheet(string guid) : base(guid) { }
+    }
+}
diff --git a/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs.meta b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs.meta
new file mode 100644
index 0000000000..61f9282090
--- /dev/null
+++ b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceStyleSheet.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9f91a84ac72a420681b157907459e265
+timeCreated: 1705051557
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/AssetsProvision/AssetReferenceVisualTreeAsset.cs b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceVisualTreeAsset.cs
similarity index 100%
rename from Explorer/Assets/DCL/AssetsProvision/AssetReferenceVisualTreeAsset.cs
rename to Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceVisualTreeAsset.cs
diff --git a/Explorer/Assets/DCL/AssetsProvision/AssetReferenceVisualTreeAsset.cs.meta b/Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceVisualTreeAsset.cs.meta
similarity index 100%
rename from Explorer/Assets/DCL/AssetsProvision/AssetReferenceVisualTreeAsset.cs.meta
rename to Explorer/Assets/DCL/AssetsProvision/UI/AssetReferenceVisualTreeAsset.cs.meta
diff --git a/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs b/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs
new file mode 100644
index 0000000000..d9792c7628
--- /dev/null
+++ b/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs
@@ -0,0 +1,11 @@
+using System;
+using UnityEngine.UIElements;
+
+namespace DCL.AssetsProvision
+{
+    [Serializable]
+    public class UIDocumentRef : ComponentReference<UIDocument>
+    {
+        public UIDocumentRef(string guid) : base(guid) { }
+    }
+}
diff --git a/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs.meta b/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs.meta
new file mode 100644
index 0000000000..7d7dfd7288
--- /dev/null
+++ b/Explorer/Assets/DCL/AssetsProvision/UI/UIDocumentRef.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1a31eca3a3704dfd8fa4155dbc0a4536
+timeCreated: 1705051604
\ No newline at end of file
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
index 98050e6072..fd78c55545 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
+++ b/Explorer/Assets/DCL/PluginSystem/World/SceneUIPlugin.cs
@@ -1,11 +1,16 @@
 using Arch.SystemGroups;
+using Cysharp.Threading.Tasks;
+using DCL.AssetsProvision;
 using DCL.Optimization.Pools;
 using DCL.PluginSystem.World.Dependencies;
 using DCL.SDKComponents.SceneUI.Components;
 using DCL.SDKComponents.SceneUI.Utils;
 using ECS.ComponentsPooling.Systems;
 using ECS.LifeCycle;
+using System;
 using System.Collections.Generic;
+using System.Threading;
+using UnityEngine;
 using UnityEngine.UIElements;
 using UITextInstantiationSystem = DCL.SDKComponents.SceneUI.Systems.UIText.UITextInstantiationSystem;
 using UITextReleaseSystem = DCL.SDKComponents.SceneUI.Systems.UIText.UITextReleaseSystem;
@@ -17,26 +22,31 @@
 
 namespace DCL.PluginSystem.World
 {
-    public class SceneUIPlugin : IDCLWorldPluginWithoutSettings
+    public class SceneUIPlugin : IDCLWorldPlugin<SceneUIPlugin.Settings>
     {
-        private readonly UIDocument canvas;
+        private UIDocument canvas;
+
         private readonly IComponentPoolsRegistry componentPoolsRegistry;
+        private readonly IAssetsProvisioner assetsProvisioner;
 
-        public SceneUIPlugin(
-            UIDocument canvas,
-            StyleSheet canvasStyleSheet,
-            ECSWorldSingletonSharedDependencies singletonSharedDependencies)
+        public SceneUIPlugin(ECSWorldSingletonSharedDependencies singletonSharedDependencies, IAssetsProvisioner assetsProvisioner)
         {
-            this.canvas = canvas;
-            this.canvas.rootVisualElement.styleSheets.Add(canvasStyleSheet);
-            this.canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
-            this.canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
-
+            this.assetsProvisioner = assetsProvisioner;
             componentPoolsRegistry = singletonSharedDependencies.ComponentPoolsRegistry;
             componentPoolsRegistry.AddComponentPool<VisualElement>(onRelease: UiElementUtils.ReleaseUIElement, maxSize: 200);
             componentPoolsRegistry.AddComponentPool<Label>(onRelease: UiElementUtils.ReleaseUIElement, maxSize: 100);
         }
 
+        public async UniTask InitializeAsync(Settings settings, CancellationToken ct)
+        {
+            canvas = (await assetsProvisioner.ProvideInstanceAsync(settings.Canvas, ct: ct)).Value;
+            StyleSheet scenesUIStyleSheet = (await assetsProvisioner.ProvideMainAssetAsync(settings.StyleSheet, ct)).Value;
+
+            canvas.rootVisualElement.styleSheets.Add(scenesUIStyleSheet);
+            canvas.rootVisualElement.AddToClassList("sceneUIMainCanvas");
+            canvas.rootVisualElement.pickingMode = PickingMode.Ignore;
+        }
+
         public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in ECSWorldInstanceSharedDependencies sharedDependencies, in PersistentEntities persistentEntities, List<IFinalizeWorldSystem> finalizeWorldSystems)
         {
             UITransformInstantiationSystem.InjectToWorld(ref builder, canvas, componentPoolsRegistry);
@@ -52,5 +62,19 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
         }
 
         public void InjectToEmptySceneWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in EmptyScenesWorldSharedDependencies dependencies) { }
+
+        public void Dispose() { }
+
+        [Serializable]
+        public class Settings : IDCLPluginSettings
+        {
+            [field: Header(nameof(SceneUIPlugin) + "." + nameof(Settings))]
+            [field: Space]
+            [field: SerializeField]
+            public UIDocumentRef Canvas { get; private set; } = null!;
+
+            [field: SerializeField]
+            public AssetReferenceStyleSheet StyleSheet { get; private set; } = null!;
+        }
     }
 }
diff --git a/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset b/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset
index 96a3db96ca..fa1d9aa575 100644
--- a/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset	
+++ b/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset	
@@ -16,6 +16,7 @@ MonoBehaviour:
   - rid: 6784895267130048515
   - rid: 1268264040174714880
   - rid: 7387084847885844480
+  - rid: 4753057106328551424
   references:
     version: 2
     RefIds:
@@ -26,6 +27,19 @@ MonoBehaviour:
         <RaycastFrameBudgetMs>k__BackingField: 3
         <PlayerOriginRaycastMaxDistance>k__BackingField: 200
         <GlobalInputPropagationBucketThreshold>k__BackingField: 3
+    - rid: 4753057106328551424
+      type: {class: SceneUIPlugin/Settings, ns: DCL.PluginSystem.World, asm: DCL.Plugins}
+      data:
+        <Canvas>k__BackingField:
+          m_AssetGUID: e0f5a4ab5d8f74640ae94adb6824bd45
+          m_SubObjectName: 
+          m_SubObjectType: 
+          m_EditorAssetChanged: 0
+        <StyleSheet>k__BackingField:
+          m_AssetGUID: 295cf8ad8d171d849863eccaf581c9e7
+          m_SubObjectName: 
+          m_SubObjectType: 
+          m_EditorAssetChanged: 0
     - rid: 6784895267130048515
       type: {class: MaterialsPlugin/Settings, ns: DCL.PluginSystem.World, asm: DCL.Plugins}
       data:
diff --git a/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs b/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
index 3a34b89120..eb4a0c9e52 100644
--- a/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
+++ b/Explorer/Assets/DCL/SDKComponents/AudioSources/Tests/PlayMode/SDKAudioSourcesAutomatedTests.cs
@@ -26,8 +26,6 @@ namespace DCL.SDKComponents.AudioSources.Tests.PlayMode
 {
     public class SDKAudioSourcesAutomatedTests
     {
-        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
-        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
         private const string TEST_SCENE = "Dance-floor";
         private const int TARGET_FPS = 60;
 
@@ -112,8 +110,6 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
             // First load the common global plugin
             (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(
                 globalSettingsContainer,
-                Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>(),
-                await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET),
                 web3IdentityCache,
                 ethereumApi,
                 ct);
diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
index 6f857b3d78..0cdbb43620 100644
--- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
+++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoader.cs
@@ -10,7 +10,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
 using UnityEngine.UIElements;
 using Utility;
 
@@ -21,9 +20,6 @@ namespace Global.Dynamic
     /// </summary>
     public class DynamicSceneLoader : MonoBehaviour
     {
-        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
-        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
-
         [Header("Settings")]
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
@@ -77,9 +73,6 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
         {
             try
             {
-                UIDocument? scenesUICanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-                StyleSheet? scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
                 var identityCache = new ProxyIdentityCache(new MemoryWeb3IdentityCache(),
                     new PlayerPrefsIdentityProvider(new PlayerPrefsIdentityProvider.DecentralandIdentityWithNethereumAccountJsonSerializer()));
 
@@ -96,7 +89,7 @@ private async UniTask InitializationFlowAsync(CancellationToken ct)
                 // First load the common global plugin
                 bool isLoaded;
 
-                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, scenesUICanvas, scenesUIStyleSheet, identityCache, web3VerifiedAuthenticator, ct);
+                (staticContainer, isLoaded) = await StaticContainer.CreateAsync(globalPluginSettingsContainer, identityCache, web3VerifiedAuthenticator, ct);
 
                 if (!isLoaded)
                 {
diff --git a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
index 385d758816..3f1da0ec08 100644
--- a/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
+++ b/Explorer/Assets/Scripts/Global/Static/StaticSceneLauncher.cs
@@ -9,8 +9,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.UIElements;
 
 namespace Global.Static
 {
@@ -19,9 +17,6 @@ namespace Global.Static
     /// </summary>
     public class StaticSceneLauncher : MonoBehaviour
     {
-        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
-        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
-
         [SerializeField] private SceneLauncher sceneLauncher;
         [SerializeField] private PluginSettingsContainer globalPluginSettingsContainer;
         [SerializeField] private PluginSettingsContainer scenePluginSettingsContainer;
@@ -50,9 +45,6 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
         {
             try
             {
-                UIDocument? scenesUICanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-                StyleSheet? scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
                 IWeb3IdentityCache identityCache;
 
                 if (useStoredCredentials
@@ -88,11 +80,8 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
 
                 SceneSharedContainer sceneSharedContainer;
 
-                scenesUIcanvas = Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-                scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
-
                 (staticContainer, sceneSharedContainer) = await InstallAsync(globalPluginSettingsContainer, scenePluginSettingsContainer,
-                    scenesUICanvas, scenesUIStyleSheet, identityCache, dappWeb3Authenticator, ct);
+                    identityCache, dappWeb3Authenticator, ct);
 
                 sceneLauncher.Initialize(sceneSharedContainer, destroyCancellationToken);
             }
@@ -108,16 +97,12 @@ public async UniTask InitializationFlowAsync(CancellationToken ct)
         public static async UniTask<(StaticContainer staticContainer, SceneSharedContainer sceneSharedContainer)> InstallAsync(
             IPluginSettingsContainer globalSettingsContainer,
             IPluginSettingsContainer sceneSettingsContainer,
-            UIDocument scenesUiRoot,
-            StyleSheet scenesUiStyleSheet,
             IWeb3IdentityCache web3IdentityProvider,
             IEthereumApi ethereumApi,
             CancellationToken ct)
         {
             // First load the common global plugin
-            (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(globalSettingsContainer,
-                scenesUiRoot, scenesUiStyleSheet,
-                web3IdentityProvider, ethereumApi, ct);
+            (StaticContainer staticContainer, bool isLoaded) = await StaticContainer.CreateAsync(globalSettingsContainer, web3IdentityProvider, ethereumApi, ct);
 
             if (!isLoaded)
                 GameReports.PrintIsDead();
diff --git a/Explorer/Assets/Scripts/Global/StaticContainer.cs b/Explorer/Assets/Scripts/Global/StaticContainer.cs
index e75a1c4ebc..4a2ce61dcc 100644
--- a/Explorer/Assets/Scripts/Global/StaticContainer.cs
+++ b/Explorer/Assets/Scripts/Global/StaticContainer.cs
@@ -10,7 +10,6 @@
 using DCL.PluginSystem.Global;
 using DCL.PluginSystem.World;
 using DCL.PluginSystem.World.Dependencies;
-using DCL.Profiles;
 using DCL.Profiling;
 using DCL.ResourcesUnloading;
 using DCL.Time;
@@ -21,7 +20,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
-using UnityEngine.UIElements;
 
 namespace Global
 {
@@ -99,8 +97,6 @@ await UniTask.WhenAll(
 
         public static async UniTask<(StaticContainer container, bool success)> CreateAsync(
             IPluginSettingsContainer settingsContainer,
-            UIDocument scenesUIDocument,
-            StyleSheet scenesUIStyleSheet,
             IWeb3IdentityCache web3IdentityProvider,
             IEthereumApi ethereumApi,
             CancellationToken ct)
@@ -164,7 +160,7 @@ await UniTask.WhenAll(
                 assetBundlePlugin,
                 new GltfContainerPlugin(sharedDependencies, container.CacheCleaner),
                 new InteractionPlugin(sharedDependencies, profilingProvider, exposedGlobalDataContainer.GlobalInputEvents),
-                new SceneUIPlugin(scenesUIDocument, scenesUIStyleSheet, sharedDependencies),
+                new SceneUIPlugin(sharedDependencies, addressablesProvisioner),
 #if UNITY_EDITOR
                 new GizmosWorldPlugin(),
 #endif
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/Integration Tests World Container.asset b/Explorer/Assets/Scripts/Global/Tests/PlayMode/Integration Tests World Container.asset
index 58cc3b3dc7..134aaf26cd 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/Integration Tests World Container.asset	
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/Integration Tests World Container.asset	
@@ -15,6 +15,7 @@ MonoBehaviour:
   settings:
   - rid: 6784895267130048516
   - rid: 1268264197252972545
+  - rid: 4753057106328551425
   references:
     version: 2
     RefIds:
@@ -24,12 +25,23 @@ MonoBehaviour:
         <RaycastBucketThreshold>k__BackingField: 3
         <RaycastFrameBudgetMs>k__BackingField: 3
         <PlayerOriginRaycastMaxDistance>k__BackingField: 200
+        <GlobalInputPropagationBucketThreshold>k__BackingField: 3
+    - rid: 4753057106328551425
+      type: {class: SceneUIPlugin/Settings, ns: DCL.PluginSystem.World, asm: DCL.Plugins}
+      data:
+        <Canvas>k__BackingField:
+          m_AssetGUID: e0f5a4ab5d8f74640ae94adb6824bd45
+          m_SubObjectName: 
+          m_SubObjectType: 
+          m_EditorAssetChanged: 0
+        <StyleSheet>k__BackingField:
+          m_AssetGUID: 295cf8ad8d171d849863eccaf581c9e7
+          m_SubObjectName: 
+          m_SubObjectType: 
+          m_EditorAssetChanged: 0
     - rid: 6784895267130048516
       type: {class: MaterialsPlugin/Settings, ns: DCL.PluginSystem.World, asm: DCL.Plugins}
       data:
-        <LoadingAttemptsCount>k__BackingField: 6
-        <PoolInitialCapacity>k__BackingField: 256
-        <PoolMaxSize>k__BackingField: 2048
         basicMaterial:
           m_AssetGUID: 0009549658aa1be40bbed401477fbd48
           m_SubObjectName: 
@@ -40,3 +52,6 @@ MonoBehaviour:
           m_SubObjectName: 
           m_SubObjectType: 
           m_EditorAssetChanged: 0
+        <LoadingAttemptsCount>k__BackingField: 6
+        <PoolInitialCapacity>k__BackingField: 256
+        <PoolMaxSize>k__BackingField: 2048
diff --git a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
index 6ee5c9145d..f74b06de6b 100644
--- a/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
+++ b/Explorer/Assets/Scripts/Global/Tests/PlayMode/IntegrationTestsSuite.cs
@@ -5,9 +5,7 @@
 using Global.Static;
 using NSubstitute;
 using System.Threading;
-using UnityEngine;
 using UnityEngine.AddressableAssets;
-using UnityEngine.UIElements;
 
 namespace Global.Tests
 {
@@ -15,18 +13,13 @@ public static class IntegrationTestsSuite
     {
         private const string GLOBAL_CONTAINER_ADDRESS = "Integration Tests Global Container";
         private const string WORLD_CONTAINER_ADDRESS = "Integration Tests World Container";
-        private const string SCENES_UI_ROOT_CANVAS = "ScenesUIRootCanvas";
-        private const string SCENES_UI_STYLE_SHEET = "ScenesUIStyleSheet";
 
         public static async UniTask<(StaticContainer staticContainer, SceneSharedContainer sceneSharedContainer)> CreateStaticContainer()
         {
             PluginSettingsContainer globalSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(GLOBAL_CONTAINER_ADDRESS);
             PluginSettingsContainer sceneSettingsContainer = await Addressables.LoadAssetAsync<PluginSettingsContainer>(WORLD_CONTAINER_ADDRESS);
-            UIDocument scenesUIRootCanvas = Object.Instantiate(await Addressables.LoadAssetAsync<GameObject>(SCENES_UI_ROOT_CANVAS)).GetComponent<UIDocument>();
-            StyleSheet scenesUIStyleSheet = await Addressables.LoadAssetAsync<StyleSheet>(SCENES_UI_STYLE_SHEET);
 
-            return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer,
-                scenesUIRootCanvas, scenesUIStyleSheet, Substitute.For<IWeb3IdentityCache>(), Substitute.For<IEthereumApi>(), CancellationToken.None);
+            return await StaticSceneLauncher.InstallAsync(globalSettingsContainer, sceneSettingsContainer, Substitute.For<IWeb3IdentityCache>(), Substitute.For<IEthereumApi>(), CancellationToken.None);
         }
     }
 }

From 99b853e7c6bd6701136ca16d66d3c93ea41bb444 Mon Sep 17 00:00:00 2001
From: Mikhail Agapov <mikhail.agapov@decentraland.org>
Date: Fri, 12 Jan 2024 12:43:54 +0300
Subject: [PATCH 54/54] Commit namespace provider settings

---
 Explorer/AssetsProvision.csproj.DotSettings | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Explorer/AssetsProvision.csproj.DotSettings

diff --git a/Explorer/AssetsProvision.csproj.DotSettings b/Explorer/AssetsProvision.csproj.DotSettings
new file mode 100644
index 0000000000..07c41eff02
--- /dev/null
+++ b/Explorer/AssetsProvision.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdcl_005Cassetsprovision_005Cui/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file