lorenzo-ranciaffi · Sep 4, 2026 · Aug 29, 2026 · Aug 29, 2026 · Aug 29, 2026 · Aug 29, 2026
@@ -1,13 +1,9 @@
 using Cysharp.Threading.Tasks;
-using DCL.AvatarRendering.Loading.Components;
-using DCL.AvatarRendering.Thumbnails.Utils;
 using DCL.AvatarRendering.Wearables.Components;
 using DCL.Backpack;
 using DCL.Ipfs;
-using JetBrains.Annotations;
 using MVC;
 using System.Threading;
-using UnityEngine;
 
 namespace Runtime.Wearables
 {
@@ -19,7 +15,7 @@ public class SmartWearableAuthorizationPopupController :  ControllerBase<SmartWe
         private readonly NftTypeIconSO categoryIcons;
 
         public SmartWearableAuthorizationPopupController(
-            [NotNull] ViewFactoryMethod viewFactory,
+            ViewFactoryMethod viewFactory,
             SmartWearableCache smartWearableCache,
             NftTypeIconSO rarityBackgrounds,
             NFTColorsSO rarityColors,
@@ -59,20 +55,24 @@ protected override void OnViewShow()
             base.OnViewShow();
 
             var wearable = inputData.Wearable;
-            var thumbnail = ((IAvatarAttachment)wearable).ThumbnailAssetResult?.Asset.Sprite;
+            var thumbnail = wearable.ThumbnailAssetResult?.Asset.Sprite;
             var rarityBackground = rarityBackgrounds.GetTypeImage(wearable.GetRarity());
             var rarityColor = rarityColors.GetColor(wearable.GetRarity());
             var categoryIcon = categoryIcons.GetTypeImage(wearable.GetCategory());
-            viewInstance.Setup(wearable.GetName(), thumbnail, rarityBackground, rarityColor, categoryIcon);
+            viewInstance!.Setup(wearable.GetName(), thumbnail, rarityBackground, rarityColor, categoryIcon);
 
             UpdatePermissionsAsync(wearable).Forget();
         }
 
         private async UniTask UpdatePermissionsAsync(IWearable wearable)
         {
-            (_, SceneMetadata sceneMetadata) = await smartWearableCache.GetCachedSceneInfoAsync(wearable, CancellationToken.None);
+            (_, SceneMetadata? sceneMetadata) = await smartWearableCache.GetCachedSceneInfoAsync(wearable, CancellationToken.None);
+
+            if (sceneMetadata == null)
+                return;
+
             await UniTask.SwitchToMainThread();
-            viewInstance.SetPermissions(sceneMetadata.requiredPermissions);
+            viewInstance!.SetPermissions(sceneMetadata.requiredPermissions);
         }
 
         public static async UniTask<bool> RequestAuthorizationAsync(IMVCManager mvcManager, IWearable wearable, CancellationToken ct)

@@ -53,7 +53,7 @@ public async UniTask WaitChoiceAsync()
             await UniTask.WhenAny(AuthorizeButton.OnClickAsync(), DenyButton.OnClickAsync());
         }
 
-        public void Setup(string wearableName, Sprite thumbnail, Sprite rarityBackground, Color rarityColor, Sprite categoryIcon)
+        public void Setup(string wearableName, Sprite? thumbnail, Sprite rarityBackground, Color rarityColor, Sprite categoryIcon)
         {
             PromptText.text = string.Format(PromptFormat, wearableName);
             WearableThumbnail.sprite = thumbnail;

@@ -1,6 +1,7 @@
 using Cysharp.Threading.Tasks;
 using DCL.Chat.History;
 using DCL.Diagnostics;
+using DCL.FeatureFlags;
 using DCL.Friends;
 using DCL.Friends.UserBlocking;
 using DCL.Multiplayer.Connections.RoomHubs;
@@ -113,6 +114,10 @@ public async UniTask InitializeAsync(CancellationToken ct)
             {
                 await rpcChatPrivacyService.GetOwnSocialSettingsAsync(cts.Token);
 
+                // The chat room is never connected in local scene development (see CommsContainer); waiting would just burn the timeout.
+                if (FeaturesRegistry.Instance.IsEnabled(FeatureId.LocalSceneDevelopment))
+                    return;
+
                 await UniTask.WaitUntil(() =>
                     chatRoom.Info.ConnectionState == LKConnectionState.ConnConnected, cancellationToken: cts.Token)
                              .Timeout(TimeSpan.FromMinutes(TIMEOUT_FRIENDS_CONTAINER_MINUTES));

@@ -165,7 +165,9 @@ public static CommsContainer Create(
                 roomHub = new RoomHub(
                         localSceneDevelopment ? IConnectiveRoom.Null.INSTANCE : archipelagoIslandRoom,
                         gateKeeperSceneRoom,
-                        chatRoom,
+
+                        // Friends is disabled in local scene development, so DMs delivered over the chat room would be unanswerable
+                        localSceneDevelopment ? IConnectiveRoom.Null.INSTANCE : chatRoom,
                         voiceChatRoom
                         );
             }

@@ -825,6 +825,8 @@ await MapRendererContainer
                     uiShellContainer.MvcManager,
                     bootstrapContainer.DecentralandUrlsSource));
 
+            globalPlugins.Add(new AnalyticsDiskFullPopupPlugin(bootstrapContainer.Analytics.EventBus, uiShellContainer.MvcManager));
+
             // ReSharper disable once MethodHasAsyncOverloadWithCancellation
             if (FeaturesRegistry.Instance.IsEnabled(FeatureId.VoiceChat))
                 globalPlugins.Add(

@@ -14,6 +14,9 @@ namespace SceneRuntime.Apis.Modules.Ethereums
 {
     public class EthereumApiWrapper : JsApiWrapper
     {
+        // JSON-RPC 2.0 "Method not found": https://www.jsonrpc.org/specification#error_object
+        private const long JSON_RPC_METHOD_NOT_FOUND = -32601;
+
         private readonly IEthereumApi ethereumApi;
         private readonly ISceneExceptionsHandler sceneExceptionsHandler;
         private readonly IWeb3IdentityCache web3IdentityCache;
@@ -76,7 +79,7 @@ async UniTask<SignMessageResponse> RequestPersonalSignatureAsync(CancellationTok
                         },
                     }, Web3RequestSource.SdkScene, ct);
 
-                    return new SignMessageResponse(hex, message, (string)response.result);
+                    return new SignMessageResponse(hex, message, (string?)response.result ?? string.Empty);
                 }
                 catch (Exception e)
                 {
@@ -91,10 +94,10 @@ async UniTask<SignMessageResponse> RequestPersonalSignatureAsync(CancellationTok
         [PublicAPI("Used by StreamingAssets/Js/Modules/EthereumController.js")]
         public object SendAsync(double id, string method, string jsonParams)
         {
-            return SendAndFormatAsync(id, method, JsonConvert.DeserializeObject<object[]>(jsonParams) ?? Array.Empty<object>(), sendCancellationToken.Token)
+            return SendAndFormatAsync(JsonConvert.DeserializeObject<object[]>(jsonParams) ?? Array.Empty<object>(), sendCancellationToken.Token)
                .ToDisconnectedPromise(this);
 
-            async UniTask<SendEthereumMessageResponse> SendAndFormatAsync(double id, string method, object[] @params, CancellationToken ct)
+            async UniTask<SendEthereumMessageResponse> SendAndFormatAsync(object[] @params, CancellationToken ct)
             {
                 try
                 {
@@ -110,6 +113,24 @@ async UniTask<SendEthereumMessageResponse> SendAndFormatAsync(double id, string
                         jsonAnyResponse = JsonConvert.SerializeObject(result),
                     };
                 }
+                catch (Web3MethodNotAllowedException e)
+                {
+                    // Not an engine fault: OnEngineException would report it to Sentry and can suspend the scene on repeated calls
+                    return new SendEthereumMessageResponse
+                    {
+                        jsonAnyResponse = JsonConvert.SerializeObject(new EthApiResponse
+                        {
+                            id = (long)id,
+                            jsonrpc = "2.0",
+                            result = null,
+                            error = new EthApiError
+                            {
+                                code = JSON_RPC_METHOD_NOT_FOUND,
+                                message = e.Message,
+                            },
+                        }),
+                    };
+                }
                 catch (Exception e)
                 {
                     sceneExceptionsHandler.OnEngineException(e);

@@ -0,0 +1,5 @@
+namespace Utility
+{
+    /// <summary>Lives in Utility rather than DCL.Analytics so UI-layer subscribers need no dependency on the analytics assembly.</summary>
+    public readonly struct AnalyticsDiskFullDetected { }
+}
@@ -11,6 +11,7 @@
 using System;
 using System.Threading;
 using UnityEngine;
+using Utility;
 
 namespace DCL.PerformanceAndDiagnostics.Analytics
 {
@@ -25,6 +26,9 @@ public class AnalyticsContainer : DCLGlobalContainer<AnalyticsContainer.Settings
 
         public EntitiesAnalytics EntitiesAnalytics { get; private set; } = null!;
 
+        /// <summary>Decouples analytics-originated events from their UI subscribers, which are created long after this container.</summary>
+        public IEventBus EventBus { get; } = new EventBus(invokeSubscribersOnMainThread: true);
+
         public static async UniTask<AnalyticsContainer> CreateAsync(
             IAppArgs appArgs,
             IWeb3IdentityCache identityCache,
@@ -48,6 +52,7 @@ await container.InitializeContainerAsync<AnalyticsContainer, Settings>(settingsC
                         launcherTraits,
                         appArgs,
                         realmLaunchSettings.CurrentMode is LaunchMode.LocalSceneDevelopment,
+                        container.EventBus,
                         ct);
 
                     var analyticsController = new AnalyticsController(service, appArgs, container.settings.AnalyticsConfig, launcherTraits, installSource, dclVersion, identityCache?.Identity);
@@ -66,26 +71,26 @@ await container.InitializeContainerAsync<AnalyticsContainer, Settings>(settingsC
             return container;
         }
 
-        private static IAnalyticsService CreateAnalyticsService(AnalyticsConfiguration analyticsConfig, LauncherTraits launcherTraits, IAppArgs args, bool isLocalSceneDevelopment, CancellationToken token)
+        private static IAnalyticsService CreateAnalyticsService(AnalyticsConfiguration analyticsConfig, LauncherTraits launcherTraits, IAppArgs args, bool isLocalSceneDevelopment, IEventBus eventBus, CancellationToken token)
         {
             // Avoid Segment analytics for: Unity Editor or Debug Mode (except when in Local Scene Development mode)
 
             if (!Application.isEditor && (!args.HasDebugFlag() || isLocalSceneDevelopment))
-                return CreateSegmentAnalyticsOrFallbackToDebug(analyticsConfig, launcherTraits, token);
+                return CreateSegmentAnalyticsOrFallbackToDebug(analyticsConfig, launcherTraits, eventBus, token);
 
             return analyticsConfig.Mode switch
                    {
-                       AnalyticsMode.Segment => CreateSegmentAnalyticsOrFallbackToDebug(analyticsConfig, launcherTraits, token),
+                       AnalyticsMode.Segment => CreateSegmentAnalyticsOrFallbackToDebug(analyticsConfig, launcherTraits, eventBus, token),
                        AnalyticsMode.DebugLog => new DebugAnalyticsService(),
                        AnalyticsMode.Disabled => throw new InvalidOperationException("Trying to create analytics when it is disabled"),
                        _ => throw new ArgumentOutOfRangeException(),
                    };
         }
 
-        private static IAnalyticsService CreateSegmentAnalyticsOrFallbackToDebug(AnalyticsConfiguration analyticsConfig, LauncherTraits launcherTraits, CancellationToken token)
+        private static IAnalyticsService CreateSegmentAnalyticsOrFallbackToDebug(AnalyticsConfiguration analyticsConfig, LauncherTraits launcherTraits, IEventBus eventBus, CancellationToken token)
         {
             if (analyticsConfig.TryGetSegmentConfiguration(out Configuration segmentConfiguration))
-                return new RustSegmentAnalyticsService(segmentConfiguration.WriteKey!, launcherTraits.LauncherAnonymousId)
+                return new RustSegmentAnalyticsService(segmentConfiguration.WriteKey!, launcherTraits.LauncherAnonymousId, eventBus)
                    .WithTimeFlush(TimeSpan.FromSeconds(analyticsConfig.FlushInterval), token);
 
             // Fall back to debug if segment is not configured

@@ -45,6 +45,7 @@ public void ResetFilters(bool invokeEvents = true)
         {
             sortContentDeselectable.gameObject.SetActive(true);
 
+            // The default sort toggle must match PlacesView.ResetCurrentFilters
             if (invokeEvents)
             {
                 sortByMostActive.isOn = true;

@@ -0,0 +1,70 @@
+using Arch.SystemGroups;
+using Cysharp.Threading.Tasks;
+using DCL.Diagnostics;
+using DCL.UI;
+using DCL.UI.ErrorPopup;
+using DCL.Utilities.Extensions;
+using DCL.Utility.Types;
+using MVC;
+using System;
+using System.Threading;
+using UnityEngine;
+using Utility;
+
+namespace DCL.PluginSystem.Global
+{
+    public class AnalyticsDiskFullPopupPlugin : IDCLGlobalPluginWithoutSettings
+    {
+        private readonly IEventBus analyticsEventBus;
+        private readonly IMVCManager mvcManager;
+        private readonly CancellationTokenSource cts = new ();
+        private IDisposable? subscription;
+
+        // The event repeats with every failing flush; the popup must show once per session
+        private bool popupShown;
+
+        public AnalyticsDiskFullPopupPlugin(IEventBus analyticsEventBus, IMVCManager mvcManager)
+        {
+            this.analyticsEventBus = analyticsEventBus;
+            this.mvcManager = mvcManager;
+        }
+
+        public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder, in GlobalPluginArguments arguments) { }
+
+        public UniTask InitializeAsync(NoExposedPluginSettings settings, CancellationToken ct)
+        {
+            subscription = analyticsEventBus.Subscribe<AnalyticsDiskFullDetected>(OnDiskFull);
+            return UniTask.CompletedTask;
+        }
+
+        private void OnDiskFull(AnalyticsDiskFullDetected evt)
+        {
+            if (popupShown)
+                return;
+
+            popupShown = true;
+            ShowPopupAsync(cts.Token).Forget();
+        }
+
+        private async UniTaskVoid ShowPopupAsync(CancellationToken ct)
+        {
+            var data = new ErrorPopupData(
+                UIProperty<Sprite>.UseDefault,
+                UIProperty<string>.From("Storage Full"),
+                UIProperty<string>.From("Your device is running out of disk space. Free up space to keep Decentraland working correctly."));
+
+            EnumResult<TaskError> result = await mvcManager.ShowAsync(new ShowCommand<ErrorPopupView, ErrorPopupData>(data), ct)
+                                                           .SuppressToResultAsync(ReportCategory.ANALYTICS);
+
+            // A show that failed never reached the user, so the next disk-full event may retry
+            if (result.Error is { State: not TaskError.Cancelled })
+                popupShown = false;
+        }
+
+        public void Dispose()
+        {
+            subscription?.Dispose();
+            cts.SafeCancelAndDispose();
+        }
+    }
+}