From 44c3756ab535b0a7e81ef64c6dda572805a01eae Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 09:38:59 -0700
Subject: [PATCH 01/54] chore(demo): prepare demo app for Appium E2E tests

---
 examples/demo/.env.example                    |   3 +
 .../demo/Assets/Scripts/AppBootstrapper.cs    |  22 ++-
 .../Assets/Scripts/Models/NotificationType.cs |   1 +
 .../demo/Assets/Scripts/Repositories.meta     |   8 --
 .../Repositories/OneSignalRepository.cs       | 131 ------------------
 .../Repositories/OneSignalRepository.cs.meta  |   2 -
 .../demo/Assets/Scripts/Services/DotEnv.cs    |  78 +++++++++++
 .../Assets/Scripts/Services/DotEnv.cs.meta    |   2 +
 .../Scripts/Services/OneSignalApiService.cs   | 100 ++++++-------
 .../Scripts/Services/PreferencesService.cs    |   7 -
 .../UI/Dialogs/CustomNotificationDialog.cs    |   6 +-
 .../Assets/Scripts/UI/Dialogs/LoginDialog.cs  |   2 +-
 .../Scripts/UI/Dialogs/TrackEventDialog.cs    |   6 +-
 .../Assets/Scripts/UI/HomeScreenController.cs |  10 +-
 ...er.cs => CustomEventsSectionController.cs} |   8 +-
 .../CustomEventsSectionController.cs.meta     |   2 +
 .../UI/Sections/InAppSectionController.cs     |   2 +-
 .../LiveActivitiesSectionController.cs        |   2 +-
 .../UI/Sections/PushSectionController.cs      |   4 +-
 .../UI/Sections/SendIamSectionController.cs   |   8 +-
 .../UI/Sections/SendPushSectionController.cs  |  16 ++-
 .../UI/Sections/TagsSectionController.cs      |   4 +-
 .../TrackEventSectionController.cs.meta       |   2 -
 .../UI/Sections/TriggersSectionController.cs  |   8 +-
 .../UI/Sections/UserSectionController.cs      |   8 +-
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 122 ++++++++--------
 26 files changed, 247 insertions(+), 317 deletions(-)
 delete mode 100644 examples/demo/Assets/Scripts/Repositories.meta
 delete mode 100644 examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs
 delete mode 100644 examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs.meta
 create mode 100644 examples/demo/Assets/Scripts/Services/DotEnv.cs
 create mode 100644 examples/demo/Assets/Scripts/Services/DotEnv.cs.meta
 rename examples/demo/Assets/Scripts/UI/Sections/{TrackEventSectionController.cs => CustomEventsSectionController.cs} (82%)
 create mode 100644 examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs.meta
 delete mode 100644 examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs.meta

diff --git a/examples/demo/.env.example b/examples/demo/.env.example
index 674a938f..b0c98cee 100644
--- a/examples/demo/.env.example
+++ b/examples/demo/.env.example
@@ -1 +1,4 @@
+# Default App ID (used when ONESIGNAL_APP_ID is empty or missing): 77e32082-ea27-42e3-a898-c72e141824ef
+ONESIGNAL_APP_ID=your-onesignal-app-id
 ONESIGNAL_API_KEY=your_rest_api_key
+E2E_MODE=false
diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index 71f68141..8204f64b 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -1,4 +1,3 @@
-using OneSignalDemo.Repositories;
 using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
 using OneSignalSDK;
@@ -12,7 +11,8 @@ namespace OneSignalDemo
 {
     public class AppBootstrapper : MonoBehaviour
     {
-        private const string OneSignalAppId = "77e32082-ea27-42e3-a898-c72e141824ef";
+        private const string DefaultAppId = "77e32082-ea27-42e3-a898-c72e141824ef";
+        private const string PlaceholderAppId = "your-onesignal-app-id";
         private const string Tag = "AppBootstrapper";
 
         [SerializeField]
@@ -20,7 +20,6 @@ public class AppBootstrapper : MonoBehaviour
 
         private PreferencesService _prefs;
         private OneSignalApiService _apiService;
-        private OneSignalRepository _repository;
 
         private void Awake()
         {
@@ -29,19 +28,18 @@ private void Awake()
 
         private async void Start()
         {
+            DotEnv.Load();
+
             _prefs = new PreferencesService();
             _apiService = new OneSignalApiService();
-            _repository = new OneSignalRepository(_apiService);
 
-            var appId = _prefs.AppId;
-            if (string.IsNullOrEmpty(appId))
-            {
-                appId = OneSignalAppId;
-                _prefs.AppId = appId;
-            }
+            var envAppId = DotEnv.Get("ONESIGNAL_APP_ID");
+            var appId =
+                string.IsNullOrWhiteSpace(envAppId) || envAppId == PlaceholderAppId
+                    ? DefaultAppId
+                    : envAppId;
 
             _apiService.SetAppId(appId);
-            _apiService.LoadApiKey();
 
             OneSignal.Debug.LogLevel = LogLevel.Verbose;
             OneSignal.ConsentRequired = _prefs.ConsentRequired;
@@ -63,7 +61,7 @@ private async void Start()
 
             RegisterSdkListeners();
 
-            _viewModel.Init(_repository, _prefs);
+            _viewModel.Init(_prefs, _apiService);
             _viewModel.LoadInitialState();
             await _viewModel.LoadInitialDataAsync();
 
diff --git a/examples/demo/Assets/Scripts/Models/NotificationType.cs b/examples/demo/Assets/Scripts/Models/NotificationType.cs
index c8810a39..b760ce0e 100644
--- a/examples/demo/Assets/Scripts/Models/NotificationType.cs
+++ b/examples/demo/Assets/Scripts/Models/NotificationType.cs
@@ -4,6 +4,7 @@ public enum NotificationType
     {
         Simple,
         WithImage,
+        WithSound,
         Custom,
     }
 }
diff --git a/examples/demo/Assets/Scripts/Repositories.meta b/examples/demo/Assets/Scripts/Repositories.meta
deleted file mode 100644
index 5b2a5fbf..00000000
--- a/examples/demo/Assets/Scripts/Repositories.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0068a692b631446fc90e311f87a661b9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs b/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs
deleted file mode 100644
index 82b74433..00000000
--- a/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using OneSignalDemo.Models;
-using OneSignalDemo.Services;
-using OneSignalSDK;
-
-namespace OneSignalDemo.Repositories
-{
-    public class OneSignalRepository
-    {
-        private readonly OneSignalApiService _apiService;
-
-        public OneSignalRepository(OneSignalApiService apiService)
-        {
-            _apiService = apiService;
-        }
-
-        public void LoginUser(string externalUserId) => OneSignal.Login(externalUserId);
-
-        public void LogoutUser() => OneSignal.Logout();
-
-        public void AddAlias(string label, string id) => OneSignal.User.AddAlias(label, id);
-
-        public void AddAliases(Dictionary<string, string> aliases) =>
-            OneSignal.User.AddAliases(aliases);
-
-        public void AddEmail(string email) => OneSignal.User.AddEmail(email);
-
-        public void RemoveEmail(string email) => OneSignal.User.RemoveEmail(email);
-
-        public void AddSms(string smsNumber) => OneSignal.User.AddSms(smsNumber);
-
-        public void RemoveSms(string smsNumber) => OneSignal.User.RemoveSms(smsNumber);
-
-        public void AddTag(string key, string value) => OneSignal.User.AddTag(key, value);
-
-        public void AddTags(Dictionary<string, string> tags) => OneSignal.User.AddTags(tags);
-
-        public void RemoveTag(string key) => OneSignal.User.RemoveTag(key);
-
-        public void RemoveTags(List<string> keys) => OneSignal.User.RemoveTags(keys.ToArray());
-
-        public Dictionary<string, string> GetTags() => OneSignal.User.GetTags();
-
-        public void AddTrigger(string key, string value) =>
-            OneSignal.InAppMessages.AddTrigger(key, value);
-
-        public void AddTriggers(Dictionary<string, string> triggers) =>
-            OneSignal.InAppMessages.AddTriggers(triggers);
-
-        public void RemoveTrigger(string key) => OneSignal.InAppMessages.RemoveTrigger(key);
-
-        public void RemoveTriggers(List<string> keys) =>
-            OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
-
-        public void ClearTriggers() => OneSignal.InAppMessages.ClearTriggers();
-
-        public void SendOutcome(string name) => OneSignal.Session.AddOutcome(name);
-
-        public void SendUniqueOutcome(string name) => OneSignal.Session.AddUniqueOutcome(name);
-
-        public void SendOutcomeWithValue(string name, float value) =>
-            OneSignal.Session.AddOutcomeWithValue(name, value);
-
-        public string GetPushSubscriptionId() => OneSignal.User.PushSubscription.Id;
-
-        public bool IsPushOptedIn() => OneSignal.User.PushSubscription.OptedIn;
-
-        public void OptInPush() => OneSignal.User.PushSubscription.OptIn();
-
-        public void OptOutPush() => OneSignal.User.PushSubscription.OptOut();
-
-        public void ClearAllNotifications() => OneSignal.Notifications.ClearAllNotifications();
-
-        public bool HasPermission() => OneSignal.Notifications.Permission;
-
-        public Task<bool> RequestPermissionAsync(bool fallbackToSettings) =>
-            OneSignal.Notifications.RequestPermissionAsync(fallbackToSettings);
-
-        public void SetInAppMessagesPaused(bool paused) => OneSignal.InAppMessages.Paused = paused;
-
-        public bool IsInAppMessagesPaused() => OneSignal.InAppMessages.Paused;
-
-        public void SetLocationShared(bool shared) => OneSignal.Location.IsShared = shared;
-
-        public bool IsLocationShared() => OneSignal.Location.IsShared;
-
-        public void RequestLocationPermission() => OneSignal.Location.RequestPermission();
-
-        public void SetConsentRequired(bool required) => OneSignal.ConsentRequired = required;
-
-        public void SetConsentGiven(bool granted) => OneSignal.ConsentGiven = granted;
-
-        public string GetExternalId() => OneSignal.User.ExternalId;
-
-        public string GetOnesignalId() => OneSignal.User.OneSignalId;
-
-        public void TrackEvent(string name, Dictionary<string, object> properties = null) =>
-            OneSignal.User.TrackEvent(name, properties);
-
-        public async Task<bool> SendNotification(NotificationType type)
-        {
-            var subId = GetPushSubscriptionId();
-            return await _apiService.SendNotification(type, subId);
-        }
-
-        public async Task<bool> SendCustomNotification(string title, string body)
-        {
-            var subId = GetPushSubscriptionId();
-            return await _apiService.SendCustomNotification(title, body, subId);
-        }
-
-        public async Task<UserData> FetchUser(string onesignalId) =>
-            await _apiService.FetchUser(onesignalId);
-
-        public bool HasApiKey() => _apiService.HasApiKey();
-
-        public void StartDefaultLiveActivity(
-            string activityId,
-            IDictionary<string, object> attributes,
-            IDictionary<string, object> content
-        ) => OneSignal.LiveActivities.StartDefault(activityId, attributes, content);
-
-        public async Task<bool> UpdateLiveActivity(
-            string activityId,
-            string eventType,
-            JObject eventUpdates = null
-        ) => await _apiService.UpdateLiveActivity(activityId, eventType, eventUpdates);
-    }
-}
diff --git a/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs.meta b/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs.meta
deleted file mode 100644
index 2583b6ec..00000000
--- a/examples/demo/Assets/Scripts/Repositories/OneSignalRepository.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: af7149b19604643618be0ff85429fdf7
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/Services/DotEnv.cs b/examples/demo/Assets/Scripts/Services/DotEnv.cs
new file mode 100644
index 00000000..06c68c40
--- /dev/null
+++ b/examples/demo/Assets/Scripts/Services/DotEnv.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+namespace OneSignalDemo.Services
+{
+    /// <summary>Loads key/value pairs from the demo's .env file (StreamingAssets in players, project root in editor).</summary>
+    public static class DotEnv
+    {
+        private static readonly Dictionary<string, string> _values = new();
+        private static bool _loaded;
+
+        public static void Load()
+        {
+            if (_loaded)
+                return;
+            _loaded = true;
+
+            try
+            {
+                var content = ReadEnvContent();
+                if (string.IsNullOrEmpty(content))
+                    return;
+
+                foreach (var line in content.Split('\n'))
+                {
+                    var trimmed = line.Trim();
+                    if (trimmed.Length == 0 || trimmed.StartsWith("#") || !trimmed.Contains("="))
+                        continue;
+
+                    var eqIndex = trimmed.IndexOf('=');
+                    var key = trimmed.Substring(0, eqIndex).Trim();
+                    var value = trimmed.Substring(eqIndex + 1).Trim();
+
+                    int commentIdx = value.IndexOf('#');
+                    if (commentIdx >= 0)
+                        value = value.Substring(0, commentIdx).Trim();
+
+                    if (
+                        value.Length >= 2
+                        && (
+                            (value[0] == '"' && value[value.Length - 1] == '"')
+                            || (value[0] == '\'' && value[value.Length - 1] == '\'')
+                        )
+                    )
+                        value = value.Substring(1, value.Length - 2);
+
+                    _values[key] = value;
+                }
+            }
+            catch (Exception)
+            {
+                // .env not bundled or unreadable -- keys remain empty
+            }
+        }
+
+        public static string Get(string key) =>
+            _values.TryGetValue(key, out var value) ? value : "";
+
+        public static bool IsE2EMode =>
+            string.Equals(Get("E2E_MODE"), "true", StringComparison.OrdinalIgnoreCase);
+
+        private static string ReadEnvContent()
+        {
+#if UNITY_EDITOR
+            var editorPath = Path.Combine(Application.dataPath, "..", ".env");
+            if (File.Exists(editorPath))
+                return File.ReadAllText(editorPath);
+#endif
+            var streamingPath = Path.Combine(Application.streamingAssetsPath, ".env");
+            if (File.Exists(streamingPath))
+                return File.ReadAllText(streamingPath);
+
+            return null;
+        }
+    }
+}
diff --git a/examples/demo/Assets/Scripts/Services/DotEnv.cs.meta b/examples/demo/Assets/Scripts/Services/DotEnv.cs.meta
new file mode 100644
index 00000000..478c2577
--- /dev/null
+++ b/examples/demo/Assets/Scripts/Services/DotEnv.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0fbac43cdfb045fd9aaafd0d5088a6de
diff --git a/examples/demo/Assets/Scripts/Services/OneSignalApiService.cs b/examples/demo/Assets/Scripts/Services/OneSignalApiService.cs
index 5ad84aad..8112c1e1 100644
--- a/examples/demo/Assets/Scripts/Services/OneSignalApiService.cs
+++ b/examples/demo/Assets/Scripts/Services/OneSignalApiService.cs
@@ -1,10 +1,8 @@
 using System;
-using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using OneSignalDemo.Models;
-using UnityEngine;
 using UnityEngine.Networking;
 
 namespace OneSignalDemo.Services
@@ -12,7 +10,6 @@ namespace OneSignalDemo.Services
     public class OneSignalApiService
     {
         private string _appId;
-        private string _apiKey;
 
         private const string NotificationImageUrl =
             "https://media.onesignal.com/automated_push_templates/ratings_template.png";
@@ -23,38 +20,13 @@ public class OneSignalApiService
 
         public string GetAppId() => _appId;
 
-        public void LoadApiKey()
+        public bool HasApiKey()
         {
-            var envPath = Path.Combine(Application.dataPath, "..", ".env");
-#if !UNITY_EDITOR
-            var streamingPath = Path.Combine(Application.streamingAssetsPath, ".env");
-            if (File.Exists(streamingPath))
-                envPath = streamingPath;
-#endif
-            if (!File.Exists(envPath))
-                return;
-
-            foreach (var line in File.ReadAllLines(envPath))
-            {
-                var trimmed = line.Trim();
-                if (trimmed.StartsWith("#") || !trimmed.Contains("="))
-                    continue;
-
-                var eqIndex = trimmed.IndexOf('=');
-                var key = trimmed.Substring(0, eqIndex).Trim();
-                var value = trimmed.Substring(eqIndex + 1).Trim();
-                int commentIdx = value.IndexOf('#');
-                if (commentIdx >= 0)
-                    value = value.Substring(0, commentIdx).Trim();
-                value = value.Trim('"', '\'');
-
-                if (key == "ONESIGNAL_API_KEY")
-                    _apiKey = value;
-            }
+            var key = DotEnv.Get("ONESIGNAL_API_KEY");
+            return !string.IsNullOrWhiteSpace(key) && key != PlaceholderApiKey;
         }
 
-        public bool HasApiKey() =>
-            !string.IsNullOrEmpty(_apiKey) && _apiKey != PlaceholderApiKey;
+        private static string GetApiKey() => DotEnv.Get("ONESIGNAL_API_KEY");
 
         public async Task<bool> SendNotification(NotificationType type, string subscriptionId)
         {
@@ -63,6 +35,8 @@ public async Task<bool> SendNotification(NotificationType type, string subscript
 
             string title,
                 body;
+            JObject extra = null;
+
             switch (type)
             {
                 case NotificationType.Simple:
@@ -72,23 +46,31 @@ public async Task<bool> SendNotification(NotificationType type, string subscript
                 case NotificationType.WithImage:
                     title = "Image Notification";
                     body = "This notification includes an image";
+                    extra = new JObject
+                    {
+                        ["big_picture"] = NotificationImageUrl,
+                        ["ios_attachments"] = new JObject { ["image"] = NotificationImageUrl },
+                        ["mutable_content"] = true,
+                    };
+                    break;
+                case NotificationType.WithSound:
+                    title = "Sound Notification";
+                    body = "This notification plays a custom sound";
+                    extra = new JObject
+                    {
+                        ["ios_sound"] = "vine_boom.wav",
+                        ["android_channel_id"] = "b3b015d9-c050-4042-8548-dcc34aa44aa4",
+                    };
                     break;
                 default:
                     return false;
             }
 
-            var payload = new JObject
+            var payload = BuildBasePayload(title, body, subscriptionId);
+            if (extra != null)
             {
-                ["app_id"] = _appId,
-                ["include_subscription_ids"] = new JArray(subscriptionId),
-                ["headings"] = new JObject { ["en"] = title },
-                ["contents"] = new JObject { ["en"] = body },
-            };
-
-            if (type == NotificationType.WithImage)
-            {
-                payload["big_picture"] = NotificationImageUrl;
-                payload["ios_attachments"] = new JObject { ["image"] = NotificationImageUrl };
+                foreach (var prop in extra.Properties())
+                    payload[prop.Name] = prop.Value;
             }
 
             return await PostNotification(payload.ToString());
@@ -103,14 +85,7 @@ string subscriptionId
             if (string.IsNullOrEmpty(subscriptionId) || string.IsNullOrEmpty(_appId))
                 return false;
 
-            var payload = new JObject
-            {
-                ["app_id"] = _appId,
-                ["include_subscription_ids"] = new JArray(subscriptionId),
-                ["headings"] = new JObject { ["en"] = title },
-                ["contents"] = new JObject { ["en"] = body },
-            };
-
+            var payload = BuildBasePayload(title, body, subscriptionId);
             return await PostNotification(payload.ToString());
         }
 
@@ -170,18 +145,13 @@ public async Task<bool> UpdateLiveActivity(
                 payload["event_updates"] = eventUpdates;
 
             if (eventType == "end")
-            {
-                var unixTimestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-                payload["dismissal_date"] = unixTimestamp;
-            }
+                payload["dismissal_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
 
-            var jsonPayload = payload.ToString();
             var request = new UnityWebRequest(url, "POST");
-            var bodyRaw = Encoding.UTF8.GetBytes(jsonPayload);
-            request.uploadHandler = new UploadHandlerRaw(bodyRaw);
+            request.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(payload.ToString()));
             request.downloadHandler = new DownloadHandlerBuffer();
             request.SetRequestHeader("Content-Type", "application/json");
-            request.SetRequestHeader("Authorization", $"Key {_apiKey}");
+            request.SetRequestHeader("Authorization", $"Key {GetApiKey()}");
 
             var tcs = new TaskCompletionSource<bool>();
             var operation = request.SendWebRequest();
@@ -193,11 +163,19 @@ public async Task<bool> UpdateLiveActivity(
             return success;
         }
 
+        private JObject BuildBasePayload(string title, string body, string subscriptionId) =>
+            new()
+            {
+                ["app_id"] = _appId,
+                ["include_subscription_ids"] = new JArray(subscriptionId),
+                ["headings"] = new JObject { ["en"] = title },
+                ["contents"] = new JObject { ["en"] = body },
+            };
+
         private async Task<bool> PostNotification(string jsonPayload)
         {
             var request = new UnityWebRequest("https://onesignal.com/api/v1/notifications", "POST");
-            var bodyRaw = Encoding.UTF8.GetBytes(jsonPayload);
-            request.uploadHandler = new UploadHandlerRaw(bodyRaw);
+            request.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(jsonPayload));
             request.downloadHandler = new DownloadHandlerBuffer();
             request.SetRequestHeader("Content-Type", "application/json");
             request.SetRequestHeader("Accept", "application/vnd.onesignal.v1+json");
diff --git a/examples/demo/Assets/Scripts/Services/PreferencesService.cs b/examples/demo/Assets/Scripts/Services/PreferencesService.cs
index 405c21bc..bf77bfc4 100644
--- a/examples/demo/Assets/Scripts/Services/PreferencesService.cs
+++ b/examples/demo/Assets/Scripts/Services/PreferencesService.cs
@@ -4,19 +4,12 @@ namespace OneSignalDemo.Services
 {
     public class PreferencesService
     {
-        private const string KeyAppId = "onesignal_app_id";
         private const string KeyConsentRequired = "consent_required";
         private const string KeyPrivacyConsent = "privacy_consent";
         private const string KeyExternalUserId = "external_user_id";
         private const string KeyLocationShared = "location_shared";
         private const string KeyIamPaused = "iam_paused";
 
-        public string AppId
-        {
-            get => GetString(KeyAppId, "");
-            set => SetString(KeyAppId, value);
-        }
-
         public bool ConsentRequired
         {
             get => GetBool(KeyConsentRequired, false);
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/CustomNotificationDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/CustomNotificationDialog.cs
index edbc59d2..3111e61b 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/CustomNotificationDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/CustomNotificationDialog.cs
@@ -28,7 +28,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(titleLabel);
 
             _titleField = new TextField();
-            _titleField.name = "custom_notif_title";
+            _titleField.name = "custom_notification_title_input";
             _titleField.AddToClassList("input-field");
             _titleField.RegisterValueChangedCallback(_ => ValidateInput());
             container.Add(_titleField);
@@ -39,7 +39,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(bodyLabel);
 
             _bodyField = new TextField();
-            _bodyField.name = "custom_notif_body";
+            _bodyField.name = "custom_notification_body_input";
             _bodyField.AddToClassList("input-field");
             _bodyField.RegisterValueChangedCallback(_ => ValidateInput());
             container.Add(_bodyField);
@@ -50,7 +50,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton("Send", OnConfirm);
-            _confirmButton.name = "custom_notif_confirm";
+            _confirmButton.name = "custom_notification_send_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
index a8770237..65513272 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
@@ -29,7 +29,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(label);
 
             _externalIdField = new TextField();
-            _externalIdField.name = "login_external_id";
+            _externalIdField.name = "login_user_id_input";
             _externalIdField.AddToClassList("input-field");
             _externalIdField.RegisterValueChangedCallback(_ => ValidateInput());
             container.Add(_externalIdField);
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/TrackEventDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/TrackEventDialog.cs
index 101707a9..b8547424 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/TrackEventDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/TrackEventDialog.cs
@@ -32,7 +32,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(nameLabel);
 
             _nameField = new TextField();
-            _nameField.name = "event_name";
+            _nameField.name = "event_name_input";
             _nameField.AddToClassList("input-field");
             _nameField.RegisterValueChangedCallback(_ => ValidateInput());
             container.Add(_nameField);
@@ -43,7 +43,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(propsLabel);
 
             _propertiesField = new TextField();
-            _propertiesField.name = "event_properties";
+            _propertiesField.name = "event_properties_input";
             _propertiesField.AddToClassList("input-field");
             _propertiesField.textEdition.placeholder = "{\"key\": \"value\"}";
             _propertiesField.RegisterValueChangedCallback(_ => ValidateInput());
@@ -60,7 +60,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton("Track", OnConfirm);
-            _confirmButton.name = "event_confirm_button";
+            _confirmButton.name = "event_track_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 80b23bca..5f10f601 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -39,7 +39,7 @@ public class HomeScreenController : MonoBehaviour
         private TagsSectionController _tagsSection;
         private OutcomesSectionController _outcomesSection;
         private TriggersSectionController _triggersSection;
-        private TrackEventSectionController _trackEventSection;
+        private CustomEventsSectionController _customEventsSection;
         private LocationSectionController _locationSection;
         private LiveActivitiesSectionController _liveActivitiesSection;
 
@@ -246,10 +246,10 @@ private void BuildSections()
             _triggersSection.OnRemoveSelectedTap = ShowRemoveSelectedTriggersDialog;
             _contentRoot.Add(_triggersSection.Root);
 
-            _trackEventSection = new TrackEventSectionController(_viewModel);
-            _trackEventSection.OnInfoTap = () => ShowTooltip("trackEvent");
-            _trackEventSection.OnTrackEventTap = ShowTrackEventDialog;
-            _contentRoot.Add(_trackEventSection.Root);
+            _customEventsSection = new CustomEventsSectionController(_viewModel);
+            _customEventsSection.OnInfoTap = () => ShowTooltip("customEvents");
+            _customEventsSection.OnTrackEventTap = ShowTrackEventDialog;
+            _contentRoot.Add(_customEventsSection.Root);
 
             _locationSection = new LocationSectionController(_viewModel);
             _locationSection.OnInfoTap = () => ShowTooltip("location");
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs
similarity index 82%
rename from examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs
rename to examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs
index 0aad14fd..6a82241d 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs
@@ -4,7 +4,7 @@
 
 namespace OneSignalDemo.UI.Sections
 {
-    public class TrackEventSectionController
+    public class CustomEventsSectionController
     {
         private readonly AppViewModel _viewModel;
         private readonly VisualElement _root;
@@ -12,7 +12,7 @@ public class TrackEventSectionController
         public Action OnInfoTap;
         public Action OnTrackEventTap;
 
-        public TrackEventSectionController(AppViewModel viewModel)
+        public CustomEventsSectionController(AppViewModel viewModel)
         {
             _viewModel = viewModel;
             _root = BuildSection();
@@ -23,8 +23,8 @@ public TrackEventSectionController(AppViewModel viewModel)
         private VisualElement BuildSection()
         {
             var section = SectionBuilder.CreateSection(
-                "Track Event",
-                "track_event_section",
+                "Custom Events",
+                "custom_events_section",
                 () => OnInfoTap?.Invoke()
             );
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs.meta b/examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs.meta
new file mode 100644
index 00000000..18e004d4
--- /dev/null
+++ b/examples/demo/Assets/Scripts/UI/Sections/CustomEventsSectionController.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1e85e0f98a331481a88a6a6ff46a9f7a
diff --git a/examples/demo/Assets/Scripts/UI/Sections/InAppSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/InAppSectionController.cs
index ee8d1487..b9dfc443 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/InAppSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/InAppSectionController.cs
@@ -33,7 +33,7 @@ private VisualElement BuildSection()
             var toggleRow = SectionBuilder.CreateToggleRow(
                 "Pause In-App Messages",
                 "Toggle in-app message display",
-                "iam_paused_toggle",
+                "pause_iam_toggle",
                 _viewModel.InAppMessagesPaused,
                 OnPauseChanged
             );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
index 00413d6d..201970cb 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
@@ -48,7 +48,7 @@ private VisualElement BuildSection()
             var orderNumberRow = CreateInlineInputRow(
                 "Order #",
                 "ORD-1234",
-                "live_activity_order_input"
+                "live_activity_order_number_input"
             );
             _orderNumberField = orderNumberRow.Q<TextField>();
             inputCard.Add(orderNumberRow);
diff --git a/examples/demo/Assets/Scripts/UI/Sections/PushSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/PushSectionController.cs
index d21628aa..4c9234bc 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/PushSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/PushSectionController.cs
@@ -36,9 +36,9 @@ private VisualElement BuildSection()
             var pushIdRow = SectionBuilder.CreateInlineKeyValue(
                 "Push ID",
                 _viewModel.PushSubscriptionId ?? "\u2013",
-                "push_subscription_id"
+                "push_id"
             );
-            _pushIdLabel = pushIdRow.Q<Label>("push_subscription_id_value");
+            _pushIdLabel = pushIdRow.Q<Label>("push_id_value");
             card.Add(pushIdRow);
 
             card.Add(SectionBuilder.CreateDivider());
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
index 5a6d4253..f5941616 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
@@ -33,7 +33,7 @@ private VisualElement BuildSection()
                 CreateIamButton(
                     "TOP BANNER",
                     MaterialIcons.VerticalAlignTop,
-                    "send_iam_top",
+                    "send_iam_top_banner_button",
                     InAppMessageType.TopBanner
                 )
             );
@@ -41,7 +41,7 @@ private VisualElement BuildSection()
                 CreateIamButton(
                     "BOTTOM BANNER",
                     MaterialIcons.VerticalAlignBottom,
-                    "send_iam_bottom",
+                    "send_iam_bottom_banner_button",
                     InAppMessageType.BottomBanner
                 )
             );
@@ -49,7 +49,7 @@ private VisualElement BuildSection()
                 CreateIamButton(
                     "CENTER MODAL",
                     MaterialIcons.CropSquare,
-                    "send_iam_center",
+                    "send_iam_center_modal_button",
                     InAppMessageType.CenterModal
                 )
             );
@@ -57,7 +57,7 @@ private VisualElement BuildSection()
                 CreateIamButton(
                     "FULL SCREEN",
                     MaterialIcons.Fullscreen,
-                    "send_iam_full",
+                    "send_iam_full_screen_button",
                     InAppMessageType.FullScreen
                 )
             );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SendPushSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SendPushSectionController.cs
index eae0d876..06243d06 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SendPushSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SendPushSectionController.cs
@@ -32,7 +32,7 @@ private VisualElement BuildSection()
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
                     "SIMPLE",
-                    "send_push_simple",
+                    "send_simple_button",
                     () => _viewModel.SendNotification(NotificationType.Simple)
                 )
             );
@@ -40,15 +40,23 @@ private VisualElement BuildSection()
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
                     "WITH IMAGE",
-                    "send_push_image",
+                    "send_image_button",
                     () => _viewModel.SendNotification(NotificationType.WithImage)
                 )
             );
 
+            section.Add(
+                SectionBuilder.CreatePrimaryButton(
+                    "WITH SOUND",
+                    "send_sound_button",
+                    () => _viewModel.SendNotification(NotificationType.WithSound)
+                )
+            );
+
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
                     "CUSTOM",
-                    "send_push_custom",
+                    "send_custom_button",
                     () => OnCustomTap?.Invoke()
                 )
             );
@@ -56,7 +64,7 @@ private VisualElement BuildSection()
             section.Add(
                 SectionBuilder.CreateDestructiveButton(
                     "CLEAR ALL",
-                    "clear_all_notifications",
+                    "clear_all_button",
                     () => _viewModel.ClearAllNotifications()
                 )
             );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
index 17f58f15..d8e09158 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
@@ -55,8 +55,8 @@ private VisualElement BuildSection()
             );
 
             _removeSelectedButton = SectionBuilder.CreateDestructiveButton(
-                "REMOVE SELECTED",
-                "remove_selected_tags_button",
+                "REMOVE TAGS",
+                "remove_tags_button",
                 () => OnRemoveSelectedTap?.Invoke()
             );
             section.Add(_removeSelectedButton);
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs.meta b/examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs.meta
deleted file mode 100644
index 285cada5..00000000
--- a/examples/demo/Assets/Scripts/UI/Sections/TrackEventSectionController.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 1e85e0f98a331481a88a6a6ff46a9f7a
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index 0b453e6d..cfee9f6e 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -56,15 +56,15 @@ private VisualElement BuildSection()
             );
 
             _removeSelectedButton = SectionBuilder.CreateDestructiveButton(
-                "REMOVE SELECTED",
-                "remove_selected_triggers_button",
+                "REMOVE TRIGGERS",
+                "remove_triggers_button",
                 () => OnRemoveSelectedTap?.Invoke()
             );
             section.Add(_removeSelectedButton);
 
             _clearAllButton = SectionBuilder.CreateDestructiveButton(
-                "CLEAR ALL",
-                "clear_all_triggers_button",
+                "CLEAR ALL TRIGGERS",
+                "clear_triggers_button",
                 () => _viewModel.ClearAllTriggers()
             );
             section.Add(_clearAllButton);
diff --git a/examples/demo/Assets/Scripts/UI/Sections/UserSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/UserSectionController.cs
index 6ec26fd0..ab76df3d 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/UserSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/UserSectionController.cs
@@ -44,22 +44,22 @@ private VisualElement BuildSection()
             var extIdRow = SectionBuilder.CreateInlineKeyValue(
                 "External ID",
                 _viewModel.IsLoggedIn ? _viewModel.ExternalUserId : "\u2013",
-                "external_id"
+                "user_external_id"
             );
-            _externalIdValue = extIdRow.Q<Label>("external_id_value");
+            _externalIdValue = extIdRow.Q<Label>("user_external_id_value");
             statusCard.Add(extIdRow);
             section.Add(statusCard);
 
             _loginButton = SectionBuilder.CreatePrimaryButton(
                 _viewModel.IsLoggedIn ? "SWITCH USER" : "LOGIN USER",
-                "login_button",
+                "login_user_button",
                 () => OnLoginTap?.Invoke()
             );
             section.Add(_loginButton);
 
             _logoutButton = SectionBuilder.CreateDestructiveButton(
                 "LOGOUT USER",
-                "logout_button",
+                "logout_user_button",
                 () => OnLogoutTap?.Invoke()
             );
             _logoutButton.style.display = _viewModel.IsLoggedIn
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 63fa18b8..93529a84 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using OneSignalDemo.Models;
-using OneSignalDemo.Repositories;
 using OneSignalDemo.Services;
 using OneSignalSDK;
 using OneSignalSDK.Notifications;
@@ -16,8 +15,8 @@ namespace OneSignalDemo.ViewModels
 {
     public class AppViewModel : MonoBehaviour
     {
-        private OneSignalRepository _repository;
         private PreferencesService _prefs;
+        private OneSignalApiService _apiService;
         private const string Tag = "AppViewModel";
 
         private string _appId;
@@ -70,7 +69,8 @@ public class AppViewModel : MonoBehaviour
 
         public int LiveActivityStatusIndex => _liveActivityStatusIndex;
         public bool IsLiveActivityUpdating => _isLiveActivityUpdating;
-        public bool HasApiKey => _repository?.HasApiKey() ?? false;
+        public bool HasApiKey => _apiService?.HasApiKey() ?? false;
+        public static bool IsE2EMode => DotEnv.IsE2EMode;
 
         public string NextStatusLabel
         {
@@ -84,16 +84,19 @@ public string NextStatusLabel
         public event Action OnStateChanged;
         public event Action<string> OnToastMessage;
 
-        public void Init(OneSignalRepository repository, PreferencesService prefs)
+        public void Init(PreferencesService prefs, OneSignalApiService apiService)
         {
-            _repository = repository;
             _prefs = prefs;
+            _apiService = apiService;
 
             OneSignal.User.PushSubscription.Changed += OnPushSubscriptionChanged;
             OneSignal.Notifications.PermissionChanged += OnPermissionChanged;
             OneSignal.User.Changed += OnUserChanged;
         }
 
+        private static string MaskValue(string value) =>
+            string.IsNullOrEmpty(value) ? value : new string('\u2022', value.Length);
+
         private void OnDestroy()
         {
             if (OneSignal.Default != null)
@@ -106,22 +109,25 @@ private void OnDestroy()
 
         public void LoadInitialState()
         {
-            _appId = _prefs.AppId;
+            var rawAppId = _apiService?.GetAppId() ?? "";
+            _appId = IsE2EMode ? MaskValue(rawAppId) : rawAppId;
             _consentRequired = _prefs.ConsentRequired;
             _privacyConsentGiven = _prefs.PrivacyConsent;
-            _inAppMessagesPaused = _prefs.IamPaused;
-            _locationShared = _repository.IsLocationShared();
+            _inAppMessagesPaused = OneSignal.InAppMessages.Paused;
+            _locationShared = OneSignal.Location.IsShared;
             _externalUserId = _prefs.ExternalUserId;
-            _pushSubscriptionId = _repository.GetPushSubscriptionId();
-            _pushOptedIn = _repository.IsPushOptedIn();
-            _hasPermission = _repository.HasPermission();
+
+            var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
+            _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+            _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
+            _hasPermission = OneSignal.Notifications.Permission;
 
             NotifyStateChanged();
         }
 
         public async Task LoadInitialDataAsync()
         {
-            var onesignalId = _repository.GetOnesignalId();
+            var onesignalId = OneSignal.User.OneSignalId;
             if (!string.IsNullOrEmpty(onesignalId))
             {
                 SetLoading(true);
@@ -141,7 +147,7 @@ public void LoginUser(string externalUserId)
             _prefs.ExternalUserId = externalUserId;
 
             ClearUserData();
-            _repository.LoginUser(externalUserId);
+            OneSignal.Login(externalUserId);
 
             LogManager.Instance.Info(Tag, $"Logged in as: {externalUserId}");
             ShowToast($"Logged in as: {externalUserId}");
@@ -151,7 +157,7 @@ public void LoginUser(string externalUserId)
         public void LogoutUser()
         {
             SetLoading(true);
-            _repository.LogoutUser();
+            OneSignal.Logout();
 
             _externalUserId = "";
             _prefs.ExternalUserId = "";
@@ -165,7 +171,7 @@ public void LogoutUser()
 
         public void AddAlias(string label, string id)
         {
-            _repository.AddAlias(label, id);
+            OneSignal.User.AddAlias(label, id);
             _aliasesList.Add(new KeyValuePair<string, string>(label, id));
             LogManager.Instance.Info(Tag, $"Alias added: {label}");
             ShowToast($"Alias added: {label}");
@@ -174,7 +180,7 @@ public void AddAlias(string label, string id)
 
         public void AddAliases(Dictionary<string, string> aliases)
         {
-            _repository.AddAliases(aliases);
+            OneSignal.User.AddAliases(aliases);
             foreach (var kvp in aliases)
                 _aliasesList.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Value));
             LogManager.Instance.Info(Tag, $"{aliases.Count} alias(es) added");
@@ -184,7 +190,7 @@ public void AddAliases(Dictionary<string, string> aliases)
 
         public void AddEmail(string email)
         {
-            _repository.AddEmail(email);
+            OneSignal.User.AddEmail(email);
             if (!_emailsList.Contains(email))
                 _emailsList.Add(email);
             LogManager.Instance.Info(Tag, $"Email added: {email}");
@@ -194,7 +200,7 @@ public void AddEmail(string email)
 
         public void RemoveEmail(string email)
         {
-            _repository.RemoveEmail(email);
+            OneSignal.User.RemoveEmail(email);
             _emailsList.Remove(email);
             LogManager.Instance.Info(Tag, $"Email removed: {email}");
             ShowToast($"Email removed: {email}");
@@ -203,7 +209,7 @@ public void RemoveEmail(string email)
 
         public void AddSms(string smsNumber)
         {
-            _repository.AddSms(smsNumber);
+            OneSignal.User.AddSms(smsNumber);
             if (!_smsNumbersList.Contains(smsNumber))
                 _smsNumbersList.Add(smsNumber);
             LogManager.Instance.Info(Tag, $"SMS added: {smsNumber}");
@@ -213,7 +219,7 @@ public void AddSms(string smsNumber)
 
         public void RemoveSms(string smsNumber)
         {
-            _repository.RemoveSms(smsNumber);
+            OneSignal.User.RemoveSms(smsNumber);
             _smsNumbersList.Remove(smsNumber);
             LogManager.Instance.Info(Tag, $"SMS removed: {smsNumber}");
             ShowToast($"SMS removed: {smsNumber}");
@@ -222,7 +228,7 @@ public void RemoveSms(string smsNumber)
 
         public void AddTag(string key, string value)
         {
-            _repository.AddTag(key, value);
+            OneSignal.User.AddTag(key, value);
             UpsertInList(_tagsList, key, value);
             LogManager.Instance.Info(Tag, $"Tag added: {key}={value}");
             ShowToast($"Tag added: {key}");
@@ -231,7 +237,7 @@ public void AddTag(string key, string value)
 
         public void AddTags(Dictionary<string, string> tags)
         {
-            _repository.AddTags(tags);
+            OneSignal.User.AddTags(tags);
             foreach (var kvp in tags)
                 UpsertInList(_tagsList, kvp.Key, kvp.Value);
             LogManager.Instance.Info(Tag, $"{tags.Count} tag(s) added");
@@ -241,7 +247,7 @@ public void AddTags(Dictionary<string, string> tags)
 
         public void RemoveTag(string key)
         {
-            _repository.RemoveTag(key);
+            OneSignal.User.RemoveTag(key);
             _tagsList.RemoveAll(kvp => kvp.Key == key);
             LogManager.Instance.Info(Tag, $"Tag removed: {key}");
             ShowToast($"Tag removed: {key}");
@@ -250,7 +256,7 @@ public void RemoveTag(string key)
 
         public void RemoveSelectedTags(List<string> keys)
         {
-            _repository.RemoveTags(keys);
+            OneSignal.User.RemoveTags(keys.ToArray());
             _tagsList.RemoveAll(kvp => keys.Contains(kvp.Key));
             LogManager.Instance.Info(Tag, $"{keys.Count} tag(s) removed");
             ShowToast($"{keys.Count} tag(s) removed");
@@ -259,7 +265,7 @@ public void RemoveSelectedTags(List<string> keys)
 
         public void AddTrigger(string key, string value)
         {
-            _repository.AddTrigger(key, value);
+            OneSignal.InAppMessages.AddTrigger(key, value);
             UpsertInList(_triggersList, key, value);
             LogManager.Instance.Info(Tag, $"Trigger added: {key}={value}");
             ShowToast($"Trigger added: {key}");
@@ -268,7 +274,7 @@ public void AddTrigger(string key, string value)
 
         public void AddTriggers(Dictionary<string, string> triggers)
         {
-            _repository.AddTriggers(triggers);
+            OneSignal.InAppMessages.AddTriggers(triggers);
             foreach (var kvp in triggers)
                 UpsertInList(_triggersList, kvp.Key, kvp.Value);
             LogManager.Instance.Info(Tag, $"{triggers.Count} trigger(s) added");
@@ -278,7 +284,7 @@ public void AddTriggers(Dictionary<string, string> triggers)
 
         public void RemoveTrigger(string key)
         {
-            _repository.RemoveTrigger(key);
+            OneSignal.InAppMessages.RemoveTrigger(key);
             _triggersList.RemoveAll(kvp => kvp.Key == key);
             LogManager.Instance.Info(Tag, $"Trigger removed: {key}");
             ShowToast($"Trigger removed: {key}");
@@ -287,7 +293,7 @@ public void RemoveTrigger(string key)
 
         public void RemoveSelectedTriggers(List<string> keys)
         {
-            _repository.RemoveTriggers(keys);
+            OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
             _triggersList.RemoveAll(kvp => keys.Contains(kvp.Key));
             LogManager.Instance.Info(Tag, $"{keys.Count} trigger(s) removed");
             ShowToast($"{keys.Count} trigger(s) removed");
@@ -296,7 +302,7 @@ public void RemoveSelectedTriggers(List<string> keys)
 
         public void ClearAllTriggers()
         {
-            _repository.ClearTriggers();
+            OneSignal.InAppMessages.ClearTriggers();
             _triggersList.Clear();
             LogManager.Instance.Info(Tag, "All triggers cleared");
             ShowToast("All triggers cleared");
@@ -306,7 +312,7 @@ public void ClearAllTriggers()
         public void SendInAppMessage(InAppMessageType type)
         {
             var triggerValue = type.TriggerValue();
-            _repository.AddTrigger("iam_type", triggerValue);
+            OneSignal.InAppMessages.AddTrigger("iam_type", triggerValue);
             UpsertInList(_triggersList, "iam_type", triggerValue);
             LogManager.Instance.Info(Tag, $"Sent In-App Message: {type.DisplayName()}");
             ShowToast($"Sent In-App Message: {type.DisplayName()}");
@@ -315,28 +321,28 @@ public void SendInAppMessage(InAppMessageType type)
 
         public void SendOutcome(string name)
         {
-            _repository.SendOutcome(name);
+            OneSignal.Session.AddOutcome(name);
             LogManager.Instance.Info(Tag, $"Outcome sent: {name}");
             ShowToast($"Outcome sent: {name}");
         }
 
         public void SendUniqueOutcome(string name)
         {
-            _repository.SendUniqueOutcome(name);
+            OneSignal.Session.AddUniqueOutcome(name);
             LogManager.Instance.Info(Tag, $"Unique outcome sent: {name}");
             ShowToast($"Unique outcome sent: {name}");
         }
 
         public void SendOutcomeWithValue(string name, float value)
         {
-            _repository.SendOutcomeWithValue(name, value);
+            OneSignal.Session.AddOutcomeWithValue(name, value);
             LogManager.Instance.Info(Tag, $"Outcome sent: {name} = {value}");
             ShowToast($"Outcome sent: {name}");
         }
 
         public void TrackEvent(string name, Dictionary<string, object> properties = null)
         {
-            _repository.TrackEvent(name, properties);
+            OneSignal.User.TrackEvent(name, properties);
             LogManager.Instance.Info(Tag, $"Event tracked: {name}");
             ShowToast($"Event tracked: {name}");
         }
@@ -345,7 +351,8 @@ public async void SendNotification(NotificationType type)
         {
             try
             {
-                bool success = await _repository.SendNotification(type);
+                var pushId = OneSignal.User.PushSubscription.Id;
+                bool success = await _apiService.SendNotification(type, pushId);
                 var label = type.ToString();
                 if (success)
                 {
@@ -367,7 +374,7 @@ public async void SendNotification(NotificationType type)
 
         public void ClearAllNotifications()
         {
-            _repository.ClearAllNotifications();
+            OneSignal.Notifications.ClearAllNotifications();
             LogManager.Instance.Info(Tag, "All notifications cleared");
             ShowToast("All notifications cleared");
         }
@@ -376,7 +383,8 @@ public async void SendCustomNotification(string title, string body)
         {
             try
             {
-                bool success = await _repository.SendCustomNotification(title, body);
+                var pushId = OneSignal.User.PushSubscription.Id;
+                bool success = await _apiService.SendCustomNotification(title, body, pushId);
                 if (success)
                 {
                     LogManager.Instance.Info(Tag, $"Custom notification sent: {title}");
@@ -408,7 +416,7 @@ public void StartLiveActivity(string activityId, string orderNumber)
                 { "estimatedTime", LiveActivityETAs[0] },
             };
 
-            _repository.StartDefaultLiveActivity(activityId, attributes, content);
+            OneSignal.LiveActivities.StartDefault(activityId, attributes, content);
             _liveActivityStatusIndex = 0;
 
             LogManager.Instance.Info(Tag, $"Started Live Activity: {activityId}");
@@ -437,7 +445,7 @@ public async void UpdateLiveActivity(string activityId)
                     },
                 };
 
-                bool success = await _repository.UpdateLiveActivity(activityId, "update", eventUpdates);
+                bool success = await _apiService.UpdateLiveActivity(activityId, "update", eventUpdates);
                 if (success)
                 {
                     _liveActivityStatusIndex = nextIndex;
@@ -480,7 +488,7 @@ public async void EndLiveActivity(string activityId)
                     },
                 };
 
-                bool success = await _repository.UpdateLiveActivity(activityId, "end", eventUpdates);
+                bool success = await _apiService.UpdateLiveActivity(activityId, "end", eventUpdates);
                 if (success)
                 {
                     _liveActivityStatusIndex = 0;
@@ -507,7 +515,7 @@ public void SetConsentRequired(bool required)
         {
             _consentRequired = required;
             _prefs.ConsentRequired = required;
-            _repository.SetConsentRequired(required);
+            OneSignal.ConsentRequired = required;
             if (!required)
             {
                 _privacyConsentGiven = false;
@@ -521,7 +529,7 @@ public void SetPrivacyConsent(bool granted)
         {
             _privacyConsentGiven = granted;
             _prefs.PrivacyConsent = granted;
-            _repository.SetConsentGiven(granted);
+            OneSignal.ConsentGiven = granted;
             LogManager.Instance.Info(Tag, $"Privacy consent: {granted}");
             NotifyStateChanged();
         }
@@ -530,7 +538,7 @@ public void SetInAppMessagesPaused(bool paused)
         {
             _inAppMessagesPaused = paused;
             _prefs.IamPaused = paused;
-            _repository.SetInAppMessagesPaused(paused);
+            OneSignal.InAppMessages.Paused = paused;
             LogManager.Instance.Info(Tag, $"IAM paused: {paused}");
             NotifyStateChanged();
         }
@@ -539,7 +547,7 @@ public void SetLocationShared(bool shared)
         {
             _locationShared = shared;
             _prefs.LocationShared = shared;
-            _repository.SetLocationShared(shared);
+            OneSignal.Location.IsShared = shared;
             LogManager.Instance.Info(Tag, $"Location sharing: {(shared ? "enabled" : "disabled")}");
             ShowToast($"Location sharing {(shared ? "enabled" : "disabled")}");
             NotifyStateChanged();
@@ -547,7 +555,7 @@ public void SetLocationShared(bool shared)
 
         public void PromptLocation()
         {
-            _repository.RequestLocationPermission();
+            OneSignal.Location.RequestPermission();
             LogManager.Instance.Info(Tag, "Location permission requested");
         }
 
@@ -555,7 +563,7 @@ public async void PromptPush()
         {
             try
             {
-                bool granted = await _repository.RequestPermissionAsync(true);
+                bool granted = await OneSignal.Notifications.RequestPermissionAsync(true);
                 _hasPermission = granted;
                 LogManager.Instance.Info(
                     Tag,
@@ -572,9 +580,9 @@ public async void PromptPush()
         public void SetPushEnabled(bool enabled)
         {
             if (enabled)
-                _repository.OptInPush();
+                OneSignal.User.PushSubscription.OptIn();
             else
-                _repository.OptOutPush();
+                OneSignal.User.PushSubscription.OptOut();
 
             _pushOptedIn = enabled;
             LogManager.Instance.Info(Tag, $"Push {(enabled ? "enabled" : "disabled")}");
@@ -586,14 +594,14 @@ public async Task FetchUserDataFromApi()
         {
             try
             {
-                var onesignalId = _repository.GetOnesignalId();
+                var onesignalId = OneSignal.User.OneSignalId;
                 if (string.IsNullOrEmpty(onesignalId))
                 {
                     SetLoading(false);
                     return;
                 }
 
-                var userData = await _repository.FetchUser(onesignalId);
+                var userData = await _apiService.FetchUser(onesignalId);
                 if (userData != null)
                 {
                     _aliasesList = userData
@@ -614,9 +622,10 @@ public async Task FetchUserDataFromApi()
                     LogManager.Instance.Info(Tag, "User data fetched from API");
                 }
 
-                _pushSubscriptionId = _repository.GetPushSubscriptionId();
-                _pushOptedIn = _repository.IsPushOptedIn();
-                _hasPermission = _repository.HasPermission();
+                var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
+                _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+                _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
+                _hasPermission = OneSignal.Notifications.Permission;
             }
             catch (Exception ex)
             {
@@ -661,9 +670,10 @@ string value
 
         private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEventArgs e)
         {
-            _pushSubscriptionId = _repository.GetPushSubscriptionId();
-            _pushOptedIn = _repository.IsPushOptedIn();
-            LogManager.Instance.Info(Tag, $"Push subscription changed: {_pushSubscriptionId}");
+            var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
+            _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+            _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
+            LogManager.Instance.Info(Tag, $"Push subscription changed: {rawPushId}");
             NotifyStateChanged();
         }
 

From 99a80dd2bd7e60e87b930c4439d7c931c9740835 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 14:43:52 -0700
Subject: [PATCH 02/54] chore(demo): remove LogManager, use Debug.Log

---
 examples/demo/Assets/Resources/LogView.uss    |  95 -----------
 .../demo/Assets/Resources/LogView.uss.meta    |  12 --
 .../demo/Assets/Scripts/AppBootstrapper.cs    |  16 +-
 .../Assets/Scripts/Services/LogManager.cs     |  90 ----------
 .../Scripts/Services/LogManager.cs.meta       |   2 -
 .../Assets/Scripts/UI/HomeScreenController.cs |   8 -
 .../Assets/Scripts/UI/LogViewController.cs    | 155 ------------------
 .../Scripts/UI/LogViewController.cs.meta      |   2 -
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 101 ++++++------
 9 files changed, 57 insertions(+), 424 deletions(-)
 delete mode 100644 examples/demo/Assets/Resources/LogView.uss
 delete mode 100644 examples/demo/Assets/Resources/LogView.uss.meta
 delete mode 100644 examples/demo/Assets/Scripts/Services/LogManager.cs
 delete mode 100644 examples/demo/Assets/Scripts/Services/LogManager.cs.meta
 delete mode 100644 examples/demo/Assets/Scripts/UI/LogViewController.cs
 delete mode 100644 examples/demo/Assets/Scripts/UI/LogViewController.cs.meta

diff --git a/examples/demo/Assets/Resources/LogView.uss b/examples/demo/Assets/Resources/LogView.uss
deleted file mode 100644
index bfba8c62..00000000
--- a/examples/demo/Assets/Resources/LogView.uss
+++ /dev/null
@@ -1,95 +0,0 @@
-.log-container {
-    background-color: #1A1B1E;
-    width: 100%;
-    border-bottom-width: 1px;
-    border-bottom-color: #333;
-}
-
-.log-header {
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px 16px;
-}
-
-.log-header-left {
-    flex-direction: row;
-    align-items: center;
-}
-
-.log-header-right {
-    flex-direction: row;
-    align-items: center;
-}
-
-.log-header-title {
-    color: white;
-    -unity-font-style: bold;
-}
-
-.log-header-count {
-    color: #9E9E9E;
-    margin-left: 8px;
-}
-
-.log-clear-button {
-    width: 24px;
-    height: 24px;
-    background-color: transparent;
-    border-width: 0;
-    color: #9E9E9E;
-    font-size: 18px;
-    -unity-font-definition: resource("MaterialIcons-Regular");
-    -unity-text-align: middle-center;
-    padding: 0;
-}
-
-.log-scroll {
-    height: 100px;
-}
-
-.log-entry {
-    flex-direction: row;
-    padding: 1px 12px;
-    align-items: flex-start;
-}
-
-.log-timestamp {
-    color: #676E7B;
-    min-width: 70px;
-    margin-right: 4px;
-}
-
-.log-level {
-    min-width: 14px;
-    margin-right: 4px;
-    -unity-font-style: bold;
-}
-
-.log-level-d { color: #82AAFF; }
-.log-level-i { color: #C3E88D; }
-.log-level-w { color: #FFCB6B; }
-.log-level-e { color: #FF5370; }
-
-.log-message {
-    color: white;
-    flex-grow: 1;
-    flex-shrink: 1;
-    white-space: nowrap;
-}
-
-.log-empty {
-    color: #9E9E9E;
-    -unity-text-align: middle-center;
-    padding: 8px;
-}
-
-.log-scroll Scroller {
-    width: 0;
-    height: 0;
-    min-width: 0;
-    min-height: 0;
-    max-width: 0;
-    max-height: 0;
-    overflow: hidden;
-}
diff --git a/examples/demo/Assets/Resources/LogView.uss.meta b/examples/demo/Assets/Resources/LogView.uss.meta
deleted file mode 100644
index 78250750..00000000
--- a/examples/demo/Assets/Resources/LogView.uss.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 04a9d6a4976ea436eaa10d669d6d4753
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
-  disableValidation: 0
-  unsupportedSelectorAction: 0
diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index 8204f64b..421ac489 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -69,7 +69,7 @@ private async void Start()
                 _viewModel.PromptPush();
 
             _ = TooltipHelper.Instance.InitAsync();
-            LogManager.Instance.Info(Tag, "App initialized");
+            Debug.Log($"[{Tag}] App initialized");
         }
 
         private void RegisterSdkListeners()
@@ -98,29 +98,29 @@ private void OnDestroy()
         }
 
         private void OnIamWillDisplay(object sender, InAppMessageWillDisplayEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"IAM will display: {e.Message.MessageId}");
+            Debug.Log($"[{Tag}] IAM will display: {e.Message.MessageId}");
 
         private void OnIamDidDisplay(object sender, InAppMessageDidDisplayEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"IAM did display: {e.Message.MessageId}");
+            Debug.Log($"[{Tag}] IAM did display: {e.Message.MessageId}");
 
         private void OnIamWillDismiss(object sender, InAppMessageWillDismissEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"IAM will dismiss: {e.Message.MessageId}");
+            Debug.Log($"[{Tag}] IAM will dismiss: {e.Message.MessageId}");
 
         private void OnIamDidDismiss(object sender, InAppMessageDidDismissEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"IAM did dismiss: {e.Message.MessageId}");
+            Debug.Log($"[{Tag}] IAM did dismiss: {e.Message.MessageId}");
 
         private void OnIamClicked(object sender, InAppMessageClickEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"IAM clicked: {e.Result.ActionId}");
+            Debug.Log($"[{Tag}] IAM clicked: {e.Result.ActionId}");
 
         private void OnNotificationClicked(object sender, NotificationClickEventArgs e) =>
-            LogManager.Instance.Info(Tag, $"Notification clicked: {e.Result.ActionId}");
+            Debug.Log($"[{Tag}] Notification clicked: {e.Result.ActionId}");
 
         private void OnNotificationForegroundWillDisplay(
             object sender,
             NotificationWillDisplayEventArgs e
         )
         {
-            LogManager.Instance.Info(Tag, "Notification received in foreground");
+            Debug.Log($"[{Tag}] Notification received in foreground");
             e.Notification.Display();
         }
     }
diff --git a/examples/demo/Assets/Scripts/Services/LogManager.cs b/examples/demo/Assets/Scripts/Services/LogManager.cs
deleted file mode 100644
index 0c29306c..00000000
--- a/examples/demo/Assets/Scripts/Services/LogManager.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace OneSignalDemo.Services
-{
-    public enum LogEntryLevel
-    {
-        Debug,
-        Info,
-        Warn,
-        Error,
-    }
-
-    public class LogEntry
-    {
-        public DateTime Timestamp { get; }
-        public LogEntryLevel Level { get; }
-        public string Tag { get; }
-        public string Message { get; }
-
-        public LogEntry(LogEntryLevel level, string tag, string message)
-        {
-            Timestamp = DateTime.Now;
-            Level = level;
-            Tag = tag;
-            Message = message;
-        }
-
-        public string LevelChar =>
-            Level switch
-            {
-                LogEntryLevel.Debug => "D",
-                LogEntryLevel.Info => "I",
-                LogEntryLevel.Warn => "W",
-                LogEntryLevel.Error => "E",
-                _ => "?",
-            };
-    }
-
-    public class LogManager
-    {
-        private static readonly LogManager _instance = new();
-        public static LogManager Instance => _instance;
-
-        private readonly List<LogEntry> _entries = new();
-        public IReadOnlyList<LogEntry> Entries => _entries;
-
-        public event Action<LogEntry> OnLogAdded;
-
-        private LogManager() { }
-
-        public void Debug(string tag, string message) => Add(LogEntryLevel.Debug, tag, message);
-
-        public void Info(string tag, string message) => Add(LogEntryLevel.Info, tag, message);
-
-        public void Warn(string tag, string message) => Add(LogEntryLevel.Warn, tag, message);
-
-        public void Error(string tag, string message) => Add(LogEntryLevel.Error, tag, message);
-
-        public void Clear()
-        {
-            _entries.Clear();
-            OnLogAdded?.Invoke(null);
-        }
-
-        private void Add(LogEntryLevel level, string tag, string message)
-        {
-            var entry = new LogEntry(level, tag, message);
-            _entries.Add(entry);
-
-            switch (level)
-            {
-                case LogEntryLevel.Debug:
-                    UnityEngine.Debug.Log($"[{tag}] {message}");
-                    break;
-                case LogEntryLevel.Info:
-                    UnityEngine.Debug.Log($"[{tag}] {message}");
-                    break;
-                case LogEntryLevel.Warn:
-                    UnityEngine.Debug.LogWarning($"[{tag}] {message}");
-                    break;
-                case LogEntryLevel.Error:
-                    UnityEngine.Debug.LogError($"[{tag}] {message}");
-                    break;
-            }
-
-            OnLogAdded?.Invoke(entry);
-        }
-    }
-}
diff --git a/examples/demo/Assets/Scripts/Services/LogManager.cs.meta b/examples/demo/Assets/Scripts/Services/LogManager.cs.meta
deleted file mode 100644
index 182bdc4c..00000000
--- a/examples/demo/Assets/Scripts/Services/LogManager.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: fc4bdb847b1f244cbb31560877ae4540
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 5f10f601..4ac5833e 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -24,7 +24,6 @@ public class HomeScreenController : MonoBehaviour
         private VisualElement _loadingOverlay;
         private VisualElement _spinner;
         private IVisualElementScheduledItem _spinnerAnim;
-        private LogViewController _logView;
         private ToastView _toastView;
 
         private AppSectionController _appSection;
@@ -59,10 +58,6 @@ private void OnEnable()
             if (themeSheet != null)
                 _root.styleSheets.Add(themeSheet);
 
-            var logViewSheet = Resources.Load<StyleSheet>("LogView");
-            if (logViewSheet != null)
-                _root.styleSheets.Add(logViewSheet);
-
             BuildScreen();
             WireEvents();
         }
@@ -74,7 +69,6 @@ private void OnDisable()
                 _viewModel.OnStateChanged -= RefreshAll;
                 _viewModel.OnToastMessage -= ShowToast;
             }
-            _logView?.Destroy();
         }
 
         private void Update()
@@ -155,8 +149,6 @@ private void BuildScreen()
 
             screenRoot.Add(appBar);
 
-            _logView = new LogViewController(screenRoot);
-
             var scrollView = new ScrollView(ScrollViewMode.Vertical);
             scrollView.AddToClassList("flex-grow");
 
diff --git a/examples/demo/Assets/Scripts/UI/LogViewController.cs b/examples/demo/Assets/Scripts/UI/LogViewController.cs
deleted file mode 100644
index 4be22bf0..00000000
--- a/examples/demo/Assets/Scripts/UI/LogViewController.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using OneSignalDemo.Services;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace OneSignalDemo.UI
-{
-    public class LogViewController
-    {
-        private readonly VisualElement _container;
-        private readonly VisualElement _scrollContent;
-        private readonly ScrollView _scrollView;
-        private readonly Label _countLabel;
-        private readonly Label _emptyLabel;
-        private readonly Button _clearButton;
-        private readonly Button _chevronButton;
-        private bool _expanded = true;
-
-        public LogViewController(VisualElement root)
-        {
-            _container = new VisualElement();
-            _container.name = "log_view_container";
-            _container.AddToClassList("log-container");
-
-            var header = new VisualElement();
-            header.name = "log_view_header";
-            header.AddToClassList("log-header");
-            header.RegisterCallback<ClickEvent>(_ => ToggleExpand());
-
-            var headerLeft = new VisualElement();
-            headerLeft.AddToClassList("log-header-left");
-
-            var title = new Label("LOGS");
-            title.AddToClassList("log-header-title");
-            title.AddToClassList("text-label-small");
-            headerLeft.Add(title);
-
-            _countLabel = new Label("(0)");
-            _countLabel.name = "log_view_count";
-            _countLabel.AddToClassList("log-header-count");
-            _countLabel.AddToClassList("text-label-small");
-            headerLeft.Add(_countLabel);
-
-            header.Add(headerLeft);
-
-            var headerRight = new VisualElement();
-            headerRight.AddToClassList("log-header-right");
-
-            _clearButton = new Button(ClearLogs);
-            _clearButton.name = "log_view_clear_button";
-            _clearButton.text = MaterialIcons.Delete;
-            _clearButton.AddToClassList("log-clear-button");
-            headerRight.Add(_clearButton);
-
-            _chevronButton = new Button(ToggleExpand);
-            _chevronButton.name = "log_view_toggle";
-            _chevronButton.text = MaterialIcons.ExpandLess;
-            _chevronButton.AddToClassList("log-clear-button");
-            headerRight.Add(_chevronButton);
-
-            header.Add(headerRight);
-
-            _container.Add(header);
-
-            _scrollView = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
-            _scrollView.name = "log_view_list";
-            _scrollView.AddToClassList("log-scroll");
-
-            _scrollContent = new VisualElement();
-            _scrollView.Add(_scrollContent);
-
-            _emptyLabel = new Label("No logs yet");
-            _emptyLabel.name = "log_view_empty";
-            _emptyLabel.AddToClassList("log-empty");
-            _scrollContent.Add(_emptyLabel);
-
-            _container.Add(_scrollView);
-
-            LogManager.Instance.OnLogAdded += OnLogAdded;
-            Refresh();
-
-            root.Add(_container);
-        }
-
-        private void ToggleExpand()
-        {
-            _expanded = !_expanded;
-            _scrollView.style.display = _expanded ? DisplayStyle.Flex : DisplayStyle.None;
-            _chevronButton.text = _expanded ? MaterialIcons.ExpandLess : MaterialIcons.ExpandMore;
-        }
-
-        private void ClearLogs()
-        {
-            LogManager.Instance.Clear();
-            Refresh();
-        }
-
-        private void OnLogAdded(LogEntry entry)
-        {
-            Refresh();
-        }
-
-        private void Refresh()
-        {
-            _scrollContent.Clear();
-            var entries = LogManager.Instance.Entries;
-            _countLabel.text = $"({entries.Count})";
-            _clearButton.style.display = entries.Count > 0 ? DisplayStyle.Flex : DisplayStyle.None;
-
-            if (entries.Count == 0)
-            {
-                var empty = new Label("No logs yet");
-                empty.name = "log_view_empty";
-                empty.AddToClassList("log-empty");
-                _scrollContent.Add(empty);
-                return;
-            }
-
-            for (int i = entries.Count - 1; i >= 0; i--)
-            {
-                var entry = entries[i];
-                var displayIndex = entries.Count - 1 - i;
-                var row = new VisualElement();
-                row.name = $"log_entry_{displayIndex}";
-                row.AddToClassList("log-entry");
-
-                var ts = new Label(entry.Timestamp.ToString("HH:mm:ss"));
-                ts.name = $"log_entry_{displayIndex}_timestamp";
-                ts.AddToClassList("log-timestamp");
-                ts.AddToClassList("text-label-small");
-
-                var level = new Label(entry.LevelChar);
-                level.name = $"log_entry_{displayIndex}_level";
-                level.AddToClassList("log-level");
-                level.AddToClassList("text-label-small");
-                level.AddToClassList($"log-level-{entry.LevelChar.ToLower()}");
-
-                var msg = new Label($"{entry.Tag}: {entry.Message}");
-                msg.name = $"log_entry_{displayIndex}_message";
-                msg.AddToClassList("log-message");
-                msg.AddToClassList("text-label-small");
-
-                row.Add(ts);
-                row.Add(level);
-                row.Add(msg);
-                _scrollContent.Add(row);
-            }
-        }
-
-        public void Destroy()
-        {
-            LogManager.Instance.OnLogAdded -= OnLogAdded;
-        }
-    }
-}
diff --git a/examples/demo/Assets/Scripts/UI/LogViewController.cs.meta b/examples/demo/Assets/Scripts/UI/LogViewController.cs.meta
deleted file mode 100644
index 16b44d65..00000000
--- a/examples/demo/Assets/Scripts/UI/LogViewController.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: a70e72c2d0afa4e2ead6f2a31ae65601
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 93529a84..9ea32159 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -149,7 +149,7 @@ public void LoginUser(string externalUserId)
             ClearUserData();
             OneSignal.Login(externalUserId);
 
-            LogManager.Instance.Info(Tag, $"Logged in as: {externalUserId}");
+            Debug.Log($"[{Tag}] Logged in as: {externalUserId}");
             ShowToast($"Logged in as: {externalUserId}");
             NotifyStateChanged();
         }
@@ -164,7 +164,7 @@ public void LogoutUser()
             ClearUserData();
 
             SetLoading(false);
-            LogManager.Instance.Info(Tag, "Logged out");
+            Debug.Log($"[{Tag}] Logged out");
             ShowToast("Logged out");
             NotifyStateChanged();
         }
@@ -173,7 +173,7 @@ public void AddAlias(string label, string id)
         {
             OneSignal.User.AddAlias(label, id);
             _aliasesList.Add(new KeyValuePair<string, string>(label, id));
-            LogManager.Instance.Info(Tag, $"Alias added: {label}");
+            Debug.Log($"[{Tag}] Alias added: {label}");
             ShowToast($"Alias added: {label}");
             NotifyStateChanged();
         }
@@ -183,7 +183,7 @@ public void AddAliases(Dictionary<string, string> aliases)
             OneSignal.User.AddAliases(aliases);
             foreach (var kvp in aliases)
                 _aliasesList.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Value));
-            LogManager.Instance.Info(Tag, $"{aliases.Count} alias(es) added");
+            Debug.Log($"[{Tag}] {aliases.Count} alias(es) added");
             ShowToast($"{aliases.Count} alias(es) added");
             NotifyStateChanged();
         }
@@ -193,7 +193,7 @@ public void AddEmail(string email)
             OneSignal.User.AddEmail(email);
             if (!_emailsList.Contains(email))
                 _emailsList.Add(email);
-            LogManager.Instance.Info(Tag, $"Email added: {email}");
+            Debug.Log($"[{Tag}] Email added: {email}");
             ShowToast($"Email added: {email}");
             NotifyStateChanged();
         }
@@ -202,7 +202,7 @@ public void RemoveEmail(string email)
         {
             OneSignal.User.RemoveEmail(email);
             _emailsList.Remove(email);
-            LogManager.Instance.Info(Tag, $"Email removed: {email}");
+            Debug.Log($"[{Tag}] Email removed: {email}");
             ShowToast($"Email removed: {email}");
             NotifyStateChanged();
         }
@@ -212,7 +212,7 @@ public void AddSms(string smsNumber)
             OneSignal.User.AddSms(smsNumber);
             if (!_smsNumbersList.Contains(smsNumber))
                 _smsNumbersList.Add(smsNumber);
-            LogManager.Instance.Info(Tag, $"SMS added: {smsNumber}");
+            Debug.Log($"[{Tag}] SMS added: {smsNumber}");
             ShowToast($"SMS added: {smsNumber}");
             NotifyStateChanged();
         }
@@ -221,7 +221,7 @@ public void RemoveSms(string smsNumber)
         {
             OneSignal.User.RemoveSms(smsNumber);
             _smsNumbersList.Remove(smsNumber);
-            LogManager.Instance.Info(Tag, $"SMS removed: {smsNumber}");
+            Debug.Log($"[{Tag}] SMS removed: {smsNumber}");
             ShowToast($"SMS removed: {smsNumber}");
             NotifyStateChanged();
         }
@@ -230,7 +230,7 @@ public void AddTag(string key, string value)
         {
             OneSignal.User.AddTag(key, value);
             UpsertInList(_tagsList, key, value);
-            LogManager.Instance.Info(Tag, $"Tag added: {key}={value}");
+            Debug.Log($"[{Tag}] Tag added: {key}={value}");
             ShowToast($"Tag added: {key}");
             NotifyStateChanged();
         }
@@ -240,7 +240,7 @@ public void AddTags(Dictionary<string, string> tags)
             OneSignal.User.AddTags(tags);
             foreach (var kvp in tags)
                 UpsertInList(_tagsList, kvp.Key, kvp.Value);
-            LogManager.Instance.Info(Tag, $"{tags.Count} tag(s) added");
+            Debug.Log($"[{Tag}] {tags.Count} tag(s) added");
             ShowToast($"{tags.Count} tag(s) added");
             NotifyStateChanged();
         }
@@ -249,7 +249,7 @@ public void RemoveTag(string key)
         {
             OneSignal.User.RemoveTag(key);
             _tagsList.RemoveAll(kvp => kvp.Key == key);
-            LogManager.Instance.Info(Tag, $"Tag removed: {key}");
+            Debug.Log($"[{Tag}] Tag removed: {key}");
             ShowToast($"Tag removed: {key}");
             NotifyStateChanged();
         }
@@ -258,7 +258,7 @@ public void RemoveSelectedTags(List<string> keys)
         {
             OneSignal.User.RemoveTags(keys.ToArray());
             _tagsList.RemoveAll(kvp => keys.Contains(kvp.Key));
-            LogManager.Instance.Info(Tag, $"{keys.Count} tag(s) removed");
+            Debug.Log($"[{Tag}] {keys.Count} tag(s) removed");
             ShowToast($"{keys.Count} tag(s) removed");
             NotifyStateChanged();
         }
@@ -267,7 +267,7 @@ public void AddTrigger(string key, string value)
         {
             OneSignal.InAppMessages.AddTrigger(key, value);
             UpsertInList(_triggersList, key, value);
-            LogManager.Instance.Info(Tag, $"Trigger added: {key}={value}");
+            Debug.Log($"[{Tag}] Trigger added: {key}={value}");
             ShowToast($"Trigger added: {key}");
             NotifyStateChanged();
         }
@@ -277,7 +277,7 @@ public void AddTriggers(Dictionary<string, string> triggers)
             OneSignal.InAppMessages.AddTriggers(triggers);
             foreach (var kvp in triggers)
                 UpsertInList(_triggersList, kvp.Key, kvp.Value);
-            LogManager.Instance.Info(Tag, $"{triggers.Count} trigger(s) added");
+            Debug.Log($"[{Tag}] {triggers.Count} trigger(s) added");
             ShowToast($"{triggers.Count} trigger(s) added");
             NotifyStateChanged();
         }
@@ -286,7 +286,7 @@ public void RemoveTrigger(string key)
         {
             OneSignal.InAppMessages.RemoveTrigger(key);
             _triggersList.RemoveAll(kvp => kvp.Key == key);
-            LogManager.Instance.Info(Tag, $"Trigger removed: {key}");
+            Debug.Log($"[{Tag}] Trigger removed: {key}");
             ShowToast($"Trigger removed: {key}");
             NotifyStateChanged();
         }
@@ -295,7 +295,7 @@ public void RemoveSelectedTriggers(List<string> keys)
         {
             OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
             _triggersList.RemoveAll(kvp => keys.Contains(kvp.Key));
-            LogManager.Instance.Info(Tag, $"{keys.Count} trigger(s) removed");
+            Debug.Log($"[{Tag}] {keys.Count} trigger(s) removed");
             ShowToast($"{keys.Count} trigger(s) removed");
             NotifyStateChanged();
         }
@@ -304,7 +304,7 @@ public void ClearAllTriggers()
         {
             OneSignal.InAppMessages.ClearTriggers();
             _triggersList.Clear();
-            LogManager.Instance.Info(Tag, "All triggers cleared");
+            Debug.Log($"[{Tag}] All triggers cleared");
             ShowToast("All triggers cleared");
             NotifyStateChanged();
         }
@@ -314,7 +314,7 @@ public void SendInAppMessage(InAppMessageType type)
             var triggerValue = type.TriggerValue();
             OneSignal.InAppMessages.AddTrigger("iam_type", triggerValue);
             UpsertInList(_triggersList, "iam_type", triggerValue);
-            LogManager.Instance.Info(Tag, $"Sent In-App Message: {type.DisplayName()}");
+            Debug.Log($"[{Tag}] Sent In-App Message: {type.DisplayName()}");
             ShowToast($"Sent In-App Message: {type.DisplayName()}");
             NotifyStateChanged();
         }
@@ -322,28 +322,28 @@ public void SendInAppMessage(InAppMessageType type)
         public void SendOutcome(string name)
         {
             OneSignal.Session.AddOutcome(name);
-            LogManager.Instance.Info(Tag, $"Outcome sent: {name}");
+            Debug.Log($"[{Tag}] Outcome sent: {name}");
             ShowToast($"Outcome sent: {name}");
         }
 
         public void SendUniqueOutcome(string name)
         {
             OneSignal.Session.AddUniqueOutcome(name);
-            LogManager.Instance.Info(Tag, $"Unique outcome sent: {name}");
+            Debug.Log($"[{Tag}] Unique outcome sent: {name}");
             ShowToast($"Unique outcome sent: {name}");
         }
 
         public void SendOutcomeWithValue(string name, float value)
         {
             OneSignal.Session.AddOutcomeWithValue(name, value);
-            LogManager.Instance.Info(Tag, $"Outcome sent: {name} = {value}");
+            Debug.Log($"[{Tag}] Outcome sent: {name} = {value}");
             ShowToast($"Outcome sent: {name}");
         }
 
         public void TrackEvent(string name, Dictionary<string, object> properties = null)
         {
             OneSignal.User.TrackEvent(name, properties);
-            LogManager.Instance.Info(Tag, $"Event tracked: {name}");
+            Debug.Log($"[{Tag}] Event tracked: {name}");
             ShowToast($"Event tracked: {name}");
         }
 
@@ -356,18 +356,18 @@ public async void SendNotification(NotificationType type)
                 var label = type.ToString();
                 if (success)
                 {
-                    LogManager.Instance.Info(Tag, $"Notification sent: {label}");
+                    Debug.Log($"[{Tag}] Notification sent: {label}");
                     ShowToast($"Notification sent: {label}");
                 }
                 else
                 {
-                    LogManager.Instance.Error(Tag, $"Failed to send notification: {label}");
+                    Debug.LogError($"[{Tag}] Failed to send notification: {label}");
                     ShowToast("Failed to send notification");
                 }
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Notification error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Notification error: {ex.Message}");
                 ShowToast("Failed to send notification");
             }
         }
@@ -375,7 +375,7 @@ public async void SendNotification(NotificationType type)
         public void ClearAllNotifications()
         {
             OneSignal.Notifications.ClearAllNotifications();
-            LogManager.Instance.Info(Tag, "All notifications cleared");
+            Debug.Log($"[{Tag}] All notifications cleared");
             ShowToast("All notifications cleared");
         }
 
@@ -387,18 +387,18 @@ public async void SendCustomNotification(string title, string body)
                 bool success = await _apiService.SendCustomNotification(title, body, pushId);
                 if (success)
                 {
-                    LogManager.Instance.Info(Tag, $"Custom notification sent: {title}");
+                    Debug.Log($"[{Tag}] Custom notification sent: {title}");
                     ShowToast($"Notification sent: Custom");
                 }
                 else
                 {
-                    LogManager.Instance.Error(Tag, "Failed to send custom notification");
+                    Debug.LogError($"[{Tag}] Failed to send custom notification");
                     ShowToast("Failed to send notification");
                 }
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Custom notification error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Custom notification error: {ex.Message}");
                 ShowToast("Failed to send notification");
             }
         }
@@ -419,7 +419,7 @@ public void StartLiveActivity(string activityId, string orderNumber)
             OneSignal.LiveActivities.StartDefault(activityId, attributes, content);
             _liveActivityStatusIndex = 0;
 
-            LogManager.Instance.Info(Tag, $"Started Live Activity: {activityId}");
+            Debug.Log($"[{Tag}] Started Live Activity: {activityId}");
             ShowToast($"Started Live Activity: {activityId}");
             NotifyStateChanged();
         }
@@ -449,18 +449,18 @@ public async void UpdateLiveActivity(string activityId)
                 if (success)
                 {
                     _liveActivityStatusIndex = nextIndex;
-                    LogManager.Instance.Info(Tag, $"Updated Live Activity: {activityId}");
+                    Debug.Log($"[{Tag}] Updated Live Activity: {activityId}");
                     ShowToast($"Updated Live Activity: {activityId}");
                 }
                 else
                 {
-                    LogManager.Instance.Error(Tag, "Failed to update Live Activity");
+                    Debug.LogError($"[{Tag}] Failed to update Live Activity");
                     ShowToast("Failed to update Live Activity");
                 }
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Live Activity update error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Live Activity update error: {ex.Message}");
                 ShowToast("Failed to update Live Activity");
             }
 
@@ -492,18 +492,18 @@ public async void EndLiveActivity(string activityId)
                 if (success)
                 {
                     _liveActivityStatusIndex = 0;
-                    LogManager.Instance.Info(Tag, $"Ended Live Activity: {activityId}");
+                    Debug.Log($"[{Tag}] Ended Live Activity: {activityId}");
                     ShowToast($"Ended Live Activity: {activityId}");
                 }
                 else
                 {
-                    LogManager.Instance.Error(Tag, "Failed to end Live Activity");
+                    Debug.LogError($"[{Tag}] Failed to end Live Activity");
                     ShowToast("Failed to end Live Activity");
                 }
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Live Activity end error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Live Activity end error: {ex.Message}");
                 ShowToast("Failed to end Live Activity");
             }
 
@@ -521,7 +521,7 @@ public void SetConsentRequired(bool required)
                 _privacyConsentGiven = false;
                 _prefs.PrivacyConsent = false;
             }
-            LogManager.Instance.Info(Tag, $"Consent required: {required}");
+            Debug.Log($"[{Tag}] Consent required: {required}");
             NotifyStateChanged();
         }
 
@@ -530,7 +530,7 @@ public void SetPrivacyConsent(bool granted)
             _privacyConsentGiven = granted;
             _prefs.PrivacyConsent = granted;
             OneSignal.ConsentGiven = granted;
-            LogManager.Instance.Info(Tag, $"Privacy consent: {granted}");
+            Debug.Log($"[{Tag}] Privacy consent: {granted}");
             NotifyStateChanged();
         }
 
@@ -539,7 +539,7 @@ public void SetInAppMessagesPaused(bool paused)
             _inAppMessagesPaused = paused;
             _prefs.IamPaused = paused;
             OneSignal.InAppMessages.Paused = paused;
-            LogManager.Instance.Info(Tag, $"IAM paused: {paused}");
+            Debug.Log($"[{Tag}] IAM paused: {paused}");
             NotifyStateChanged();
         }
 
@@ -548,7 +548,7 @@ public void SetLocationShared(bool shared)
             _locationShared = shared;
             _prefs.LocationShared = shared;
             OneSignal.Location.IsShared = shared;
-            LogManager.Instance.Info(Tag, $"Location sharing: {(shared ? "enabled" : "disabled")}");
+            Debug.Log($"[{Tag}] Location sharing: {(shared ? "enabled" : "disabled")}");
             ShowToast($"Location sharing {(shared ? "enabled" : "disabled")}");
             NotifyStateChanged();
         }
@@ -556,7 +556,7 @@ public void SetLocationShared(bool shared)
         public void PromptLocation()
         {
             OneSignal.Location.RequestPermission();
-            LogManager.Instance.Info(Tag, "Location permission requested");
+            Debug.Log($"[{Tag}] Location permission requested");
         }
 
         public async void PromptPush()
@@ -565,15 +565,12 @@ public async void PromptPush()
             {
                 bool granted = await OneSignal.Notifications.RequestPermissionAsync(true);
                 _hasPermission = granted;
-                LogManager.Instance.Info(
-                    Tag,
-                    $"Push permission: {(granted ? "granted" : "denied")}"
-                );
+                Debug.Log($"[{Tag}] Push permission: {(granted ? "granted" : "denied")}");
                 NotifyStateChanged();
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Push permission error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Push permission error: {ex.Message}");
             }
         }
 
@@ -585,7 +582,7 @@ public void SetPushEnabled(bool enabled)
                 OneSignal.User.PushSubscription.OptOut();
 
             _pushOptedIn = enabled;
-            LogManager.Instance.Info(Tag, $"Push {(enabled ? "enabled" : "disabled")}");
+            Debug.Log($"[{Tag}] Push {(enabled ? "enabled" : "disabled")}");
             ShowToast($"Push {(enabled ? "enabled" : "disabled")}");
             NotifyStateChanged();
         }
@@ -619,7 +616,7 @@ public async Task FetchUserDataFromApi()
                         _prefs.ExternalUserId = userData.ExternalId;
                     }
 
-                    LogManager.Instance.Info(Tag, "User data fetched from API");
+                    Debug.Log($"[{Tag}] User data fetched from API");
                 }
 
                 var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
@@ -629,7 +626,7 @@ public async Task FetchUserDataFromApi()
             }
             catch (Exception ex)
             {
-                LogManager.Instance.Error(Tag, $"Fetch user error: {ex.Message}");
+                Debug.LogError($"[{Tag}] Fetch user error: {ex.Message}");
             }
 
             await Task.Yield();
@@ -673,20 +670,20 @@ private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEve
             var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
             _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
-            LogManager.Instance.Info(Tag, $"Push subscription changed: {rawPushId}");
+            Debug.Log($"[{Tag}] Push subscription changed: {rawPushId}");
             NotifyStateChanged();
         }
 
         private void OnPermissionChanged(object sender, NotificationPermissionChangedEventArgs e)
         {
             _hasPermission = e.Permission;
-            LogManager.Instance.Info(Tag, $"Permission changed: {e.Permission}");
+            Debug.Log($"[{Tag}] Permission changed: {e.Permission}");
             NotifyStateChanged();
         }
 
         private async void OnUserChanged(object sender, UserStateChangedEventArgs e)
         {
-            LogManager.Instance.Info(Tag, "User changed, fetching data...");
+            Debug.Log($"[{Tag}] User changed, fetching data...");
             await FetchUserDataFromApi();
         }
     }

From 207de0d981033d0cbad676070ae27663c0b0db17 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 14:53:10 -0700
Subject: [PATCH 03/54] chore(demo): standardize UI element names for Appium
 tests

---
 .../demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs   |  2 +-
 .../Scripts/UI/Dialogs/MultiPairInputDialog.cs      |  6 ++++--
 .../Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs   |  3 ++-
 .../demo/Assets/Scripts/UI/Dialogs/OutcomeDialog.cs | 12 ++++++------
 .../Assets/Scripts/UI/Dialogs/PairInputDialog.cs    |  1 +
 .../Assets/Scripts/UI/Dialogs/SingleInputDialog.cs  |  1 +
 .../demo/Assets/Scripts/UI/Dialogs/TooltipDialog.cs |  6 +++++-
 .../demo/Assets/Scripts/UI/HomeScreenController.cs  | 13 +++++++------
 8 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
index 65513272..602a6cfb 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
@@ -40,7 +40,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton(_isSwitchUser ? "Switch" : "Login", OnConfirm);
-            _confirmButton.name = "login_confirm_button";
+            _confirmButton.name = "singleinput_confirm_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index 52770d6e..b94aca55 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -44,6 +44,7 @@ protected override void BuildContent(VisualElement container)
             AddRow();
 
             var addRowButton = new Button(AddRow);
+            addRowButton.name = "multipair_add_row_button";
             addRowButton.AddToClassList("dialog-add-row-button");
             var addIcon = new Label(MaterialIcons.Add);
             addIcon.AddToClassList("dialog-add-row-icon");
@@ -59,6 +60,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton(_confirmText, OnConfirm);
+            _confirmButton.name = "multipair_confirm_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
@@ -78,14 +80,14 @@ private void AddRow()
             row.AddToClassList("dialog-row");
 
             var keyField = new TextField();
-            keyField.name = $"multi_key_{_rows.Count}";
+            keyField.name = $"multipair_key_{_rows.Count}";
             keyField.AddToClassList("input-field");
             keyField.AddToClassList("dialog-field-group-left");
             keyField.textEdition.placeholder = _keyLabel;
             keyField.RegisterValueChangedCallback(_ => ValidateAll());
 
             var valueField = new TextField();
-            valueField.name = $"multi_value_{_rows.Count}";
+            valueField.name = $"multipair_value_{_rows.Count}";
             valueField.AddToClassList("input-field");
             valueField.AddToClassList("dialog-field-group");
             valueField.textEdition.placeholder = _valueLabel;
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
index 4daf69fb..d5d68f35 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
@@ -37,7 +37,7 @@ protected override void BuildContent(VisualElement container)
                 row.AddToClassList("checkbox-row");
 
                 var toggle = new Toggle();
-                toggle.name = $"select_{item.Key}";
+                toggle.name = $"remove_checkbox_{item.Key}";
                 toggle.RegisterValueChangedCallback(evt =>
                 {
                     toggle.EnableInClassList("checkbox--checked", evt.newValue);
@@ -60,6 +60,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton("Remove (0)", OnConfirm);
+            _confirmButton.name = "multiselect_confirm_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/OutcomeDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/OutcomeDialog.cs
index a93b1739..0db76afa 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/OutcomeDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/OutcomeDialog.cs
@@ -36,9 +36,9 @@ protected override void BuildContent(VisualElement container)
 
             var radioGroup = new VisualElement();
 
-            _normalRadio = CreateRadio("Normal Outcome", "outcome_normal", true);
-            _uniqueRadio = CreateRadio("Unique Outcome", "outcome_unique", false);
-            _withValueRadio = CreateRadio("Outcome with Value", "outcome_with_value", false);
+            _normalRadio = CreateRadio("Normal Outcome", "outcome_type_normal_radio", true);
+            _uniqueRadio = CreateRadio("Unique Outcome", "outcome_type_unique_radio", false);
+            _withValueRadio = CreateRadio("Outcome with Value", "outcome_type_value_radio", false);
 
             _normalRadio.RegisterValueChangedCallback(e =>
             {
@@ -62,7 +62,7 @@ protected override void BuildContent(VisualElement container)
             container.Add(radioGroup);
 
             _nameField = new TextField();
-            _nameField.name = "outcome_name";
+            _nameField.name = "outcome_name_input";
             _nameField.AddToClassList("input-field");
             _nameField.textEdition.placeholder = "Outcome Name";
             _nameField.RegisterValueChangedCallback(_ => ValidateInput());
@@ -72,7 +72,7 @@ protected override void BuildContent(VisualElement container)
             _valueContainer.style.display = DisplayStyle.None;
 
             _valueField = new TextField();
-            _valueField.name = "outcome_value";
+            _valueField.name = "outcome_value_input";
             _valueField.AddToClassList("input-field");
             _valueField.textEdition.placeholder = "Value";
             _valueField.RegisterValueChangedCallback(_ => ValidateInput());
@@ -86,7 +86,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton("Send", OnConfirm);
-            _confirmButton.name = "outcome_confirm_button";
+            _confirmButton.name = "outcome_send_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
index 168a3cab..1036bb21 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
@@ -79,6 +79,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton(_confirmText, OnConfirm);
+            _confirmButton.name = "singlepair_confirm_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
index df9c4781..0a9b47b1 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
@@ -52,6 +52,7 @@ protected override void BuildContent(VisualElement container)
             actions.Add(CreateCancelButton());
 
             _confirmButton = CreateConfirmButton(_confirmText, OnConfirm);
+            _confirmButton.name = "singleinput_confirm_button";
             _confirmButton.SetEnabled(false);
             actions.Add(_confirmButton);
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/TooltipDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/TooltipDialog.cs
index ef12bc32..b22e4734 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/TooltipDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/TooltipDialog.cs
@@ -15,6 +15,7 @@ public TooltipDialog(TooltipData data)
         protected override void BuildContent(VisualElement container)
         {
             var title = new Label(_data.Title ?? "Info");
+            title.name = "tooltip_title";
             title.AddToClassList("dialog-title");
             title.AddToClassList("text-dialog-title");
             container.Add(title);
@@ -22,6 +23,7 @@ protected override void BuildContent(VisualElement container)
             if (!string.IsNullOrEmpty(_data.Description))
             {
                 var desc = new Label(_data.Description);
+                desc.name = "tooltip_description";
                 desc.AddToClassList("tooltip-description");
                 desc.AddToClassList("text-body-medium");
                 container.Add(desc);
@@ -56,7 +58,9 @@ protected override void BuildContent(VisualElement container)
 
             var actions = new VisualElement();
             actions.AddToClassList("dialog-actions");
-            actions.Add(CreateCancelButton("OK"));
+            var okButton = CreateCancelButton("OK");
+            okButton.name = "tooltip_ok_button";
+            actions.Add(okButton);
             container.Add(actions);
         }
     }
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 4ac5833e..3e8d9e33 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -150,6 +150,7 @@ private void BuildScreen()
             screenRoot.Add(appBar);
 
             var scrollView = new ScrollView(ScrollViewMode.Vertical);
+            scrollView.name = "main_scroll_view";
             scrollView.AddToClassList("flex-grow");
 
             _contentRoot = new VisualElement();
@@ -320,8 +321,8 @@ private void ShowAddAliasDialog()
                 "Add Alias",
                 "Label",
                 "ID",
-                "alias_key",
-                "alias_value",
+                "alias_label_input",
+                "alias_id_input",
                 "Add",
                 (key, value) => _viewModel.AddAlias(key, value)
             );
@@ -370,8 +371,8 @@ private void ShowAddTagDialog()
                 "Add Tag",
                 "Key",
                 "Value",
-                "tag_key",
-                "tag_value",
+                "tag_key_input",
+                "tag_value_input",
                 "Add",
                 (key, value) => _viewModel.AddTag(key, value)
             );
@@ -410,8 +411,8 @@ private void ShowAddTriggerDialog()
                 "Add Trigger",
                 "Key",
                 "Value",
-                "trigger_key",
-                "trigger_value",
+                "trigger_key_input",
+                "trigger_value_input",
                 "Add",
                 (key, value) => _viewModel.AddTrigger(key, value)
             );

From b225f34450fcbbd349661e10e57186d3529b9e78 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 14:57:37 -0700
Subject: [PATCH 04/54] chore(demo): replace loading overlay with inline
 loading states

---
 examples/demo/Assets/Resources/Theme.uss      | 20 ---------
 .../Assets/Scripts/UI/HomeScreenController.cs | 34 ---------------
 .../UI/Sections/AliasesSectionController.cs   |  6 ++-
 .../UI/Sections/EmailsSectionController.cs    |  6 ++-
 .../Scripts/UI/Sections/SectionBuilder.cs     |  9 ++++
 .../UI/Sections/SmsSectionController.cs       |  6 ++-
 .../UI/Sections/TagsSectionController.cs      |  6 ++-
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 41 +++++++++++++++----
 8 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index b03402fa..5fd27bda 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -652,26 +652,6 @@
     background-color: var(--os-primary);
 }
 
-.loading-overlay {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    background-color: var(--os-backdrop);
-    justify-content: center;
-    align-items: center;
-}
-
-.loading-spinner {
-    width: 40px;
-    height: 40px;
-    border-radius: 20px;
-    border-width: 4px;
-    border-color: var(--os-divider);
-    border-top-color: var(--os-primary);
-}
-
 .toast-container {
     position: absolute;
     bottom: 32px;
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 3e8d9e33..567e212b 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -21,9 +21,6 @@ public class HomeScreenController : MonoBehaviour
 
         private VisualElement _root;
         private VisualElement _contentRoot;
-        private VisualElement _loadingOverlay;
-        private VisualElement _spinner;
-        private IVisualElementScheduledItem _spinnerAnim;
         private ToastView _toastView;
 
         private AppSectionController _appSection;
@@ -161,17 +158,6 @@ private void BuildScreen()
             scrollView.Add(_contentRoot);
             screenRoot.Add(scrollView);
 
-            _loadingOverlay = new VisualElement();
-            _loadingOverlay.name = "loading_overlay";
-            _loadingOverlay.AddToClassList("loading-overlay");
-            _loadingOverlay.style.display = DisplayStyle.None;
-
-            _spinner = new VisualElement();
-            _spinner.AddToClassList("loading-spinner");
-            _loadingOverlay.Add(_spinner);
-
-            screenRoot.Add(_loadingOverlay);
-
             _toastView = new ToastView(screenRoot);
 
             _root.Add(screenRoot);
@@ -282,26 +268,6 @@ private void RefreshAll()
             _triggersSection?.Refresh();
             _locationSection?.Refresh();
             _liveActivitiesSection?.Refresh();
-
-            var showLoading = _viewModel.IsLoading;
-            _loadingOverlay.style.display = showLoading ? DisplayStyle.Flex : DisplayStyle.None;
-
-            if (showLoading && _spinnerAnim == null)
-            {
-                float angle = 0f;
-                _spinnerAnim = _spinner
-                    .schedule.Execute(() =>
-                    {
-                        angle = (angle + 12f) % 360f;
-                        _spinner.style.rotate = new Rotate(Angle.Degrees(angle));
-                    })
-                    .Every(16);
-            }
-            else if (!showLoading && _spinnerAnim != null)
-            {
-                _spinnerAnim.Pause();
-                _spinnerAnim = null;
-            }
         }
 
         private void ShowToast(string message) => _toastView?.Show(message);
diff --git a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
index d1f4f8f0..ea92dccd 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
@@ -65,7 +65,11 @@ private void RefreshList()
 
             if (aliases.Count == 0)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No Aliases Added"));
+                _listContainer.Add(
+                    _viewModel.IsLoading
+                        ? SectionBuilder.CreateLoadingState("aliases_loading")
+                        : SectionBuilder.CreateEmptyState("No Aliases Added")
+                );
                 return;
             }
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
index 31c5a112..52c83e0f 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
@@ -58,7 +58,11 @@ private void RefreshList()
 
             if (emails.Count == 0)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No Emails Added"));
+                _listContainer.Add(
+                    _viewModel.IsLoading
+                        ? SectionBuilder.CreateLoadingState("emails_loading")
+                        : SectionBuilder.CreateEmptyState("No Emails Added")
+                );
                 return;
             }
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 18e827ae..9dbbfb11 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -209,5 +209,14 @@ public static Label CreateEmptyState(string text)
             label.AddToClassList("text-empty-state");
             return label;
         }
+
+        public static Label CreateLoadingState(string automationId)
+        {
+            var label = new Label("Loading…");
+            label.name = automationId;
+            label.AddToClassList("empty-state");
+            label.AddToClassList("text-empty-state");
+            return label;
+        }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
index 071d92d5..45052ca9 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
@@ -58,7 +58,11 @@ private void RefreshList()
 
             if (numbers.Count == 0)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No SMS Added"));
+                _listContainer.Add(
+                    _viewModel.IsLoading
+                        ? SectionBuilder.CreateLoadingState("sms_loading")
+                        : SectionBuilder.CreateEmptyState("No SMS Added")
+                );
                 return;
             }
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
index d8e09158..8a1a170f 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
@@ -74,7 +74,11 @@ private void RefreshList()
 
             if (tags.Count == 0)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No Tags Added"));
+                _listContainer.Add(
+                    _viewModel.IsLoading
+                        ? SectionBuilder.CreateLoadingState("tags_loading")
+                        : SectionBuilder.CreateEmptyState("No Tags Added")
+                );
                 _removeSelectedButton.style.display = DisplayStyle.None;
                 return;
             }
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 9ea32159..d347f88d 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -601,14 +601,10 @@ public async Task FetchUserDataFromApi()
                 var userData = await _apiService.FetchUser(onesignalId);
                 if (userData != null)
                 {
-                    _aliasesList = userData
-                        .Aliases.Select(kvp => new KeyValuePair<string, string>(kvp.Key, kvp.Value))
-                        .ToList();
-                    _tagsList = userData
-                        .Tags.Select(kvp => new KeyValuePair<string, string>(kvp.Key, kvp.Value))
-                        .ToList();
-                    _emailsList = new List<string>(userData.Emails);
-                    _smsNumbersList = new List<string>(userData.SmsNumbers);
+                    MergePairs(_aliasesList, userData.Aliases);
+                    MergePairs(_tagsList, userData.Tags);
+                    MergeUnique(_emailsList, userData.Emails);
+                    MergeUnique(_smsNumbersList, userData.SmsNumbers);
 
                     if (!string.IsNullOrEmpty(userData.ExternalId))
                     {
@@ -665,6 +661,35 @@ string value
                 list.Add(new KeyValuePair<string, string>(key, value));
         }
 
+        private static void MergePairs(
+            List<KeyValuePair<string, string>> target,
+            IDictionary<string, string> source
+        )
+        {
+            foreach (var kv in source)
+            {
+                var idx = target.FindIndex(p => p.Key == kv.Key);
+                if (idx >= 0)
+                {
+                    if (!string.Equals(target[idx].Value, kv.Value, StringComparison.Ordinal))
+                        target[idx] = new KeyValuePair<string, string>(kv.Key, kv.Value);
+                }
+                else
+                {
+                    target.Add(new KeyValuePair<string, string>(kv.Key, kv.Value));
+                }
+            }
+        }
+
+        private static void MergeUnique(List<string> target, IEnumerable<string> source)
+        {
+            foreach (var item in source)
+            {
+                if (!target.Contains(item))
+                    target.Add(item);
+            }
+        }
+
         private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEventArgs e)
         {
             var rawPushId = OneSignal.User.PushSubscription.Id ?? "";

From 5d10a9a8fc91d5dfbb89b87decdd4136978ad789 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 15:05:34 -0700
Subject: [PATCH 05/54] chore(demo): improve UI element names for Appium tests

---
 .../Scripts/UI/SecondaryScreenController.cs   |  2 +-
 .../UI/Sections/AliasesSectionController.cs   |  6 +--
 .../UI/Sections/EmailsSectionController.cs    |  6 +--
 .../UI/Sections/LocationSectionController.cs  |  8 +++
 .../Scripts/UI/Sections/SectionBuilder.cs     | 34 ++++++++----
 .../UI/Sections/SmsSectionController.cs       |  6 +--
 .../UI/Sections/TagsSectionController.cs      |  7 +--
 .../UI/Sections/TriggersSectionController.cs  |  5 +-
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 52 ++++++++++++-------
 9 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
index 8a3b808d..224b102d 100644
--- a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
@@ -40,7 +40,7 @@ private void OnEnable()
             content.AddToClassList("centered-content");
 
             var heading = new Label("Secondary Screen");
-            heading.name = "secondary_heading";
+            heading.name = "secondary_activity_label";
             heading.AddToClassList("page-heading");
             content.Add(heading);
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
index ea92dccd..840d1185 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
@@ -67,8 +67,8 @@ private void RefreshList()
             {
                 _listContainer.Add(
                     _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("aliases_loading")
-                        : SectionBuilder.CreateEmptyState("No Aliases Added")
+                        ? SectionBuilder.CreateLoadingState("aliases")
+                        : SectionBuilder.CreateEmptyState("No Aliases Added", "aliases")
                 );
                 return;
             }
@@ -79,7 +79,7 @@ private void RefreshList()
                     _listContainer.Add(SectionBuilder.CreateDivider(tight: true));
                 var kvp = aliases[i];
                 _listContainer.Add(
-                    SectionBuilder.CreateKeyValueItem(kvp.Key, kvp.Value, $"alias_{i}")
+                    SectionBuilder.CreateKeyValueItem(kvp.Key, kvp.Value, "aliases", kvp.Key)
                 );
             }
         }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
index 52c83e0f..4336fb99 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/EmailsSectionController.cs
@@ -60,8 +60,8 @@ private void RefreshList()
             {
                 _listContainer.Add(
                     _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("emails_loading")
-                        : SectionBuilder.CreateEmptyState("No Emails Added")
+                        ? SectionBuilder.CreateLoadingState("emails")
+                        : SectionBuilder.CreateEmptyState("No Emails Added", "emails")
                 );
                 return;
             }
@@ -77,7 +77,7 @@ private void RefreshList()
                 _listContainer.Add(
                     SectionBuilder.CreateSingleItem(
                         email,
-                        $"email_{i}",
+                        "emails",
                         () => _viewModel.RemoveEmail(email)
                     )
                 );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/LocationSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/LocationSectionController.cs
index 3d0d6cb1..46ccad63 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/LocationSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/LocationSectionController.cs
@@ -49,6 +49,14 @@ private VisualElement BuildSection()
                 )
             );
 
+            section.Add(
+                SectionBuilder.CreatePrimaryButton(
+                    "CHECK LOCATION SHARED",
+                    "check_location_button",
+                    () => _viewModel.CheckLocationShared()
+                )
+            );
+
             return section;
         }
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 9dbbfb11..1162adb1 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -27,7 +27,7 @@ public static VisualElement CreateSection(
             if (onInfoTap != null)
             {
                 var infoBtn = new Button(onInfoTap);
-                infoBtn.name = $"{name}_info";
+                infoBtn.name = $"{SectionKeyFromName(name)}_info_icon";
                 infoBtn.text = MaterialIcons.Info;
                 infoBtn.AddToClassList("info-button");
                 header.Add(infoBtn);
@@ -114,24 +114,27 @@ public static VisualElement CreateDivider(bool tight = false)
         public static VisualElement CreateKeyValueItem(
             string key,
             string value,
-            string name = null,
+            string sectionKey = null,
+            string itemKey = null,
             Action onDelete = null
         )
         {
             var item = new VisualElement();
             item.AddToClassList("key-value-item");
-            if (!string.IsNullOrEmpty(name))
-                item.name = name;
 
             var texts = new VisualElement();
             texts.AddToClassList("key-value-texts");
 
             var keyLabel = new Label(key);
+            if (sectionKey != null && itemKey != null)
+                keyLabel.name = $"{sectionKey}_pair_key_{itemKey}";
             keyLabel.AddToClassList("key-value-key");
             keyLabel.AddToClassList("text-card-label");
             texts.Add(keyLabel);
 
             var valueLabel = new Label(value);
+            if (sectionKey != null && itemKey != null)
+                valueLabel.name = $"{sectionKey}_pair_value_{itemKey}";
             valueLabel.AddToClassList("key-value-value");
             valueLabel.AddToClassList("text-toggle-desc");
             texts.Add(valueLabel);
@@ -141,6 +144,8 @@ public static VisualElement CreateKeyValueItem(
             if (onDelete != null)
             {
                 var deleteBtn = new Button(onDelete);
+                if (sectionKey != null && itemKey != null)
+                    deleteBtn.name = $"{sectionKey}_remove_{itemKey}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
                 item.Add(deleteBtn);
@@ -176,16 +181,16 @@ public static VisualElement CreateInlineKeyValue(
 
         public static VisualElement CreateSingleItem(
             string value,
-            string name = null,
+            string sectionKey = null,
             Action onDelete = null
         )
         {
             var item = new VisualElement();
             item.AddToClassList("key-value-item");
-            if (!string.IsNullOrEmpty(name))
-                item.name = name;
 
             var label = new Label(value);
+            if (sectionKey != null)
+                label.name = $"{sectionKey}_value_{value}";
             label.AddToClassList("key-value-key");
             label.AddToClassList("text-card-label");
             label.AddToClassList("flex-grow");
@@ -194,6 +199,8 @@ public static VisualElement CreateSingleItem(
             if (onDelete != null)
             {
                 var deleteBtn = new Button(onDelete);
+                if (sectionKey != null)
+                    deleteBtn.name = $"{sectionKey}_remove_{value}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
                 item.Add(deleteBtn);
@@ -202,21 +209,28 @@ public static VisualElement CreateSingleItem(
             return item;
         }
 
-        public static Label CreateEmptyState(string text)
+        public static Label CreateEmptyState(string text, string sectionKey = null)
         {
             var label = new Label(text);
+            if (sectionKey != null)
+                label.name = $"{sectionKey}_empty";
             label.AddToClassList("empty-state");
             label.AddToClassList("text-empty-state");
             return label;
         }
 
-        public static Label CreateLoadingState(string automationId)
+        public static Label CreateLoadingState(string sectionKey)
         {
             var label = new Label("Loading…");
-            label.name = automationId;
+            label.name = $"{sectionKey}_loading";
             label.AddToClassList("empty-state");
             label.AddToClassList("text-empty-state");
             return label;
         }
+
+        private static string SectionKeyFromName(string name) =>
+            name != null && name.EndsWith("_section")
+                ? name.Substring(0, name.Length - "_section".Length)
+                : name;
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
index 45052ca9..fa95e99d 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SmsSectionController.cs
@@ -60,8 +60,8 @@ private void RefreshList()
             {
                 _listContainer.Add(
                     _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("sms_loading")
-                        : SectionBuilder.CreateEmptyState("No SMS Added")
+                        ? SectionBuilder.CreateLoadingState("sms")
+                        : SectionBuilder.CreateEmptyState("No SMS Added", "sms")
                 );
                 return;
             }
@@ -77,7 +77,7 @@ private void RefreshList()
                 _listContainer.Add(
                     SectionBuilder.CreateSingleItem(
                         sms,
-                        $"sms_{i}",
+                        "sms",
                         () => _viewModel.RemoveSms(sms)
                     )
                 );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
index 8a1a170f..e5b30d11 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
@@ -76,8 +76,8 @@ private void RefreshList()
             {
                 _listContainer.Add(
                     _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("tags_loading")
-                        : SectionBuilder.CreateEmptyState("No Tags Added")
+                        ? SectionBuilder.CreateLoadingState("tags")
+                        : SectionBuilder.CreateEmptyState("No Tags Added", "tags")
                 );
                 _removeSelectedButton.style.display = DisplayStyle.None;
                 return;
@@ -94,7 +94,8 @@ private void RefreshList()
                     SectionBuilder.CreateKeyValueItem(
                         kvp.Key,
                         kvp.Value,
-                        $"tag_{i}",
+                        "tags",
+                        kvp.Key,
                         () => _viewModel.RemoveTag(kvp.Key)
                     )
                 );
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index cfee9f6e..73d726f8 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -88,7 +88,7 @@ private void RefreshList()
 
             if (!hasTriggers)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No Triggers Added"));
+                _listContainer.Add(SectionBuilder.CreateEmptyState("No Triggers Added", "triggers"));
                 return;
             }
 
@@ -101,7 +101,8 @@ private void RefreshList()
                     SectionBuilder.CreateKeyValueItem(
                         kvp.Key,
                         kvp.Value,
-                        $"trigger_{i}",
+                        "triggers",
+                        kvp.Key,
                         () => _viewModel.RemoveTrigger(kvp.Key)
                     )
                 );
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index d347f88d..de3c3408 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -30,6 +30,9 @@ public class AppViewModel : MonoBehaviour
         private bool _hasPermission;
         private bool _isLoading;
 
+        // Drops stale FetchUserDataFromApi responses (mirrors requestSequenceRef in RN useOneSignal).
+        private int _requestSequence;
+
         private List<KeyValuePair<string, string>> _aliasesList = new();
         private List<string> _emailsList = new();
         private List<string> _smsNumbersList = new();
@@ -559,6 +562,12 @@ public void PromptLocation()
             Debug.Log($"[{Tag}] Location permission requested");
         }
 
+        public void CheckLocationShared()
+        {
+            var shared = OneSignal.Location.IsShared;
+            ShowToast($"Location shared: {shared.ToString().ToLowerInvariant()}");
+        }
+
         public async void PromptPush()
         {
             try
@@ -589,45 +598,50 @@ public void SetPushEnabled(bool enabled)
 
         public async Task FetchUserDataFromApi()
         {
+            var requestId = ++_requestSequence;
+            SetLoading(true);
+
             try
             {
                 var onesignalId = OneSignal.User.OneSignalId;
                 if (string.IsNullOrEmpty(onesignalId))
-                {
-                    SetLoading(false);
                     return;
-                }
 
                 var userData = await _apiService.FetchUser(onesignalId);
-                if (userData != null)
-                {
-                    MergePairs(_aliasesList, userData.Aliases);
-                    MergePairs(_tagsList, userData.Tags);
-                    MergeUnique(_emailsList, userData.Emails);
-                    MergeUnique(_smsNumbersList, userData.SmsNumbers);
+                if (userData == null)
+                    return;
 
-                    if (!string.IsNullOrEmpty(userData.ExternalId))
-                    {
-                        _externalUserId = userData.ExternalId;
-                        _prefs.ExternalUserId = userData.ExternalId;
-                    }
+                if (_requestSequence != requestId)
+                    return;
+
+                MergePairs(_aliasesList, userData.Aliases);
+                MergePairs(_tagsList, userData.Tags);
+                MergeUnique(_emailsList, userData.Emails);
+                MergeUnique(_smsNumbersList, userData.SmsNumbers);
 
-                    Debug.Log($"[{Tag}] User data fetched from API");
+                if (!string.IsNullOrEmpty(userData.ExternalId))
+                {
+                    _externalUserId = userData.ExternalId;
+                    _prefs.ExternalUserId = userData.ExternalId;
                 }
 
                 var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
                 _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
                 _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
                 _hasPermission = OneSignal.Notifications.Permission;
+
+                Debug.Log($"[{Tag}] User data fetched from API");
             }
             catch (Exception ex)
             {
                 Debug.LogError($"[{Tag}] Fetch user error: {ex.Message}");
             }
-
-            await Task.Yield();
-            SetLoading(false);
-            NotifyStateChanged();
+            finally
+            {
+                if (_requestSequence == requestId)
+                    SetLoading(false);
+                NotifyStateChanged();
+            }
         }
 
         private void ClearUserData()

From 5f59a7dc0b7d8520a3fd118f3dfec691ef8b2e53 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 28 Apr 2026 16:03:59 -0700
Subject: [PATCH 06/54] feat(demo): add accessibility bridge for Appium E2E

---
 .../Scripts/Services/AccessibilityBridge.cs   | 218 ++++++++++++++++++
 .../Services/AccessibilityBridge.cs.meta      |   2 +
 .../Assets/Scripts/UI/HomeScreenController.cs |   7 +
 .../Scripts/UI/SecondaryScreenController.cs   |   4 +
 4 files changed, 231 insertions(+)
 create mode 100644 examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
 create mode 100644 examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs.meta

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
new file mode 100644
index 00000000..9ad63250
--- /dev/null
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -0,0 +1,218 @@
+#if UNITY_IOS || UNITY_ANDROID
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Accessibility;
+using UnityEngine.UIElements;
+
+namespace OneSignalDemo.Services
+{
+    /// <summary>
+    /// Mirrors the demo's UI Toolkit VisualElement tree into Unity's
+    /// AccessibilityHierarchy so that XCUITest (iOS) and UiAutomator2
+    /// (Android) can locate elements by their VisualElement.name. UI
+    /// Toolkit renders to a single texture-backed view and is invisible to
+    /// platform accessibility services unless we publish a parallel a11y
+    /// tree via this bridge. Active only in E2E mode.
+    /// </summary>
+    public class AccessibilityBridge : MonoBehaviour
+    {
+        // Throttle frame refreshes so scroll/resize don't spam the OS.
+        private const float FrameRefreshIntervalSeconds = 0.25f;
+
+        private static AccessibilityBridge _instance;
+
+        private VisualElement _root;
+        private AccessibilityHierarchy _hierarchy;
+        private readonly Dictionary<VisualElement, AccessibilityNode> _map = new();
+        private bool _resyncScheduled;
+        private float _frameRefreshTimer;
+
+        /// <summary>
+        /// Idempotent entry point. Safe to call multiple times; only the first
+        /// call wires the bridge. No-ops outside E2E_MODE.
+        /// </summary>
+        public static void EnableForE2E(VisualElement root)
+        {
+            if (!DotEnv.IsE2EMode || root == null)
+                return;
+
+            if (_instance == null)
+            {
+                var go = new GameObject("[AccessibilityBridge]");
+                DontDestroyOnLoad(go);
+                _instance = go.AddComponent<AccessibilityBridge>();
+            }
+
+            _instance.Initialize(root);
+        }
+
+        private void Initialize(VisualElement root)
+        {
+            // Detach any prior root's listener (scene reload, dialog re-parent, etc.).
+            if (_root != null && _root != root)
+                _root.UnregisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
+
+            _root = root;
+            _root.RegisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
+
+            // Without this override, AssistiveSupport.activeHierarchy is auto-cleared
+            // whenever the OS reports VoiceOver/TalkBack as off. XCUITest reads the
+            // a11y tree without enabling VoiceOver, so we have to lie.
+            AssistiveSupport.screenReaderStatusOverride =
+                AssistiveSupport.ScreenReaderStatusOverride.ForceEnabled;
+            AssistiveSupport.screenReaderStatusChanged -= OnScreenReaderStatusChanged;
+            AssistiveSupport.screenReaderStatusChanged += OnScreenReaderStatusChanged;
+
+            BuildHierarchy();
+        }
+
+        private void OnDestroy()
+        {
+            if (_root != null)
+                _root.UnregisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
+            AssistiveSupport.screenReaderStatusChanged -= OnScreenReaderStatusChanged;
+            AssistiveSupport.activeHierarchy = null;
+            AssistiveSupport.screenReaderStatusOverride =
+                AssistiveSupport.ScreenReaderStatusOverride.OSDriven;
+            if (_instance == this)
+                _instance = null;
+        }
+
+        private void Update()
+        {
+            // Live frames: scroll position changes don't fire ChildHierarchyChanged
+            // but elements move on screen. Refresh frames + notify the OS so cached
+            // hit-testing in XCUITest stays accurate.
+            _frameRefreshTimer += Time.unscaledDeltaTime;
+            if (_frameRefreshTimer < FrameRefreshIntervalSeconds || _hierarchy == null)
+                return;
+            _frameRefreshTimer = 0f;
+            _hierarchy.RefreshNodeFrames();
+            AssistiveSupport.notificationDispatcher?.SendLayoutChanged();
+        }
+
+        private void OnChildHierarchyChanged(ChildHierarchyChangedEvent evt) => ScheduleResync();
+
+        private void OnScreenReaderStatusChanged(bool _)
+        {
+            // Unity nulls activeHierarchy when the OS reports screen reader off;
+            // reassert immediately since our override should have prevented it.
+            if (_hierarchy != null)
+                AssistiveSupport.activeHierarchy = _hierarchy;
+        }
+
+        private void ScheduleResync()
+        {
+            if (_resyncScheduled || !isActiveAndEnabled)
+                return;
+            _resyncScheduled = true;
+            StartCoroutine(ResyncEndOfFrame());
+        }
+
+        private IEnumerator ResyncEndOfFrame()
+        {
+            // Wait until current frame finishes laying out so child mutations
+            // batch into a single rebuild.
+            yield return new WaitForEndOfFrame();
+            _resyncScheduled = false;
+            BuildHierarchy();
+        }
+
+        private void BuildHierarchy()
+        {
+            if (_root == null)
+                return;
+
+            _hierarchy ??= new AccessibilityHierarchy();
+            _hierarchy.Clear();
+            _map.Clear();
+
+            WalkAndAdd(_root, parent: null);
+
+            AssistiveSupport.activeHierarchy = _hierarchy;
+            AssistiveSupport.notificationDispatcher?.SendScreenChanged();
+        }
+
+        private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
+        {
+            if (el == null)
+                return;
+
+            // Only mirror named elements — the test framework looks up by name
+            // (XCUITest `~name` / UiAutomator2 `id`). Unnamed scaffolding adds
+            // noise and depth without changing test reachability.
+            var nodeForChildren = parent;
+            if (!string.IsNullOrEmpty(el.name))
+            {
+                var node = _hierarchy.AddNode(el.name, parent);
+                var captured = el;
+                node.frameGetter = () => GetScreenRect(captured);
+                node.role = MapRole(el);
+                node.value = ExtractValue(el);
+                node.isActive = IsVisible(el);
+                _map[el] = node;
+                nodeForChildren = node;
+            }
+
+            for (int i = 0; i < el.childCount; i++)
+                WalkAndAdd(el[i], nodeForChildren);
+        }
+
+        private static AccessibilityRole MapRole(VisualElement el) => el switch
+        {
+            Button => AccessibilityRole.Button,
+            Toggle => AccessibilityRole.Toggle,
+            ScrollView => AccessibilityRole.ScrollView,
+            Slider => AccessibilityRole.Slider,
+            TextField => AccessibilityRole.SearchField,
+            Label => AccessibilityRole.StaticText,
+            Image => AccessibilityRole.Image,
+            _ => AccessibilityRole.None,
+        };
+
+        private static string ExtractValue(VisualElement el) => el switch
+        {
+            TextField tf => tf.value ?? string.Empty,
+            Toggle t => t.value ? "1" : "0",
+            Label l => l.text ?? string.Empty,
+            Button b => b.text ?? string.Empty,
+            _ => string.Empty,
+        };
+
+        private static bool IsVisible(VisualElement el)
+        {
+            var s = el.resolvedStyle;
+            return el.enabledInHierarchy
+                && s.display != DisplayStyle.None
+                && s.visibility != Visibility.Hidden
+                && s.opacity > 0f;
+        }
+
+        private static Rect GetScreenRect(VisualElement el)
+        {
+            if (el?.panel == null)
+                return Rect.zero;
+
+            var wb = el.worldBound;
+            if (float.IsNaN(wb.x) || float.IsNaN(wb.y) || wb.width <= 0 || wb.height <= 0)
+                return Rect.zero;
+
+            // Unity returns screen coords with origin at the bottom-left
+            // (OpenGL convention). UIKit/Android UIAccessibility expect
+            // top-left. Unity's iOS/Android backends do the platform flip
+            // internally, so feed bottom-left coords as-is.
+            var topLeft = RuntimePanelUtils.PanelToScreenSpace(
+                el.panel, new Vector2(wb.xMin, wb.yMin));
+            var bottomRight = RuntimePanelUtils.PanelToScreenSpace(
+                el.panel, new Vector2(wb.xMax, wb.yMax));
+
+            float x = Mathf.Min(topLeft.x, bottomRight.x);
+            float y = Mathf.Min(topLeft.y, bottomRight.y);
+            float w = Mathf.Abs(bottomRight.x - topLeft.x);
+            float h = Mathf.Abs(bottomRight.y - topLeft.y);
+            return new Rect(x, y, w, h);
+        }
+    }
+}
+#endif
diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs.meta b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs.meta
new file mode 100644
index 00000000..f3ae9d32
--- /dev/null
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f731f7ecdbc0d44a083358496883f941
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 567e212b..6af72f84 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -57,6 +57,13 @@ private void OnEnable()
 
             BuildScreen();
             WireEvents();
+
+#if UNITY_IOS || UNITY_ANDROID
+            // E2E only: publish the VisualElement tree to platform a11y so
+            // Appium (XCUITest / UiAutomator2) can locate elements by name.
+            // No-op outside E2E_MODE.
+            OneSignalDemo.Services.AccessibilityBridge.EnableForE2E(_root);
+#endif
         }
 
         private void OnDisable()
diff --git a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
index 224b102d..4ddf1398 100644
--- a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
@@ -46,6 +46,10 @@ private void OnEnable()
 
             screenRoot.Add(content);
             root.Add(screenRoot);
+
+#if UNITY_IOS || UNITY_ANDROID
+            OneSignalDemo.Services.AccessibilityBridge.EnableForE2E(root);
+#endif
         }
     }
 }

From ce4aaefb70b858621cde2a63a5bedca05f036b85 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 10:29:53 -0700
Subject: [PATCH 07/54] fix(demo): improve a11y bridge reliability

---
 .../Scripts/Services/AccessibilityBridge.cs   | 157 +++++++++++++-----
 .../demo/Assets/Scripts/Services/DotEnv.cs    |   9 +-
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   |   7 +
 .../Assets/Scripts/UI/Dialogs/LoginDialog.cs  |   1 +
 4 files changed, 133 insertions(+), 41 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 9ad63250..65c9ba36 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -19,6 +19,9 @@ public class AccessibilityBridge : MonoBehaviour
     {
         // Throttle frame refreshes so scroll/resize don't spam the OS.
         private const float FrameRefreshIntervalSeconds = 0.25f;
+        // Throttle structural-change polls. Faster than frame refresh because
+        // dialog open/close should reach the test framework quickly.
+        private const float StructurePollIntervalSeconds = 0.1f;
 
         private static AccessibilityBridge _instance;
 
@@ -27,6 +30,18 @@ public class AccessibilityBridge : MonoBehaviour
         private readonly Dictionary<VisualElement, AccessibilityNode> _map = new();
         private bool _resyncScheduled;
         private float _frameRefreshTimer;
+        private float _structurePollTimer;
+        private int _lastNamedDescendantCount = -1;
+        // Empirically, Unity's iOS accessibility plugin treats the Rect we
+        // hand to AccessibilityNode.frameGetter as if it were already in
+        // physical screen pixels, then divides by the device scale to get
+        // UIKit points. UI Toolkit, however, reports VisualElement.worldBound
+        // in panel-local coordinates (reference resolution scaled to fit), so
+        // unscaled frames render ~1/scale of where the UI is actually drawn.
+        // This factor brings panel coords into the same space the plugin
+        // expects; recomputed on every BuildHierarchy in case the panel size
+        // changes (rotation, safe-area shift, multi-display).
+        private float _panelToScreenScale = 1f;
 
         /// <summary>
         /// Idempotent entry point. Safe to call multiple times; only the first
@@ -34,8 +49,16 @@ public class AccessibilityBridge : MonoBehaviour
         /// </summary>
         public static void EnableForE2E(VisualElement root)
         {
-            if (!DotEnv.IsE2EMode || root == null)
+            if (root == null)
+            {
+                Debug.Log("[A11yBridge] EnableForE2E: root is null, skipping");
+                return;
+            }
+            if (!DotEnv.IsE2EMode)
+            {
+                Debug.Log("[A11yBridge] EnableForE2E: E2E_MODE not set, skipping");
                 return;
+            }
 
             if (_instance == null)
             {
@@ -49,12 +72,8 @@ public static void EnableForE2E(VisualElement root)
 
         private void Initialize(VisualElement root)
         {
-            // Detach any prior root's listener (scene reload, dialog re-parent, etc.).
-            if (_root != null && _root != root)
-                _root.UnregisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
-
             _root = root;
-            _root.RegisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
+            _lastNamedDescendantCount = -1; // force first poll to rebuild
 
             // Without this override, AssistiveSupport.activeHierarchy is auto-cleared
             // whenever the OS reports VoiceOver/TalkBack as off. XCUITest reads the
@@ -69,8 +88,6 @@ private void Initialize(VisualElement root)
 
         private void OnDestroy()
         {
-            if (_root != null)
-                _root.UnregisterCallback<ChildHierarchyChangedEvent>(OnChildHierarchyChanged);
             AssistiveSupport.screenReaderStatusChanged -= OnScreenReaderStatusChanged;
             AssistiveSupport.activeHierarchy = null;
             AssistiveSupport.screenReaderStatusOverride =
@@ -81,18 +98,69 @@ private void OnDestroy()
 
         private void Update()
         {
-            // Live frames: scroll position changes don't fire ChildHierarchyChanged
-            // but elements move on screen. Refresh frames + notify the OS so cached
-            // hit-testing in XCUITest stays accurate.
-            _frameRefreshTimer += Time.unscaledDeltaTime;
-            if (_frameRefreshTimer < FrameRefreshIntervalSeconds || _hierarchy == null)
+            if (_hierarchy == null || _root == null)
                 return;
-            _frameRefreshTimer = 0f;
-            _hierarchy.RefreshNodeFrames();
-            AssistiveSupport.notificationDispatcher?.SendLayoutChanged();
+
+            // Cheap structural-change check: count named descendants and
+            // rebuild on diff. Catches dialog open/close, scene swap, section
+            // refresh — every test-relevant mutation creates or removes named
+            // VisualElements. Avoids hot event hooks during layout.
+            _structurePollTimer += Time.unscaledDeltaTime;
+            if (_structurePollTimer >= StructurePollIntervalSeconds)
+            {
+                _structurePollTimer = 0f;
+                int count = CountNamedDescendants(_root);
+                if (count != _lastNamedDescendantCount)
+                {
+                    _lastNamedDescendantCount = count;
+                    ScheduleResync();
+                }
+            }
+
+            // Live frames + values: scroll/animation moves elements and
+            // toggles/labels mutate text without altering tree structure.
+            // RefreshNodeFrames covers geometry; AccessibilityNode.value is
+            // a plain field with no per-node "value changed" notification
+            // (the dispatcher only exposes Layout/Screen/Page/Announcement),
+            // so writes don't push to the platform unless we re-publish the
+            // whole hierarchy. We compare against last-known values per tick
+            // and rebuild only when something actually changed — avoids the
+            // every-frame churn the Unity perf docs warn against.
+            _frameRefreshTimer += Time.unscaledDeltaTime;
+            if (_frameRefreshTimer >= FrameRefreshIntervalSeconds)
+            {
+                _frameRefreshTimer = 0f;
+                bool dirty = false;
+                foreach (var kvp in _map)
+                {
+                    var el = kvp.Key;
+                    var node = kvp.Value;
+                    var newValue = ExtractValue(el);
+                    var newActive = IsVisible(el);
+                    if (node.value != newValue || node.isActive != newActive)
+                    {
+                        node.value = newValue;
+                        node.isActive = newActive;
+                        dirty = true;
+                    }
+                }
+                _hierarchy.RefreshNodeFrames();
+                if (dirty)
+                    ScheduleResync();
+                else
+                    AssistiveSupport.notificationDispatcher?.SendLayoutChanged();
+            }
         }
 
-        private void OnChildHierarchyChanged(ChildHierarchyChangedEvent evt) => ScheduleResync();
+        private static int CountNamedDescendants(VisualElement el)
+        {
+            if (el == null)
+                return 0;
+            int count = string.IsNullOrEmpty(el.name) ? 0 : 1;
+            for (int i = 0; i < el.childCount; i++)
+                count += CountNamedDescendants(el[i]);
+            return count;
+        }
 
         private void OnScreenReaderStatusChanged(bool _)
         {
@@ -128,10 +196,31 @@ private void BuildHierarchy()
             _hierarchy.Clear();
             _map.Clear();
 
+            // Recompute the panel→screen scale before walking the tree so each
+            // node's frameGetter sees the correct ratio.
+            var rootBound = _root.worldBound;
+            _panelToScreenScale =
+                rootBound.width > 0 ? Screen.width / rootBound.width : 1f;
+
             WalkAndAdd(_root, parent: null);
 
             AssistiveSupport.activeHierarchy = _hierarchy;
             AssistiveSupport.notificationDispatcher?.SendScreenChanged();
+
+            Debug.Log(
+                $"[A11yBridge] Built hierarchy with {_map.Count} named nodes. "
+                    + $"Active={AssistiveSupport.activeHierarchy != null}, "
+                    + $"ScreenReader={AssistiveSupport.isScreenReaderEnabled}"
+            );
+            // Log a sample so we can confirm specific test ids reached the OS.
+            var sample = new System.Text.StringBuilder("[A11yBridge] Names: ");
+            int i = 0;
+            foreach (var kvp in _map)
+            {
+                if (i++ > 0) sample.Append(", ");
+                sample.Append(kvp.Key.name);
+            }
+            Debug.Log(sample.ToString());
         }
 
         private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
@@ -139,24 +228,26 @@ private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
             if (el == null)
                 return;
 
-            // Only mirror named elements — the test framework looks up by name
-            // (XCUITest `~name` / UiAutomator2 `id`). Unnamed scaffolding adds
-            // noise and depth without changing test reachability.
-            var nodeForChildren = parent;
+            // Publish every named element as a direct child of the hierarchy
+            // root (parent: null) — iOS UIAccessibility requires container
+            // elements to themselves be non-elements. Nesting our nodes makes
+            // ancestors opaque hit targets that swallow visibility tests for
+            // descendants (XCUITest reports visible="false" even when the
+            // child's frame is on screen). The test framework only ever looks
+            // up by name, so containment doesn't affect reachability.
             if (!string.IsNullOrEmpty(el.name))
             {
-                var node = _hierarchy.AddNode(el.name, parent);
+                var node = _hierarchy.AddNode(el.name, parent: null);
                 var captured = el;
                 node.frameGetter = () => GetScreenRect(captured);
                 node.role = MapRole(el);
                 node.value = ExtractValue(el);
                 node.isActive = IsVisible(el);
                 _map[el] = node;
-                nodeForChildren = node;
             }
 
             for (int i = 0; i < el.childCount; i++)
-                WalkAndAdd(el[i], nodeForChildren);
+                WalkAndAdd(el[i], parent: null);
         }
 
         private static AccessibilityRole MapRole(VisualElement el) => el switch
@@ -189,7 +280,7 @@ private static bool IsVisible(VisualElement el)
                 && s.opacity > 0f;
         }
 
-        private static Rect GetScreenRect(VisualElement el)
+        private Rect GetScreenRect(VisualElement el)
         {
             if (el?.panel == null)
                 return Rect.zero;
@@ -198,20 +289,8 @@ private static Rect GetScreenRect(VisualElement el)
             if (float.IsNaN(wb.x) || float.IsNaN(wb.y) || wb.width <= 0 || wb.height <= 0)
                 return Rect.zero;
 
-            // Unity returns screen coords with origin at the bottom-left
-            // (OpenGL convention). UIKit/Android UIAccessibility expect
-            // top-left. Unity's iOS/Android backends do the platform flip
-            // internally, so feed bottom-left coords as-is.
-            var topLeft = RuntimePanelUtils.PanelToScreenSpace(
-                el.panel, new Vector2(wb.xMin, wb.yMin));
-            var bottomRight = RuntimePanelUtils.PanelToScreenSpace(
-                el.panel, new Vector2(wb.xMax, wb.yMax));
-
-            float x = Mathf.Min(topLeft.x, bottomRight.x);
-            float y = Mathf.Min(topLeft.y, bottomRight.y);
-            float w = Mathf.Abs(bottomRight.x - topLeft.x);
-            float h = Mathf.Abs(bottomRight.y - topLeft.y);
-            return new Rect(x, y, w, h);
+            float s = _panelToScreenScale;
+            return new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/Services/DotEnv.cs b/examples/demo/Assets/Scripts/Services/DotEnv.cs
index 06c68c40..e96339d6 100644
--- a/examples/demo/Assets/Scripts/Services/DotEnv.cs
+++ b/examples/demo/Assets/Scripts/Services/DotEnv.cs
@@ -55,8 +55,13 @@ public static void Load()
             }
         }
 
-        public static string Get(string key) =>
-            _values.TryGetValue(key, out var value) ? value : "";
+        public static string Get(string key)
+        {
+            // Lazy-load so callers that race AppBootstrapper.Start (e.g. UI
+            // controllers' OnEnable) still see env values on first access.
+            Load();
+            return _values.TryGetValue(key, out var value) ? value : "";
+        }
 
         public static bool IsE2EMode =>
             string.Equals(Get("E2E_MODE"), "true", StringComparison.OrdinalIgnoreCase);
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index be6bc25b..cb748099 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -32,6 +32,13 @@ public void Show(VisualElement parent)
 
         public void Dismiss()
         {
+            // Blur the focused input first so iOS dismisses TouchScreenKeyboard.
+            // Removing a focused TextField from the hierarchy doesn't fire the
+            // focus-out path on its own, leaving the keyboard floating over
+            // the screen content and intercepting subsequent taps on controls
+            // behind it (e.g. the logout button after login).
+            var focused = Container?.focusController?.focusedElement as VisualElement;
+            focused?.Blur();
             Overlay?.RemoveFromHierarchy();
         }
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
index 602a6cfb..846b272a 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
@@ -57,6 +57,7 @@ private void OnConfirm()
             var value = _externalIdField?.value;
             if (!string.IsNullOrEmpty(value))
             {
+                _externalIdField?.Blur();
                 _onConfirm?.Invoke(value);
                 Dismiss();
             }

From 976475e9d744b2a10d3c7fd93fd24cc6defd504b Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 13:11:52 -0700
Subject: [PATCH 08/54] fix(demo): force iOS keyboard dismiss on modal close

---
 examples/demo/Assets/Plugins/iOS.meta         |  8 +++++
 .../Plugins/iOS/OneSignalDemoKeyboard.mm      |  8 +++++
 .../Plugins/iOS/OneSignalDemoKeyboard.mm.meta |  2 ++
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   | 33 +++++++++++++++----
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 examples/demo/Assets/Plugins/iOS.meta
 create mode 100644 examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm
 create mode 100644 examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.meta

diff --git a/examples/demo/Assets/Plugins/iOS.meta b/examples/demo/Assets/Plugins/iOS.meta
new file mode 100644
index 00000000..585a379c
--- /dev/null
+++ b/examples/demo/Assets/Plugins/iOS.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e50fcac533b954faeab65c9328164d33
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm b/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm
new file mode 100644
index 00000000..4a1bf833
--- /dev/null
+++ b/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm
@@ -0,0 +1,8 @@
+#import <UIKit/UIKit.h>
+
+// Resign first responder so the iOS keyboard view tears down immediately.
+// UIToolkit's TextField.Blur() and TouchScreenKeyboard APIs don't reliably
+// dismiss the UIKit keyboard when a UIToolkit-owned modal closes.
+extern "C" void OneSignalDemoEndEditing() {
+    [UIApplication.sharedApplication.keyWindow endEditing:YES];
+}
diff --git a/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.meta b/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.meta
new file mode 100644
index 00000000..cd4e1406
--- /dev/null
+++ b/examples/demo/Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0db794f4e84ab424fab6b119789907d0
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index cb748099..2b163214 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -1,10 +1,22 @@
 using System;
+using System.Runtime.InteropServices;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Dialogs
 {
     public abstract class DialogBase
     {
+#if UNITY_IOS && !UNITY_EDITOR
+        // Native bridge in Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.
+        // Calls [keyWindow endEditing:YES] to dismiss the iOS keyboard view
+        // immediately. UIToolkit's TextField.Blur() and TouchScreenKeyboard.
+        // Open("").active = false don't reliably tear down the UIKit keyboard
+        // when a UIToolkit-owned modal dismisses, leaving it floating over the
+        // app and blocking taps on controls behind it.
+        [DllImport("__Internal")]
+        private static extern void OneSignalDemoEndEditing();
+#endif
+
         protected VisualElement Overlay { get; private set; }
         protected VisualElement Container { get; private set; }
         private VisualElement _parent;
@@ -32,13 +44,22 @@ public void Show(VisualElement parent)
 
         public void Dismiss()
         {
-            // Blur the focused input first so iOS dismisses TouchScreenKeyboard.
-            // Removing a focused TextField from the hierarchy doesn't fire the
-            // focus-out path on its own, leaving the keyboard floating over
-            // the screen content and intercepting subsequent taps on controls
+            // Blur is harmless and keeps UIToolkit's focus state consistent,
+            // but does NOT close the iOS keyboard on its own (verified at
+            // runtime — UIToolkit owns the TouchScreenKeyboard internally and
+            // its focus-out path doesn't propagate to the UIKit first
+            // responder).
+            var textField = Container?.Q<TextField>();
+            textField?.Blur();
+
+#if UNITY_IOS && !UNITY_EDITOR
+            // Force UIKit to resign first responder so the keyboard view tears
+            // down immediately. Without this the keyboard stays floating over
+            // the app after the modal closes and blocks taps on controls
             // behind it (e.g. the logout button after login).
-            var focused = Container?.focusController?.focusedElement as VisualElement;
-            focused?.Blur();
+            OneSignalDemoEndEditing();
+#endif
+
             Overlay?.RemoveFromHierarchy();
         }
 

From 44978e3da994a13281083e7dc93e8ca5b908f9de Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 13:32:19 -0700
Subject: [PATCH 09/54] fix(demo): fix loading state in login/logout flow

---
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index de3c3408..0378b69e 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -133,10 +133,7 @@ public async Task LoadInitialDataAsync()
             var onesignalId = OneSignal.User.OneSignalId;
             if (!string.IsNullOrEmpty(onesignalId))
             {
-                SetLoading(true);
                 await FetchUserDataFromApi();
-                await Task.Yield();
-                SetLoading(false);
             }
         }
 
@@ -145,28 +142,37 @@ public void LoginUser(string externalUserId)
             if (string.IsNullOrEmpty(externalUserId))
                 return;
 
+            ClearUserData();
             SetLoading(true);
-            _externalUserId = externalUserId;
-            _prefs.ExternalUserId = externalUserId;
 
-            ClearUserData();
-            OneSignal.Login(externalUserId);
+            try
+            {
+                OneSignal.Login(externalUserId);
+                _prefs.ExternalUserId = externalUserId;
+                _externalUserId = externalUserId;
+
+                Debug.Log($"[{Tag}] Logged in as: {externalUserId}");
+                ShowToast($"Logged in as: {externalUserId}");
+                // The user 'change' listener runs FetchUserDataFromApi once the new
+                // onesignalId is assigned; that call clears isLoading in its finally.
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"[{Tag}] Login error: {ex.Message}");
+                SetLoading(false);
+            }
 
-            Debug.Log($"[{Tag}] Logged in as: {externalUserId}");
-            ShowToast($"Logged in as: {externalUserId}");
             NotifyStateChanged();
         }
 
         public void LogoutUser()
         {
-            SetLoading(true);
             OneSignal.Logout();
 
             _externalUserId = "";
             _prefs.ExternalUserId = "";
             ClearUserData();
 
-            SetLoading(false);
             Debug.Log($"[{Tag}] Logged out");
             ShowToast("Logged out");
             NotifyStateChanged();

From 185d13d96f2a430d675a42c091c0ae13c7961ca2 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 17:08:10 -0700
Subject: [PATCH 10/54] fix(demo): fix info-icon taps in Appium E2E tests

---
 examples/demo/Assets/Resources/Theme.uss      |  9 +++--
 .../Scripts/Services/AccessibilityBridge.cs   | 10 ++++--
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   | 33 ++++++++++++++++---
 .../Scripts/UI/Sections/SectionBuilder.cs     | 18 ++++++++--
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index 5fd27bda..fcceb1b5 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -178,8 +178,13 @@
 }
 
 .info-button {
-    width: 18px;
-    height: 18px;
+    /* 44px touch target meets the iOS HIG minimum. The Material icon
+       glyph is still rendered at 18px (font-size), centered via text-align,
+       so the button looks unchanged but absorbs small Appium tap-coord
+       drift after ScrollView momentum / accessibility-frame settle. The
+       transparent background keeps it visually identical. */
+    width: 44px;
+    height: 44px;
     background-color: rgba(0, 0, 0, 0);
     color: var(--os-grey-500);
     font-size: 18px;
diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 65c9ba36..cd105441 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -17,8 +17,14 @@ namespace OneSignalDemo.Services
     /// </summary>
     public class AccessibilityBridge : MonoBehaviour
     {
-        // Throttle frame refreshes so scroll/resize don't spam the OS.
-        private const float FrameRefreshIntervalSeconds = 0.25f;
+        // Throttle frame refreshes so scroll/resize don't spam the OS. 50ms
+        // (20 Hz) is short enough that mid-scroll-animation taps land on the
+        // correct element (Appium tap latency is ~80-150ms, so the frame the
+        // test framework reads is at most one tick stale), and long enough
+        // not to overwhelm the platform plugin. At the original 250ms,
+        // frames lagged the live UI badly enough that taps for
+        // send_push_info_icon landed on send_simple_button.
+        private const float FrameRefreshIntervalSeconds = 0.05f;
         // Throttle structural-change polls. Faster than frame refresh because
         // dialog open/close should reach the test framework quickly.
         private const float StructurePollIntervalSeconds = 0.1f;
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index 2b163214..6bc11fe5 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -6,6 +6,33 @@ namespace OneSignalDemo.UI.Dialogs
 {
     public abstract class DialogBase
     {
+        // Hooks a panel-root PointerDown handler that dispatches taps on
+        // section info icons (elements named "*_info_icon") through a
+        // name->Action lookup registered by SectionBuilder. UIToolkit's
+        // normal AtTarget dispatch was observed to drop PointerDown on the
+        // info Label after iOS Appium injected a mobile:scroll gesture in
+        // the same test (the panel root sees the event with the correct
+        // target, but the target's own callback never fires). Dispatching
+        // from the panel root sidesteps whatever state breaks normal
+        // dispatch and keeps E2E taps reliable.
+        private static bool _infoFallbackHooked;
+        private static void HookInfoIconFallback(VisualElement parent)
+        {
+            if (_infoFallbackHooked) return;
+            var root = parent?.panel?.visualTree;
+            if (root == null) return;
+            _infoFallbackHooked = true;
+            root.RegisterCallback<PointerDownEvent>(e =>
+            {
+                var t = e.target as VisualElement;
+                if (t?.name == null || !t.name.EndsWith("_info_icon")) return;
+                if (!OneSignalDemo.UI.Sections.SectionBuilder.InfoTapByName
+                    .TryGetValue(t.name, out var action) || action == null) return;
+                action();
+                e.StopPropagation();
+            }, TrickleDown.TrickleDown);
+        }
+
 #if UNITY_IOS && !UNITY_EDITOR
         // Native bridge in Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.
         // Calls [keyWindow endEditing:YES] to dismiss the iOS keyboard view
@@ -24,6 +51,7 @@ public abstract class DialogBase
         public void Show(VisualElement parent)
         {
             _parent = parent;
+            HookInfoIconFallback(parent);
 
             Overlay = new VisualElement();
             Overlay.AddToClassList("dialog-overlay");
@@ -44,11 +72,6 @@ public void Show(VisualElement parent)
 
         public void Dismiss()
         {
-            // Blur is harmless and keeps UIToolkit's focus state consistent,
-            // but does NOT close the iOS keyboard on its own (verified at
-            // runtime — UIToolkit owns the TouchScreenKeyboard internally and
-            // its focus-out path doesn't propagate to the UIKit first
-            // responder).
             var textField = Container?.Q<TextField>();
             textField?.Blur();
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 1162adb1..21893e8c 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -6,6 +6,15 @@ namespace OneSignalDemo.UI.Sections
 {
     public static class SectionBuilder
     {
+        // Maps info-icon element name (e.g. "send_push_info_icon") to its
+        // onInfoTap action. DialogBase reads this from a panel-root
+        // PointerDown handler to dispatch info-icon taps. UIToolkit's normal
+        // AtTarget dispatch was observed to drop PointerDown on the Label
+        // after iOS Appium injected a mobile:scroll gesture in the same test,
+        // so a root-level dispatch path is used to keep E2E taps reliable.
+        public static readonly System.Collections.Generic.Dictionary<string, Action> InfoTapByName =
+            new System.Collections.Generic.Dictionary<string, Action>();
+
         public static VisualElement CreateSection(
             string title,
             string name,
@@ -26,10 +35,15 @@ public static VisualElement CreateSection(
 
             if (onInfoTap != null)
             {
-                var infoBtn = new Button(onInfoTap);
+                // Plain Label (no Button/Clickable manipulator) so PointerDown
+                // dispatch is not affected by manipulator-level pointer
+                // capture. The actual tap handler is wired at the panel root
+                // via InfoTapByName; see DialogBase.HookInfoIconFallback.
+                var infoBtn = new Label(MaterialIcons.Info);
                 infoBtn.name = $"{SectionKeyFromName(name)}_info_icon";
-                infoBtn.text = MaterialIcons.Info;
                 infoBtn.AddToClassList("info-button");
+                infoBtn.pickingMode = PickingMode.Position;
+                InfoTapByName[infoBtn.name] = onInfoTap;
                 header.Add(infoBtn);
             }
 

From bd65c0be47d61100388c439b29942f3cc375ad92 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 17:14:34 -0700
Subject: [PATCH 11/54] fix(demo): add a11y support for SwitchToggle

---
 .../demo/Assets/Scripts/Services/AccessibilityBridge.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index cd105441..d697bf73 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -260,6 +260,7 @@ private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
         {
             Button => AccessibilityRole.Button,
             Toggle => AccessibilityRole.Toggle,
+            OneSignalDemo.UI.SwitchToggle => AccessibilityRole.Toggle,
             ScrollView => AccessibilityRole.ScrollView,
             Slider => AccessibilityRole.Slider,
             TextField => AccessibilityRole.SearchField,
@@ -272,6 +273,11 @@ private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
         {
             TextField tf => tf.value ?? string.Empty,
             Toggle t => t.value ? "1" : "0",
+            // The demo uses a custom SwitchToggle (VisualElement) that does
+            // not inherit from UnityEngine.UIElements.Toggle, so the platform
+            // a11y value would be empty without this case. The selectors
+            // helper reads `value`/`checked` and expects "1"/"0" on iOS.
+            OneSignalDemo.UI.SwitchToggle st => st.Value ? "1" : "0",
             Label l => l.text ?? string.Empty,
             Button b => b.text ?? string.Empty,
             _ => string.Empty,

From ba1e6161c7bc84e9d41e14c4c78e97a6a3b91a73 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 17:28:12 -0700
Subject: [PATCH 12/54] feat(demo): add iOS signing post-processor

---
 .../App/Editor/iOS/SigningPostProcessor.cs    | 154 ++++++++++++++++++
 .../Editor/iOS/SigningPostProcessor.cs.meta   |   2 +
 .../demo/Assets/Scripts/AppBootstrapper.cs    |   4 +-
 examples/demo/iOS/ExportOptions.plist         |  23 +++
 4 files changed, 181 insertions(+), 2 deletions(-)
 create mode 100644 examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs
 create mode 100644 examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs.meta
 create mode 100644 examples/demo/iOS/ExportOptions.plist

diff --git a/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs b/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs
new file mode 100644
index 00000000..e42d5453
--- /dev/null
+++ b/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs
@@ -0,0 +1,154 @@
+#if UNITY_IOS
+
+using System.IO;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEditor.iOS.Xcode;
+using UnityEngine;
+
+namespace App.Editor.iOS
+{
+    /// <summary>
+    /// Final iOS post-processor for the demo app. Runs AFTER the OneSignal
+    /// SDK and demo widget post-processors so it can correct things they set:
+    ///
+    ///  1. Flips the main target's aps-environment from "production" (the SDK
+    ///     default) to "development". The demo only ever runs on simulator or
+    ///     a development device; "production" mismatches the simulator's APNS
+    ///     environment and triggers iOS's "Keep receiving notifications?"
+    ///     tuning prompt on first delivery (matches what the Flutter demo
+    ///     ships with).
+    ///
+    ///  2. Normalizes extension bundle IDs to short suffixes (`.NSE`, `.LA`)
+    ///     to match the Flutter demo and keep provisioning profile names
+    ///     consistent across SDKs.
+    ///
+    ///  3. Pins DEVELOPMENT_TEAM on all targets so a future Manual signing
+    ///     setup with the OneSignal-owned profiles works without manual
+    ///     fix-up in Xcode.
+    /// </summary>
+    public class SigningPostProcessor : IPostprocessBuildWithReport
+    {
+        private const string AppleTeamId = "99SW8E36CT";
+        private const string ApsEnvironment = "development";
+
+        private const string NseTargetName = "OneSignalNotificationServiceExtension";
+        private const string WidgetTargetName = "OneSignalWidget";
+
+        // Short bundle-id suffixes (match the Flutter demo).
+        private const string NseBundleSuffix = "NSE";
+        private const string WidgetBundleSuffix = "LA";
+
+        // Run after both demo widget post-processor (45) and SDK
+        // post-processor (45). 100 puts us after pod install (50) too.
+        public int callbackOrder => 100;
+
+        public void OnPostprocessBuild(BuildReport report)
+        {
+            if (report.summary.platform != BuildTarget.iOS)
+                return;
+
+            var outputPath = report.summary.outputPath;
+            FixupApsEnvironment(outputPath);
+            FixupSigningAndBundleIds(outputPath);
+        }
+
+        private static void FixupApsEnvironment(string outputPath)
+        {
+            var project = new PBXProject();
+            var projectPath = PBXProject.GetPBXProjectPath(outputPath);
+            project.ReadFromString(File.ReadAllText(projectPath));
+
+            var mainTargetGuid = project.GetUnityMainTargetGuid();
+            var relPath = project.GetBuildPropertyForAnyConfig(
+                mainTargetGuid,
+                "CODE_SIGN_ENTITLEMENTS"
+            );
+
+            if (string.IsNullOrEmpty(relPath))
+            {
+                Debug.LogWarning(
+                    "[SigningPostProcessor] Main target has no CODE_SIGN_ENTITLEMENTS; "
+                        + "skipping aps-environment fixup."
+                );
+                return;
+            }
+
+            var fullPath = Path.Combine(outputPath, relPath);
+            if (!File.Exists(fullPath))
+            {
+                Debug.LogWarning(
+                    $"[SigningPostProcessor] Entitlements file not found at {fullPath}; skipping."
+                );
+                return;
+            }
+
+            var plist = new PlistDocument();
+            plist.ReadFromFile(fullPath);
+            plist.root.SetString("aps-environment", ApsEnvironment);
+            plist.WriteToFile(fullPath);
+
+            Debug.Log(
+                $"[SigningPostProcessor] Set aps-environment=\"{ApsEnvironment}\" in {relPath}"
+            );
+        }
+
+        private static void FixupSigningAndBundleIds(string outputPath)
+        {
+            var project = new PBXProject();
+            var projectPath = PBXProject.GetPBXProjectPath(outputPath);
+            project.ReadFromString(File.ReadAllText(projectPath));
+
+            var appId = PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.iOS);
+
+            ApplyTeamId(project, project.GetUnityMainTargetGuid(), "Unity-iPhone");
+
+            ApplyExtensionFixup(
+                project,
+                NseTargetName,
+                $"{appId}.{NseBundleSuffix}"
+            );
+            ApplyExtensionFixup(
+                project,
+                WidgetTargetName,
+                $"{appId}.{WidgetBundleSuffix}"
+            );
+
+            File.WriteAllText(projectPath, project.WriteToString());
+        }
+
+        private static void ApplyTeamId(PBXProject project, string targetGuid, string label)
+        {
+            if (string.IsNullOrEmpty(targetGuid))
+                return;
+
+            project.SetBuildProperty(targetGuid, "DEVELOPMENT_TEAM", AppleTeamId);
+            Debug.Log($"[SigningPostProcessor] Pinned DEVELOPMENT_TEAM={AppleTeamId} on {label}");
+        }
+
+        private static void ApplyExtensionFixup(
+            PBXProject project,
+            string targetName,
+            string bundleId
+        )
+        {
+            var guid = project.TargetGuidByName(targetName);
+            if (string.IsNullOrEmpty(guid))
+            {
+                Debug.LogWarning(
+                    $"[SigningPostProcessor] Target '{targetName}' not found; skipping."
+                );
+                return;
+            }
+
+            project.SetBuildProperty(guid, "PRODUCT_BUNDLE_IDENTIFIER", bundleId);
+            ApplyTeamId(project, guid, targetName);
+            Debug.Log(
+                $"[SigningPostProcessor] Set {targetName} PRODUCT_BUNDLE_IDENTIFIER={bundleId}"
+            );
+        }
+    }
+}
+
+#endif
diff --git a/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs.meta b/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs.meta
new file mode 100644
index 00000000..8cc7d24d
--- /dev/null
+++ b/examples/demo/Assets/App/Editor/iOS/SigningPostProcessor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2e20b362e592d44d6a523d29a9c059f6
\ No newline at end of file
diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index 421ac489..672e72ad 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -5,6 +5,7 @@
 using OneSignalSDK.InAppMessages;
 using OneSignalSDK.LiveActivities;
 using OneSignalSDK.Notifications;
+using OneSignalSDK.Notifications.Models;
 using UnityEngine;
 
 namespace OneSignalDemo
@@ -65,8 +66,7 @@ private async void Start()
             _viewModel.LoadInitialState();
             await _viewModel.LoadInitialDataAsync();
 
-            if (!_viewModel.HasPermission)
-                _viewModel.PromptPush();
+            _viewModel.PromptPush();
 
             _ = TooltipHelper.Instance.InitAsync();
             Debug.Log($"[{Tag}] App initialized");
diff --git a/examples/demo/iOS/ExportOptions.plist b/examples/demo/iOS/ExportOptions.plist
new file mode 100644
index 00000000..b8104582
--- /dev/null
+++ b/examples/demo/iOS/ExportOptions.plist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>method</key>
+  <string>debugging</string>
+  <key>teamID</key>
+  <string>99SW8E36CT</string>
+  <key>signingStyle</key>
+  <string>manual</string>
+  <key>stripSwiftSymbols</key>
+  <true/>
+  <key>provisioningProfiles</key>
+  <dict>
+    <key>com.onesignal.example</key>
+    <string>Appium Demo - Main</string>
+    <key>com.onesignal.example.NSE</key>
+    <string>Appium Demo - NSE</string>
+    <key>com.onesignal.example.LA</key>
+    <string>Appium Demo - Live Activity</string>
+  </dict>
+</dict>
+</plist>

From dd0d6dec0356b178f632388ebaa6702abc7d675b Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 19:00:35 -0700
Subject: [PATCH 13/54] fix(demo): source IAM paused state from prefs

---
 examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 0378b69e..eb609a49 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -116,7 +116,7 @@ public void LoadInitialState()
             _appId = IsE2EMode ? MaskValue(rawAppId) : rawAppId;
             _consentRequired = _prefs.ConsentRequired;
             _privacyConsentGiven = _prefs.PrivacyConsent;
-            _inAppMessagesPaused = OneSignal.InAppMessages.Paused;
+            _inAppMessagesPaused = _prefs.IamPaused;
             _locationShared = OneSignal.Location.IsShared;
             _externalUserId = _prefs.ExternalUserId;
 

From fad8cf541301d8fd1e9f6d88cccde511f7376aa1 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 20:51:43 -0700
Subject: [PATCH 14/54] fix(demo): clarify add button labels

---
 .../Assets/Scripts/UI/Sections/AliasesSectionController.cs    | 4 ++--
 .../demo/Assets/Scripts/UI/Sections/TagsSectionController.cs  | 4 ++--
 .../Assets/Scripts/UI/Sections/TriggersSectionController.cs   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
index 840d1185..d14236b0 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
@@ -39,14 +39,14 @@ private VisualElement BuildSection()
 
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD",
+                    "ADD ALIAS",
                     "add_alias_button",
                     () => OnAddTap?.Invoke()
                 )
             );
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD MULTIPLE",
+                    "ADD MULTIPLE ALIASES",
                     "add_multiple_aliases_button",
                     () => OnAddMultipleTap?.Invoke()
                 )
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
index e5b30d11..3331466f 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
@@ -41,14 +41,14 @@ private VisualElement BuildSection()
 
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD",
+                    "ADD TAG",
                     "add_tag_button",
                     () => OnAddTap?.Invoke()
                 )
             );
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD MULTIPLE",
+                    "ADD MULTIPLE TAGS",
                     "add_multiple_tags_button",
                     () => OnAddMultipleTap?.Invoke()
                 )
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index 73d726f8..eb486ec0 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -42,14 +42,14 @@ private VisualElement BuildSection()
 
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD",
+                    "ADD TRIGGER",
                     "add_trigger_button",
                     () => OnAddTap?.Invoke()
                 )
             );
             section.Add(
                 SectionBuilder.CreatePrimaryButton(
-                    "ADD MULTIPLE",
+                    "ADD MULTIPLE TRIGGERS",
                     "add_multiple_triggers_button",
                     () => OnAddMultipleTap?.Invoke()
                 )

From 66d364e14dccdf52aeb596668dc4e2ba83c73258 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 21:01:03 -0700
Subject: [PATCH 15/54] fix(demo): align dialog to top with padding

---
 examples/demo/Assets/Resources/Theme.uss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index fcceb1b5..a37d622c 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -487,8 +487,9 @@
     top: 0;
     bottom: 0;
     background-color: var(--os-backdrop);
-    justify-content: center;
+    justify-content: flex-start;
     align-items: center;
+    padding-top: 80px;
 }
 
 .dialog-container {

From 45acb10f3fe13c579583b75d2852cb78384e5873 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 22:14:03 -0700
Subject: [PATCH 16/54] fix(demo): add a11y label to toast for Appium

---
 .../Assets/Scripts/UI/Sections/TriggersSectionController.cs    | 2 +-
 examples/demo/Assets/Scripts/UI/ToastView.cs                   | 3 +++
 examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index eb486ec0..46cb2986 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -88,7 +88,7 @@ private void RefreshList()
 
             if (!hasTriggers)
             {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No Triggers Added", "triggers"));
+                _listContainer.Add(SectionBuilder.CreateEmptyState("No triggers added", "triggers"));
                 return;
             }
 
diff --git a/examples/demo/Assets/Scripts/UI/ToastView.cs b/examples/demo/Assets/Scripts/UI/ToastView.cs
index 74abe80e..b27365bd 100644
--- a/examples/demo/Assets/Scripts/UI/ToastView.cs
+++ b/examples/demo/Assets/Scripts/UI/ToastView.cs
@@ -23,6 +23,9 @@ public void Show(string message)
             _container.AddToClassList("toast-container");
 
             var label = new Label(message);
+            // Surface the message text to iOS accessibility so Appium's
+            // `label/name/value == "..."` predicate can locate the toast.
+            label.name = message;
             label.AddToClassList("toast-label");
             _container.Add(label);
 
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index eb609a49..37e9427a 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -346,7 +346,7 @@ public void SendOutcomeWithValue(string name, float value)
         {
             OneSignal.Session.AddOutcomeWithValue(name, value);
             Debug.Log($"[{Tag}] Outcome sent: {name} = {value}");
-            ShowToast($"Outcome sent: {name}");
+            ShowToast($"Outcome sent: {name} = {value}");
         }
 
         public void TrackEvent(string name, Dictionary<string, object> properties = null)

From cbd0970a144050c52eb0bf814870ddf6b3a206a7 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 23:02:48 -0700
Subject: [PATCH 17/54] wip

---
 .../Scripts/Services/AccessibilityBridge.cs   | 168 +++++++++++++++---
 .../Assets/Scripts/Services/E2EDebugLog.cs    |  62 +++++++
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   |  20 ++-
 3 files changed, 229 insertions(+), 21 deletions(-)
 create mode 100644 examples/demo/Assets/Scripts/Services/E2EDebugLog.cs

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index d697bf73..732e5791 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -17,16 +17,18 @@ namespace OneSignalDemo.Services
     /// </summary>
     public class AccessibilityBridge : MonoBehaviour
     {
-        // Throttle frame refreshes so scroll/resize don't spam the OS. 50ms
-        // (20 Hz) is short enough that mid-scroll-animation taps land on the
-        // correct element (Appium tap latency is ~80-150ms, so the frame the
-        // test framework reads is at most one tick stale), and long enough
-        // not to overwhelm the platform plugin. At the original 250ms,
-        // frames lagged the live UI badly enough that taps for
-        // send_push_info_icon landed on send_simple_button.
+        // Backstop frame refresh tick. The hot path is GeometryChangedEvent
+        // (registered in BuildHierarchy) which dispatches a same-frame
+        // refresh whenever anything in the tree resizes, scrolls, or
+        // re-layouts. The timer only catches drift from sources that don't
+        // raise GeometryChangedEvent — animation curves, opacity tweens, and
+        // value mutations on TextField/Toggle/Label.
         private const float FrameRefreshIntervalSeconds = 0.05f;
-        // Throttle structural-change polls. Faster than frame refresh because
-        // dialog open/close should reach the test framework quickly.
+        // Backstop structural poll. The hot path is DetachFromPanelEvent
+        // (per node, see WalkAndAdd) which schedules an immediate resync the
+        // moment a tracked element leaves the tree. The timer catches
+        // additions, since a freshly-created VisualElement has nothing for
+        // us to subscribe to until BuildHierarchy walks it.
         private const float StructurePollIntervalSeconds = 0.1f;
 
         private static AccessibilityBridge _instance;
@@ -35,9 +37,19 @@ public class AccessibilityBridge : MonoBehaviour
         private AccessibilityHierarchy _hierarchy;
         private readonly Dictionary<VisualElement, AccessibilityNode> _map = new();
         private bool _resyncScheduled;
+        private bool _frameRefreshScheduled;
         private float _frameRefreshTimer;
         private float _structurePollTimer;
         private int _lastNamedDescendantCount = -1;
+        private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
+        private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
+
+        public AccessibilityBridge()
+        {
+            _onGeometryChanged = _ => ScheduleFrameRefresh();
+            _onDetachFromPanel = _ => ScheduleResync();
+        }
+
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
         // hand to AccessibilityNode.frameGetter as if it were already in
         // physical screen pixels, then divides by the device scale to get
@@ -98,10 +110,35 @@ private void OnDestroy()
             AssistiveSupport.activeHierarchy = null;
             AssistiveSupport.screenReaderStatusOverride =
                 AssistiveSupport.ScreenReaderStatusOverride.OSDriven;
+            UnregisterTreeCallbacks();
             if (_instance == this)
                 _instance = null;
         }
 
+        private void UnregisterTreeCallbacks()
+        {
+            if (_root != null)
+                _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
+            foreach (var el in _map.Keys)
+                el.UnregisterCallback(_onDetachFromPanel);
+        }
+
+        private void ScheduleFrameRefresh()
+        {
+            if (_frameRefreshScheduled || !isActiveAndEnabled)
+                return;
+            _frameRefreshScheduled = true;
+            StartCoroutine(RefreshFramesEndOfFrame());
+        }
+
+        private IEnumerator RefreshFramesEndOfFrame()
+        {
+            yield return new WaitForEndOfFrame();
+            _frameRefreshScheduled = false;
+            if (_hierarchy != null)
+                _hierarchy.RefreshNodeFrames();
+        }
+
         private void Update()
         {
             if (_hierarchy == null || _root == null)
@@ -198,6 +235,8 @@ private void BuildHierarchy()
             if (_root == null)
                 return;
 
+            UnregisterTreeCallbacks();
+
             _hierarchy ??= new AccessibilityHierarchy();
             _hierarchy.Clear();
             _map.Clear();
@@ -208,16 +247,59 @@ private void BuildHierarchy()
             _panelToScreenScale =
                 rootBound.width > 0 ? Screen.width / rootBound.width : 1f;
 
-            WalkAndAdd(_root, parent: null);
+            // TrickleDown so we receive geometry events bubbling up from
+            // every descendant without having to register per-element. One
+            // callback drives a coalesced end-of-frame RefreshNodeFrames so
+            // a tap fired immediately after a scroll sees fresh frames
+            // instead of a 50ms-stale snapshot.
+            _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
+
+            WalkAndAdd(_root);
 
             AssistiveSupport.activeHierarchy = _hierarchy;
             AssistiveSupport.notificationDispatcher?.SendScreenChanged();
+            _hierarchy.RefreshNodeFrames();
 
             Debug.Log(
                 $"[A11yBridge] Built hierarchy with {_map.Count} named nodes. "
                     + $"Active={AssistiveSupport.activeHierarchy != null}, "
                     + $"ScreenReader={AssistiveSupport.isScreenReaderEnabled}"
             );
+
+            // #region agent log
+#if UNITY_IOS || UNITY_ANDROID
+            var safe = Screen.safeArea;
+            string panelToScreenSampleJson = "null";
+            VisualElement targetEl = null;
+            foreach (var kvp in _map)
+            {
+                if (kvp.Key.name == "add_multiple_triggers_button")
+                {
+                    targetEl = kvp.Key;
+                    break;
+                }
+            }
+            if (targetEl != null)
+            {
+                var wb = targetEl.worldBound;
+                var screenRect = GetScreenRect(targetEl);
+                panelToScreenSampleJson =
+                    "{\"name\":\"add_multiple_triggers_button\","
+                    + $"\"worldBound\":{{\"x\":{wb.x:F2},\"y\":{wb.y:F2},\"w\":{wb.width:F2},\"h\":{wb.height:F2}}},"
+                    + $"\"screenRect\":{{\"x\":{screenRect.x:F2},\"y\":{screenRect.y:F2},\"w\":{screenRect.width:F2},\"h\":{screenRect.height:F2}}}}}";
+            }
+            E2EDebugLog.Send(
+                "AccessibilityBridge.cs:BuildHierarchy",
+                "rebuilt",
+                "{\"namedCount\":" + _map.Count + ","
+                    + $"\"screenPx\":{{\"w\":{Screen.width},\"h\":{Screen.height}}},"
+                    + $"\"safeArea\":{{\"x\":{safe.x:F2},\"y\":{safe.y:F2},\"w\":{safe.width:F2},\"h\":{safe.height:F2}}},"
+                    + $"\"rootWorldBound\":{{\"x\":{_root.worldBound.x:F2},\"y\":{_root.worldBound.y:F2},\"w\":{_root.worldBound.width:F2},\"h\":{_root.worldBound.height:F2}}},"
+                    + $"\"panelToScreenScale\":{_panelToScreenScale:F4},"
+                    + $"\"sample\":{panelToScreenSampleJson}}}"
+            );
+#endif
+            // #endregion
             // Log a sample so we can confirm specific test ids reached the OS.
             var sample = new System.Text.StringBuilder("[A11yBridge] Names: ");
             int i = 0;
@@ -229,7 +311,7 @@ private void BuildHierarchy()
             Debug.Log(sample.ToString());
         }
 
-        private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
+        private void WalkAndAdd(VisualElement el)
         {
             if (el == null)
                 return;
@@ -243,17 +325,32 @@ private void WalkAndAdd(VisualElement el, AccessibilityNode parent)
             // up by name, so containment doesn't affect reachability.
             if (!string.IsNullOrEmpty(el.name))
             {
-                var node = _hierarchy.AddNode(el.name, parent: null);
-                var captured = el;
-                node.frameGetter = () => GetScreenRect(captured);
-                node.role = MapRole(el);
-                node.value = ExtractValue(el);
-                node.isActive = IsVisible(el);
-                _map[el] = node;
+                if (_map.ContainsKey(el))
+                {
+                    Debug.LogWarning(
+                        $"[A11yBridge] Duplicate element registered for name '{el.name}'; skipping"
+                    );
+                }
+                else
+                {
+                    var node = _hierarchy.AddNode(el.name, parent: null);
+                    var captured = el;
+                    node.frameGetter = () => GetScreenRect(captured);
+                    node.role = MapRole(el);
+                    node.value = ExtractValue(el);
+                    node.isActive = IsVisible(el);
+                    _map[el] = node;
+                    // Detach fires the moment a tracked element leaves the
+                    // panel — Dismiss(), section refresh, scene swap. Drives
+                    // an immediate ScheduleResync so XCUITest can't read a
+                    // node whose owner is already gone (the source of the
+                    // "stale element" warnings during dialog teardown).
+                    el.RegisterCallback(_onDetachFromPanel);
+                }
             }
 
             for (int i = 0; i < el.childCount; i++)
-                WalkAndAdd(el[i], parent: null);
+                WalkAndAdd(el[i]);
         }
 
         private static AccessibilityRole MapRole(VisualElement el) => el switch
@@ -302,7 +399,38 @@ private Rect GetScreenRect(VisualElement el)
                 return Rect.zero;
 
             float s = _panelToScreenScale;
-            return new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
+            var rect = new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
+
+            // #region agent log
+#if UNITY_IOS || UNITY_ANDROID
+            if (el.name == "add_multiple_triggers_button" && Time.frameCount % 60 == 0)
+            {
+                // Walk ancestors to find the nearest scroll/clipping container
+                // and report its rect, so we can see whether the button sits
+                // inside or outside the ScrollView's visible viewport.
+                VisualElement clipper = el.hierarchy.parent;
+                while (clipper != null && !(clipper is ScrollView))
+                    clipper = clipper.hierarchy.parent;
+                string clipperJson = "null";
+                if (clipper is ScrollView sv)
+                {
+                    var cwb = sv.contentViewport.worldBound;
+                    clipperJson =
+                        $"{{\"contentViewport\":{{\"x\":{cwb.x:F2},\"y\":{cwb.y:F2},\"w\":{cwb.width:F2},\"h\":{cwb.height:F2}}}}}";
+                }
+                E2EDebugLog.Send(
+                    "AccessibilityBridge.cs:GetScreenRect",
+                    "trigger frame snapshot",
+                    "{\"name\":\"add_multiple_triggers_button\","
+                        + $"\"worldBound\":{{\"x\":{wb.x:F2},\"y\":{wb.y:F2},\"w\":{wb.width:F2},\"h\":{wb.height:F2}}},"
+                        + $"\"screenRect\":{{\"x\":{rect.x:F2},\"y\":{rect.y:F2},\"w\":{rect.width:F2},\"h\":{rect.height:F2}}},"
+                        + $"\"scrollAncestor\":{clipperJson}}}"
+                );
+            }
+#endif
+            // #endregion
+
+            return rect;
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs b/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs
new file mode 100644
index 00000000..a9629484
--- /dev/null
+++ b/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs
@@ -0,0 +1,62 @@
+// #region agent log
+// Temporary instrumentation helper for the d01c6d debug session.
+// Sends NDJSON entries via HTTP POST to the host's debug ingestion server.
+// iOS Simulator and Android emulator both share the host network stack,
+// so 127.0.0.1 resolves to the host machine. Real devices would need the
+// host's LAN IP. Fire-and-forget; never throws into caller.
+#if UNITY_IOS || UNITY_ANDROID
+using System;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OneSignalDemo.Services
+{
+    public static class E2EDebugLog
+    {
+        private const string Endpoint =
+            "http://127.0.0.1:7742/ingest/4a8fa49e-f409-48a0-b447-5877c2b74311";
+        private const string SessionId = "d01c6d";
+
+        private static readonly HttpClient _client = CreateClient();
+
+        private static HttpClient CreateClient()
+        {
+            var c = new HttpClient { Timeout = TimeSpan.FromSeconds(2) };
+            c.DefaultRequestHeaders.Add("X-Debug-Session-Id", SessionId);
+            return c;
+        }
+
+        public static void Send(string location, string message, string dataJson = "null")
+        {
+            string body =
+                "{\"sessionId\":\"" + SessionId + "\","
+                + "\"location\":\"" + Escape(location) + "\","
+                + "\"message\":\"" + Escape(message) + "\","
+                + "\"data\":" + (string.IsNullOrEmpty(dataJson) ? "null" : dataJson) + ","
+                + "\"timestamp\":" + DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + "}";
+
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    using var content = new StringContent(body, Encoding.UTF8, "application/json");
+                    await _client.PostAsync(Endpoint, content);
+                }
+                catch
+                {
+                    // best-effort
+                }
+            });
+        }
+
+        private static string Escape(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+                return string.Empty;
+            return s.Replace("\\", "\\\\").Replace("\"", "\\\"").Replace("\n", "\\n");
+        }
+    }
+}
+#endif
+// #endregion
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index 6bc11fe5..4a9626f6 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -83,7 +83,25 @@ public void Dismiss()
             OneSignalDemoEndEditing();
 #endif
 
-            Overlay?.RemoveFromHierarchy();
+            // Release any pointer capture the dismissed Overlay still holds
+            // before removing it. Without this UIToolkit can keep delivering
+            // the in-flight pointer sequence to the captured target after
+            // RemoveFromHierarchy, which swallows the next synthetic tap.
+            var overlay = Overlay;
+            if (overlay != null)
+            {
+                var panel = overlay.panel;
+                if (panel != null)
+                {
+                    for (int id = 0; id < PointerId.maxPointers; id++)
+                    {
+                        if (panel.GetCapturingElement(id) == overlay)
+                            overlay.ReleasePointer(id);
+                    }
+                }
+                overlay.RemoveFromHierarchy();
+            }
+            Overlay = null;
         }
 
         protected abstract void BuildContent(VisualElement container);

From cd675ec99a8ac5803a4a456921b6cabffd21d0a7 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 1 May 2026 23:20:21 -0700
Subject: [PATCH 18/54] fix(demo): remove bottom safe area padding

---
 examples/demo/Assets/Scripts/UI/HomeScreenController.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 6af72f84..16cc3505 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -115,11 +115,7 @@ private void ApplySafeArea()
             var safe = Screen.safeArea;
             float scale = rootHeight / Screen.height;
             float top = (Screen.height - safe.yMax) * scale;
-            float bottom = safe.y * scale;
 
-            var screenRoot = _root.Q("screen_root");
-            if (screenRoot != null)
-                screenRoot.style.paddingBottom = bottom;
             var statusSpacer = _root.Q("status_bar_spacer");
             if (statusSpacer != null)
                 statusSpacer.style.height = top;

From e166afbf4147e1c086543f10bc5a18d7839a52f8 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Sat, 2 May 2026 00:32:44 -0700
Subject: [PATCH 19/54] fix(demo): stabilize XCUITest taps on ScrollView

---
 .../Scripts/Services/AccessibilityBridge.cs   | 201 +++++++++++-------
 .../Assets/Scripts/Services/E2EDebugLog.cs    |  62 ------
 2 files changed, 123 insertions(+), 140 deletions(-)
 delete mode 100644 examples/demo/Assets/Scripts/Services/E2EDebugLog.cs

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 732e5791..b3ce7bcf 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -43,6 +43,10 @@ public class AccessibilityBridge : MonoBehaviour
         private int _lastNamedDescendantCount = -1;
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
+        // Set true after the one-shot ScrollView taming hooks (WheelEvent
+        // block + clamp settings) are installed; BuildHierarchy can fire many
+        // times per session and we only want one subscription.
+        private bool _scrollViewHooksInstalled;
 
         public AccessibilityBridge()
         {
@@ -173,22 +177,34 @@ private void Update()
             if (_frameRefreshTimer >= FrameRefreshIntervalSeconds)
             {
                 _frameRefreshTimer = 0f;
-                bool dirty = false;
+                bool valueDirty = false;
                 foreach (var kvp in _map)
                 {
                     var el = kvp.Key;
                     var node = kvp.Value;
                     var newValue = ExtractValue(el);
                     var newActive = IsVisible(el);
-                    if (node.value != newValue || node.isActive != newActive)
+                    bool valueChanged = node.value != newValue;
+                    bool activeChanged = node.isActive != newActive;
+                    if (valueChanged || activeChanged)
                     {
+                        // In-place mutation. The visibility flip is enough for
+                        // XCUITest because GetScreenRect already returns
+                        // (0,0,0,0) for clipped elements, which iOS reports as
+                        // hittable=false. We MUST NOT call ScheduleResync on
+                        // active-only flips: every scroll moves elements into
+                        // and out of the ScrollView viewport, and a republish
+                        // (SendScreenChanged) issued mid-tap makes iOS drop
+                        // the pending touch — that was the root cause of the
+                        // "no PointerDown, button moved 120pt" failure.
                         node.value = newValue;
                         node.isActive = newActive;
-                        dirty = true;
+                        if (valueChanged)
+                            valueDirty = true;
                     }
                 }
                 _hierarchy.RefreshNodeFrames();
-                if (dirty)
+                if (valueDirty)
                     ScheduleResync();
                 else
                     AssistiveSupport.notificationDispatcher?.SendLayoutChanged();
@@ -254,6 +270,21 @@ private void BuildHierarchy()
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
 
+            // One-shot ScrollView taming: BuildHierarchy can run dozens of
+            // times per session (every dialog open/close, every section
+            // refresh), but the main ScrollView only needs these hooks once.
+            // The flag is reset only by OnDestroy — a fresh bridge instance
+            // re-applies them.
+            if (!_scrollViewHooksInstalled)
+            {
+                var mainSv = _root.Q<ScrollView>("main_scroll_view");
+                if (mainSv != null)
+                {
+                    InstallScrollViewE2EHooks(mainSv);
+                    _scrollViewHooksInstalled = true;
+                }
+            }
+
             WalkAndAdd(_root);
 
             AssistiveSupport.activeHierarchy = _hierarchy;
@@ -266,41 +297,6 @@ private void BuildHierarchy()
                     + $"ScreenReader={AssistiveSupport.isScreenReaderEnabled}"
             );
 
-            // #region agent log
-#if UNITY_IOS || UNITY_ANDROID
-            var safe = Screen.safeArea;
-            string panelToScreenSampleJson = "null";
-            VisualElement targetEl = null;
-            foreach (var kvp in _map)
-            {
-                if (kvp.Key.name == "add_multiple_triggers_button")
-                {
-                    targetEl = kvp.Key;
-                    break;
-                }
-            }
-            if (targetEl != null)
-            {
-                var wb = targetEl.worldBound;
-                var screenRect = GetScreenRect(targetEl);
-                panelToScreenSampleJson =
-                    "{\"name\":\"add_multiple_triggers_button\","
-                    + $"\"worldBound\":{{\"x\":{wb.x:F2},\"y\":{wb.y:F2},\"w\":{wb.width:F2},\"h\":{wb.height:F2}}},"
-                    + $"\"screenRect\":{{\"x\":{screenRect.x:F2},\"y\":{screenRect.y:F2},\"w\":{screenRect.width:F2},\"h\":{screenRect.height:F2}}}}}";
-            }
-            E2EDebugLog.Send(
-                "AccessibilityBridge.cs:BuildHierarchy",
-                "rebuilt",
-                "{\"namedCount\":" + _map.Count + ","
-                    + $"\"screenPx\":{{\"w\":{Screen.width},\"h\":{Screen.height}}},"
-                    + $"\"safeArea\":{{\"x\":{safe.x:F2},\"y\":{safe.y:F2},\"w\":{safe.width:F2},\"h\":{safe.height:F2}}},"
-                    + $"\"rootWorldBound\":{{\"x\":{_root.worldBound.x:F2},\"y\":{_root.worldBound.y:F2},\"w\":{_root.worldBound.width:F2},\"h\":{_root.worldBound.height:F2}}},"
-                    + $"\"panelToScreenScale\":{_panelToScreenScale:F4},"
-                    + $"\"sample\":{panelToScreenSampleJson}}}"
-            );
-#endif
-            // #endregion
-            // Log a sample so we can confirm specific test ids reached the OS.
             var sample = new System.Text.StringBuilder("[A11yBridge] Names: ");
             int i = 0;
             foreach (var kvp in _map)
@@ -311,6 +307,38 @@ private void BuildHierarchy()
             Debug.Log(sample.ToString());
         }
 
+        /// <summary>
+        /// Tames the main ScrollView so XCUITest taps land deterministically
+        /// on iOS. Two distinct sources can shift content during a queued tap
+        /// and make the click land on the wrong element:
+        ///   1. iOS XCUITest performs an implicit "scroll-to-visible" before
+        ///      dispatching the tap. The scroll arrives in UI Toolkit as a
+        ///      synthetic WheelEvent injected by DefaultEventSystem
+        ///      (SendPositionBasedEvent ← InputForUIProcessor.ProcessPointerEvent).
+        ///      The ScrollView consumes it and scrolls scrollOffset by ~120pt
+        ///      mid-tap, leaving the queued click on empty space.
+        ///   2. After a swipe gesture, ScrollView schedules
+        ///      `PostPointerUpAnimation` (elasticity bounce + inertia) via
+        ///      TimerEventScheduler. That tick fires AFTER the swipe ends and
+        ///      can run DURING the next queued tap, scrolling the content a
+        ///      few points so the click lands on `unity-content-container`.
+        /// Block both: stop WheelEvent at the ScrollView, and clamp the touch
+        /// scroll behaviour so there is no post-pointer-up animation. Manual
+        /// swipe gestures still work because they go through the
+        /// PointerDown/Move/Up path; the content just stops the moment the
+        /// finger lifts.
+        /// </summary>
+        private static void InstallScrollViewE2EHooks(ScrollView mainSv)
+        {
+            mainSv.RegisterCallback<WheelEvent>(
+                e => e.StopImmediatePropagation(),
+                TrickleDown.TrickleDown
+            );
+            mainSv.touchScrollBehavior = ScrollView.TouchScrollBehavior.Clamped;
+            mainSv.scrollDecelerationRate = 0f;
+            mainSv.elasticity = 0f;
+        }
+
         private void WalkAndAdd(VisualElement el)
         {
             if (el == null)
@@ -358,7 +386,15 @@ private void WalkAndAdd(VisualElement el)
             Button => AccessibilityRole.Button,
             Toggle => AccessibilityRole.Toggle,
             OneSignalDemo.UI.SwitchToggle => AccessibilityRole.Toggle,
-            ScrollView => AccessibilityRole.ScrollView,
+            // ScrollView intentionally NOT exposed as AccessibilityRole.ScrollView.
+            // XCUITest's `XCUIElement.tap()` performs an implicit
+            // `scrollToVisible` on the nearest accessibility ancestor that
+            // claims a scrollable role, which under our setup invoked Unity's
+            // ScrollView mid-tap, shifted the entire content by ~120pt, and
+            // made the queued touch land on empty space (root cause of the
+            // "no PointerDown, button moved 120pt" failure on the multiple
+            // trigger test). Test code drives scrolling via raw swipes, so
+            // dropping the role is a no-op for navigation.
             Slider => AccessibilityRole.Slider,
             TextField => AccessibilityRole.SearchField,
             Label => AccessibilityRole.StaticText,
@@ -383,54 +419,63 @@ private void WalkAndAdd(VisualElement el)
         private static bool IsVisible(VisualElement el)
         {
             var s = el.resolvedStyle;
-            return el.enabledInHierarchy
-                && s.display != DisplayStyle.None
-                && s.visibility != Visibility.Hidden
-                && s.opacity > 0f;
+            if (!el.enabledInHierarchy
+                || s.display == DisplayStyle.None
+                || s.visibility == Visibility.Hidden
+                || s.opacity <= 0f)
+                return false;
+
+            // An element whose worldBound has been clipped away by an ancestor
+            // ScrollView/clip container is visually invisible. Other SDKs get
+            // this for free because they render through native UIScrollView /
+            // android.widget.ScrollView whose accessibilityFrame already
+            // excludes clipped children. UI Toolkit reports children's panel
+            // coordinates regardless of clip, so we have to intersect here.
+            var visible = ComputeVisibleWorldBound(el);
+            return visible.width > 0f && visible.height > 0f;
         }
 
-        private Rect GetScreenRect(VisualElement el)
+        /// <summary>
+        /// Intersects an element's worldBound with every ancestor that clips
+        /// (ScrollView's contentViewport, or any element with overflow !=
+        /// Visible). Returns Rect.zero when the element is fully clipped.
+        /// </summary>
+        private static Rect ComputeVisibleWorldBound(VisualElement el)
         {
-            if (el?.panel == null)
+            var r = el.worldBound;
+            if (float.IsNaN(r.x) || float.IsNaN(r.y) || r.width <= 0f || r.height <= 0f)
                 return Rect.zero;
 
-            var wb = el.worldBound;
-            if (float.IsNaN(wb.x) || float.IsNaN(wb.y) || wb.width <= 0 || wb.height <= 0)
-                return Rect.zero;
-
-            float s = _panelToScreenScale;
-            var rect = new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
-
-            // #region agent log
-#if UNITY_IOS || UNITY_ANDROID
-            if (el.name == "add_multiple_triggers_button" && Time.frameCount % 60 == 0)
+            var p = el.hierarchy.parent;
+            while (p != null)
             {
-                // Walk ancestors to find the nearest scroll/clipping container
-                // and report its rect, so we can see whether the button sits
-                // inside or outside the ScrollView's visible viewport.
-                VisualElement clipper = el.hierarchy.parent;
-                while (clipper != null && !(clipper is ScrollView))
-                    clipper = clipper.hierarchy.parent;
-                string clipperJson = "null";
-                if (clipper is ScrollView sv)
+                if (p is ScrollView sv)
                 {
-                    var cwb = sv.contentViewport.worldBound;
-                    clipperJson =
-                        $"{{\"contentViewport\":{{\"x\":{cwb.x:F2},\"y\":{cwb.y:F2},\"w\":{cwb.width:F2},\"h\":{cwb.height:F2}}}}}";
+                    var clip = sv.contentViewport.worldBound;
+                    float x = Mathf.Max(r.x, clip.x);
+                    float y = Mathf.Max(r.y, clip.y);
+                    float right = Mathf.Min(r.x + r.width, clip.x + clip.width);
+                    float bottom = Mathf.Min(r.y + r.height, clip.y + clip.height);
+                    if (right <= x || bottom <= y)
+                        return Rect.zero;
+                    r = new Rect(x, y, right - x, bottom - y);
                 }
-                E2EDebugLog.Send(
-                    "AccessibilityBridge.cs:GetScreenRect",
-                    "trigger frame snapshot",
-                    "{\"name\":\"add_multiple_triggers_button\","
-                        + $"\"worldBound\":{{\"x\":{wb.x:F2},\"y\":{wb.y:F2},\"w\":{wb.width:F2},\"h\":{wb.height:F2}}},"
-                        + $"\"screenRect\":{{\"x\":{rect.x:F2},\"y\":{rect.y:F2},\"w\":{rect.width:F2},\"h\":{rect.height:F2}}},"
-                        + $"\"scrollAncestor\":{clipperJson}}}"
-                );
+                p = p.hierarchy.parent;
             }
-#endif
-            // #endregion
+            return r;
+        }
+
+        private Rect GetScreenRect(VisualElement el)
+        {
+            if (el?.panel == null)
+                return Rect.zero;
 
-            return rect;
+            var wb = ComputeVisibleWorldBound(el);
+            if (wb.width <= 0f || wb.height <= 0f)
+                return Rect.zero;
+
+            float s = _panelToScreenScale;
+            return new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs b/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs
deleted file mode 100644
index a9629484..00000000
--- a/examples/demo/Assets/Scripts/Services/E2EDebugLog.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// #region agent log
-// Temporary instrumentation helper for the d01c6d debug session.
-// Sends NDJSON entries via HTTP POST to the host's debug ingestion server.
-// iOS Simulator and Android emulator both share the host network stack,
-// so 127.0.0.1 resolves to the host machine. Real devices would need the
-// host's LAN IP. Fire-and-forget; never throws into caller.
-#if UNITY_IOS || UNITY_ANDROID
-using System;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OneSignalDemo.Services
-{
-    public static class E2EDebugLog
-    {
-        private const string Endpoint =
-            "http://127.0.0.1:7742/ingest/4a8fa49e-f409-48a0-b447-5877c2b74311";
-        private const string SessionId = "d01c6d";
-
-        private static readonly HttpClient _client = CreateClient();
-
-        private static HttpClient CreateClient()
-        {
-            var c = new HttpClient { Timeout = TimeSpan.FromSeconds(2) };
-            c.DefaultRequestHeaders.Add("X-Debug-Session-Id", SessionId);
-            return c;
-        }
-
-        public static void Send(string location, string message, string dataJson = "null")
-        {
-            string body =
-                "{\"sessionId\":\"" + SessionId + "\","
-                + "\"location\":\"" + Escape(location) + "\","
-                + "\"message\":\"" + Escape(message) + "\","
-                + "\"data\":" + (string.IsNullOrEmpty(dataJson) ? "null" : dataJson) + ","
-                + "\"timestamp\":" + DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + "}";
-
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    using var content = new StringContent(body, Encoding.UTF8, "application/json");
-                    await _client.PostAsync(Endpoint, content);
-                }
-                catch
-                {
-                    // best-effort
-                }
-            });
-        }
-
-        private static string Escape(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-                return string.Empty;
-            return s.Replace("\\", "\\\\").Replace("\"", "\\\"").Replace("\n", "\\n");
-        }
-    }
-}
-#endif
-// #endregion

From 90cb3b2eed3820f686b65b0262166c24d1b41af0 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 4 May 2026 13:26:49 -0700
Subject: [PATCH 20/54] fix(demo): add named-tap fallback for E2E reliability

---
 .../Scripts/Services/AccessibilityBridge.cs   | 135 +++++++++++++++++-
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   |  28 +++-
 .../UI/Dialogs/MultiPairInputDialog.cs        |   1 +
 .../Scripts/UI/Sections/SectionBuilder.cs     |  31 +++-
 examples/demo/Assets/Scripts/UI/ToastView.cs  |  10 +-
 5 files changed, 192 insertions(+), 13 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index b3ce7bcf..5e45d6b7 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -1,6 +1,9 @@
 #if UNITY_IOS || UNITY_ANDROID
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using OneSignalDemo.UI.Dialogs;
+using OneSignalDemo.UI.Sections;
 using UnityEngine;
 using UnityEngine.Accessibility;
 using UnityEngine.UIElements;
@@ -24,6 +27,7 @@ public class AccessibilityBridge : MonoBehaviour
         // raise GeometryChangedEvent — animation curves, opacity tweens, and
         // value mutations on TextField/Toggle/Label.
         private const float FrameRefreshIntervalSeconds = 0.05f;
+        private const int NamedTapFallbackDelayMs = 50;
         // Backstop structural poll. The hot path is DetachFromPanelEvent
         // (per node, see WalkAndAdd) which schedules an immediate resync the
         // moment a tracked element leaves the tree. The timer catches
@@ -43,15 +47,30 @@ public class AccessibilityBridge : MonoBehaviour
         private int _lastNamedDescendantCount = -1;
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
+        private readonly EventCallback<PointerDownEvent> _onNamedTapPointerDown;
         // Set true after the one-shot ScrollView taming hooks (WheelEvent
         // block + clamp settings) are installed; BuildHierarchy can fire many
         // times per session and we only want one subscription.
         private bool _scrollViewHooksInstalled;
+        // E2E only: cached ScrollView ref + stale-capture watchdog. A self-
+        // destroying child (e.g. triggers_remove) can leave ScrollView's
+        // pending-capture latch set because the matching PointerUp is dropped
+        // when its target detaches mid-touch. The next unrelated pointer event
+        // is then interpreted as a continuation of the prior drag, scrolling
+        // the content out from under the test's tap. We reset the latch via
+        // reflection if no pointer activity is observed for a short window.
+        private ScrollView _mainSv;
+        private double _lastTouchActivityMs = -1.0;
+        private const double StalePointerCaptureWindowMs = 200.0;
+        private static System.Reflection.FieldInfo _svPointerCaptureScheduledField;
+        private static System.Reflection.FieldInfo _svPressedField;
+        private static bool _svReflectionResolved;
 
         public AccessibilityBridge()
         {
             _onGeometryChanged = _ => ScheduleFrameRefresh();
             _onDetachFromPanel = _ => ScheduleResync();
+            _onNamedTapPointerDown = OnNamedTapPointerDown;
         }
 
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
@@ -122,7 +141,10 @@ private void OnDestroy()
         private void UnregisterTreeCallbacks()
         {
             if (_root != null)
+            {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
+                _root.UnregisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
+            }
             foreach (var el in _map.Keys)
                 el.UnregisterCallback(_onDetachFromPanel);
         }
@@ -153,6 +175,17 @@ private void Update()
             // refresh — every test-relevant mutation creates or removes named
             // VisualElements. Avoids hot event hooks during layout.
             _structurePollTimer += Time.unscaledDeltaTime;
+            // Stale-pointer-capture watchdog: see field comment for context.
+            if (_lastTouchActivityMs > 0.0)
+            {
+                double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+                if (now - _lastTouchActivityMs > StalePointerCaptureWindowMs)
+                {
+                    ResetScrollViewPanState(_mainSv);
+                    _lastTouchActivityMs = -1.0;
+                }
+            }
+
             if (_structurePollTimer >= StructurePollIntervalSeconds)
             {
                 _structurePollTimer = 0f;
@@ -269,6 +302,7 @@ private void BuildHierarchy()
             // a tap fired immediately after a scroll sees fresh frames
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
+            _root.RegisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
 
             // One-shot ScrollView taming: BuildHierarchy can run dozens of
             // times per session (every dialog open/close, every section
@@ -280,6 +314,7 @@ private void BuildHierarchy()
                 var mainSv = _root.Q<ScrollView>("main_scroll_view");
                 if (mainSv != null)
                 {
+                    _mainSv = mainSv;
                     InstallScrollViewE2EHooks(mainSv);
                     _scrollViewHooksInstalled = true;
                 }
@@ -296,17 +331,45 @@ private void BuildHierarchy()
                     + $"Active={AssistiveSupport.activeHierarchy != null}, "
                     + $"ScreenReader={AssistiveSupport.isScreenReaderEnabled}"
             );
+        }
+
+        private void OnNamedTapPointerDown(PointerDownEvent e)
+        {
+            var target = FindNamedTapTarget(e.target as VisualElement, out var action);
+            if (target == null || action == null)
+                return;
+
+            e.StopImmediatePropagation();
+            e.PreventDefault();
 
-            var sample = new System.Text.StringBuilder("[A11yBridge] Names: ");
-            int i = 0;
-            foreach (var kvp in _map)
+            target.schedule.Execute(() =>
             {
-                if (i++ > 0) sample.Append(", ");
-                sample.Append(kvp.Key.name);
+                if (target.panel == null || !target.enabledInHierarchy || !IsVisible(target))
+                    return;
+                action();
+                ScheduleResync();
+            }).StartingIn(NamedTapFallbackDelayMs);
+        }
+
+        private VisualElement FindNamedTapTarget(VisualElement target, out Action action)
+        {
+            action = null;
+            for (var current = target; current != null; current = current.hierarchy.parent)
+            {
+                if (!current.enabledInHierarchy || !IsVisible(current))
+                    continue;
+                if (TryGetNamedTapAction(current.name, out action))
+                    return current;
+                if (current == _root)
+                    break;
             }
-            Debug.Log(sample.ToString());
+            return null;
         }
 
+        private static bool TryGetNamedTapAction(string name, out Action action) =>
+            SectionBuilder.TryGetNamedTapAction(name, out action)
+            || DialogBase.TryGetNamedTapAction(name, out action);
+
         /// <summary>
         /// Tames the main ScrollView so XCUITest taps land deterministically
         /// on iOS. Two distinct sources can shift content during a queued tap
@@ -328,17 +391,75 @@ private void BuildHierarchy()
         /// PointerDown/Move/Up path; the content just stops the moment the
         /// finger lifts.
         /// </summary>
-        private static void InstallScrollViewE2EHooks(ScrollView mainSv)
+        private void InstallScrollViewE2EHooks(ScrollView mainSv)
         {
             mainSv.RegisterCallback<WheelEvent>(
                 e => e.StopImmediatePropagation(),
                 TrickleDown.TrickleDown
             );
+            // Touch-activity watchdog: any real Down/Move/Up resets the timer.
+            // The Update tick clears ScrollView's stuck pan-capture latch if no
+            // touch event arrives within StalePointerCaptureWindowMs after a
+            // Down — that's the only way the latch can outlive a self-
+            // destroying child whose PointerUp is dropped by the dispatcher.
+            mainSv.RegisterCallback<PointerDownEvent>(
+                e =>
+                {
+                    _lastTouchActivityMs = Time.realtimeSinceStartupAsDouble * 1000.0;
+                },
+                TrickleDown.TrickleDown
+            );
+            mainSv.RegisterCallback<PointerMoveEvent>(
+                e =>
+                {
+                    _lastTouchActivityMs = Time.realtimeSinceStartupAsDouble * 1000.0;
+                },
+                TrickleDown.TrickleDown
+            );
+            mainSv.RegisterCallback<PointerUpEvent>(
+                e =>
+                {
+                    _lastTouchActivityMs = -1.0;
+                },
+                TrickleDown.TrickleDown
+            );
             mainSv.touchScrollBehavior = ScrollView.TouchScrollBehavior.Clamped;
             mainSv.scrollDecelerationRate = 0f;
             mainSv.elasticity = 0f;
         }
 
+        // Reflection-based reset for ScrollView's stuck pan-capture latches.
+        // We deliberately only clear m_PointerCaptureScheduled and m_Pressed —
+        // those represent "a touch is currently captured / pending capture",
+        // which is the state we need to release when a child detaches mid-
+        // touch and PointerUp never arrives. m_TouchPointerMoveAllowed is per-
+        // gesture state owned by PointerDown/PointerUp; clearing it here
+        // disables touch scrolling for the *next* swipe, since iOS XCUITest
+        // sometimes drops PointerUp on the ScrollView and the watchdog ends
+        // up running mid-swipe with that flag set true. Leave it alone so the
+        // next swipe's PointerDown can manage it normally.
+        // Field names match Unity 2022+ UI Toolkit; resolve once and cache.
+        private static void ResetScrollViewPanState(ScrollView sv)
+        {
+            if (sv == null) return;
+            if (!_svReflectionResolved)
+            {
+                var t = typeof(ScrollView);
+                var flags = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic;
+                _svPointerCaptureScheduledField = t.GetField("m_PointerCaptureScheduled", flags);
+                _svPressedField = t.GetField("m_Pressed", flags);
+                _svReflectionResolved = true;
+            }
+            try
+            {
+                _svPointerCaptureScheduledField?.SetValue(sv, false);
+                _svPressedField?.SetValue(sv, false);
+            }
+            catch
+            {
+            }
+        }
+
         private void WalkAndAdd(VisualElement el)
         {
             if (el == null)
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index 4a9626f6..e31bc557 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using UnityEngine.UIElements;
 
@@ -16,6 +17,28 @@ public abstract class DialogBase
         // from the panel root sidesteps whatever state breaks normal
         // dispatch and keeps E2E taps reliable.
         private static bool _infoFallbackHooked;
+        private static readonly Dictionary<string, Action> TapByName =
+            new Dictionary<string, Action>();
+
+        public static bool TryGetNamedTapAction(string name, out Action action)
+        {
+            action = null;
+            if (string.IsNullOrEmpty(name))
+                return false;
+            return TapByName.TryGetValue(name, out action);
+        }
+
+        protected static void RegisterNamedTap(string name, Action action)
+        {
+            if (!string.IsNullOrEmpty(name) && action != null)
+                TapByName[name] = action;
+        }
+
+        private static void RegisterNamedTap(Button button, Action action)
+        {
+            button.RegisterCallback<AttachToPanelEvent>(_ => RegisterNamedTap(button.name, action));
+        }
+
         private static void HookInfoIconFallback(VisualElement parent)
         {
             if (_infoFallbackHooked) return;
@@ -130,15 +153,18 @@ protected Button CreateConfirmButton(string text, Action onClick)
             btn.text = text;
             btn.AddToClassList("dialog-confirm-button");
             btn.AddToClassList("text-dialog-action");
+            RegisterNamedTap(btn, onClick);
             return btn;
         }
 
         protected Button CreateCancelButton(string text = "Cancel")
         {
-            var btn = new Button(Dismiss);
+            Action dismiss = Dismiss;
+            var btn = new Button(dismiss);
             btn.text = text;
             btn.AddToClassList("dialog-cancel-button");
             btn.AddToClassList("text-dialog-action");
+            RegisterNamedTap(btn, dismiss);
             return btn;
         }
     }
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index b94aca55..bb81d2a1 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -45,6 +45,7 @@ protected override void BuildContent(VisualElement container)
 
             var addRowButton = new Button(AddRow);
             addRowButton.name = "multipair_add_row_button";
+            RegisterNamedTap(addRowButton.name, AddRow);
             addRowButton.AddToClassList("dialog-add-row-button");
             var addIcon = new Label(MaterialIcons.Add);
             addIcon.AddToClassList("dialog-add-row-icon");
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 21893e8c..2d80b6ed 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using OneSignalDemo.UI;
 using UnityEngine.UIElements;
 
@@ -12,8 +13,20 @@ public static class SectionBuilder
         // AtTarget dispatch was observed to drop PointerDown on the Label
         // after iOS Appium injected a mobile:scroll gesture in the same test,
         // so a root-level dispatch path is used to keep E2E taps reliable.
-        public static readonly System.Collections.Generic.Dictionary<string, Action> InfoTapByName =
-            new System.Collections.Generic.Dictionary<string, Action>();
+        public static readonly Dictionary<string, Action> InfoTapByName =
+            new Dictionary<string, Action>();
+        private static readonly Dictionary<string, Action> TapByName =
+            new Dictionary<string, Action>();
+
+        public static bool TryGetNamedTapAction(string name, out Action action)
+        {
+            action = null;
+            if (string.IsNullOrEmpty(name))
+                return false;
+            if (!string.IsNullOrEmpty(name) && TapByName.TryGetValue(name, out action))
+                return true;
+            return InfoTapByName.TryGetValue(name, out action);
+        }
 
         public static VisualElement CreateSection(
             string title,
@@ -104,6 +117,7 @@ public static Button CreatePrimaryButton(string text, string name, Action onClic
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("primary-button");
+            RegisterNamedTap(name, onClick);
             return btn;
         }
 
@@ -113,6 +127,7 @@ public static Button CreateDestructiveButton(string text, string name, Action on
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("destructive-button");
+            RegisterNamedTap(name, onClick);
             return btn;
         }
 
@@ -159,7 +174,10 @@ public static VisualElement CreateKeyValueItem(
             {
                 var deleteBtn = new Button(onDelete);
                 if (sectionKey != null && itemKey != null)
+                {
                     deleteBtn.name = $"{sectionKey}_remove_{itemKey}";
+                    RegisterNamedTap(deleteBtn.name, onDelete);
+                }
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
                 item.Add(deleteBtn);
@@ -214,7 +232,10 @@ public static VisualElement CreateSingleItem(
             {
                 var deleteBtn = new Button(onDelete);
                 if (sectionKey != null)
+                {
                     deleteBtn.name = $"{sectionKey}_remove_{value}";
+                    RegisterNamedTap(deleteBtn.name, onDelete);
+                }
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
                 item.Add(deleteBtn);
@@ -246,5 +267,11 @@ private static string SectionKeyFromName(string name) =>
             name != null && name.EndsWith("_section")
                 ? name.Substring(0, name.Length - "_section".Length)
                 : name;
+
+        private static void RegisterNamedTap(string name, Action action)
+        {
+            if (!string.IsNullOrEmpty(name) && action != null)
+                TapByName[name] = action;
+        }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/ToastView.cs b/examples/demo/Assets/Scripts/UI/ToastView.cs
index b27365bd..221088ae 100644
--- a/examples/demo/Assets/Scripts/UI/ToastView.cs
+++ b/examples/demo/Assets/Scripts/UI/ToastView.cs
@@ -21,12 +21,16 @@ public void Show(string message)
 
             _container = new VisualElement();
             _container.AddToClassList("toast-container");
+            // The container and label must be Ignore so UI Toolkit picking
+            // does not see them — the bottom-of-screen toast overlaps the
+            // action buttons most tests tap right after the toast appears,
+            // and without Ignore the empty horizontal slack of the centered
+            // container swallowed the next tap.
+            _container.pickingMode = PickingMode.Ignore;
 
             var label = new Label(message);
-            // Surface the message text to iOS accessibility so Appium's
-            // `label/name/value == "..."` predicate can locate the toast.
-            label.name = message;
             label.AddToClassList("toast-label");
+            label.pickingMode = PickingMode.Ignore;
             _container.Add(label);
 
             _root.Add(_container);

From 89178bb6da99c5c707e35e7fa2320d976abc1f0f Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 4 May 2026 20:51:15 -0700
Subject: [PATCH 21/54] fix(demo): refactor E2E tap fallback to use target
 registry

---
 .../Scripts/Services/AccessibilityBridge.cs   | 372 +++++++++++++-----
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   |  39 +-
 .../UI/Dialogs/MultiPairInputDialog.cs        |  23 +-
 .../UI/Dialogs/MultiSelectRemoveDialog.cs     |  28 ++
 .../Scripts/UI/Sections/SectionBuilder.cs     |  36 +-
 .../UI/Sections/TriggersSectionController.cs  | 169 +++++++-
 6 files changed, 503 insertions(+), 164 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 5e45d6b7..c93bf846 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using OneSignalDemo.UI.Dialogs;
-using OneSignalDemo.UI.Sections;
 using UnityEngine;
 using UnityEngine.Accessibility;
 using UnityEngine.UIElements;
@@ -27,7 +25,12 @@ public class AccessibilityBridge : MonoBehaviour
         // raise GeometryChangedEvent — animation curves, opacity tweens, and
         // value mutations on TextField/Toggle/Label.
         private const float FrameRefreshIntervalSeconds = 0.05f;
-        private const int NamedTapFallbackDelayMs = 50;
+        private const float TapMarkerSize = 28f;
+        private const int MaxTapMarkers = 40;
+        private const float E2ETapMoveTolerance = 12f;
+        private const int E2ETapDelayMs = 120;
+        private const float ScrollOffsetEpsilon = 0.5f;
+        private const double ScrollSettleLayoutChangeDelayMs = 150.0;
         // Backstop structural poll. The hot path is DetachFromPanelEvent
         // (per node, see WalkAndAdd) which schedules an immediate resync the
         // moment a tracked element leaves the tree. The timer catches
@@ -36,6 +39,7 @@ public class AccessibilityBridge : MonoBehaviour
         private const float StructurePollIntervalSeconds = 0.1f;
 
         private static AccessibilityBridge _instance;
+        private static readonly List<E2ETapTarget> E2ETapTargets = new();
 
         private VisualElement _root;
         private AccessibilityHierarchy _hierarchy;
@@ -45,9 +49,21 @@ public class AccessibilityBridge : MonoBehaviour
         private float _frameRefreshTimer;
         private float _structurePollTimer;
         private int _lastNamedDescendantCount = -1;
+        private int _tapMarkerCount;
+        private VisualElement _tapMarkerOverlay;
+        private Vector2 _lastScrollOffset;
+        private double _lastScrollChangeMs = -1.0;
+        private bool _scrollLayoutChangePending;
+        private bool _pendingE2ETap;
+        private int _pendingE2ETapPointerId;
+        private float _pendingE2ETapMoveTolerance;
+        private Vector2 _pendingE2ETapStart;
+        private Action _pendingE2ETapAction;
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
         private readonly EventCallback<PointerDownEvent> _onNamedTapPointerDown;
+        private readonly EventCallback<PointerMoveEvent> _onE2ETapPointerMove;
+        private readonly EventCallback<PointerCancelEvent> _onE2ETapPointerCancel;
         // Set true after the one-shot ScrollView taming hooks (WheelEvent
         // block + clamp settings) are installed; BuildHierarchy can fire many
         // times per session and we only want one subscription.
@@ -71,6 +87,8 @@ public AccessibilityBridge()
             _onGeometryChanged = _ => ScheduleFrameRefresh();
             _onDetachFromPanel = _ => ScheduleResync();
             _onNamedTapPointerDown = OnNamedTapPointerDown;
+            _onE2ETapPointerMove = OnE2ETapPointerMove;
+            _onE2ETapPointerCancel = _ => _pendingE2ETap = false;
         }
 
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
@@ -91,15 +109,9 @@ public AccessibilityBridge()
         public static void EnableForE2E(VisualElement root)
         {
             if (root == null)
-            {
-                Debug.Log("[A11yBridge] EnableForE2E: root is null, skipping");
                 return;
-            }
             if (!DotEnv.IsE2EMode)
-            {
-                Debug.Log("[A11yBridge] EnableForE2E: E2E_MODE not set, skipping");
                 return;
-            }
 
             if (_instance == null)
             {
@@ -111,6 +123,38 @@ public static void EnableForE2E(VisualElement root)
             _instance.Initialize(root);
         }
 
+        public static void RegisterE2ETapFallback(
+            VisualElement target,
+            Func<bool> isEnabled,
+            Action action
+        ) => RegisterE2ETapFallback(target, isEnabled, action, E2ETapMoveTolerance);
+
+        public static void RegisterE2ETapFallback(
+            VisualElement target,
+            Func<bool> isEnabled,
+            Action action,
+            float moveTolerance
+        )
+        {
+            if (target == null || action == null)
+                return;
+
+            E2ETapTargets.RemoveAll(t => t.Target == target);
+            E2ETapTargets.Add(
+                new E2ETapTarget(target, isEnabled ?? (() => true), action, moveTolerance)
+            );
+        }
+
+        public static void RequestResync()
+        {
+            _instance?.ScheduleResync();
+        }
+
+        public static void RequestImmediateResync()
+        {
+            _instance?.BuildHierarchy();
+        }
+
         private void Initialize(VisualElement root)
         {
             _root = root;
@@ -144,6 +188,8 @@ private void UnregisterTreeCallbacks()
             {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
                 _root.UnregisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
+                _root.UnregisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
+                _root.UnregisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
             }
             foreach (var el in _map.Keys)
                 el.UnregisterCallback(_onDetachFromPanel);
@@ -185,6 +231,7 @@ private void Update()
                     _lastTouchActivityMs = -1.0;
                 }
             }
+            RefreshScrollAccessibilityState();
 
             if (_structurePollTimer >= StructurePollIntervalSeconds)
             {
@@ -210,37 +257,26 @@ private void Update()
             if (_frameRefreshTimer >= FrameRefreshIntervalSeconds)
             {
                 _frameRefreshTimer = 0f;
-                bool valueDirty = false;
-                foreach (var kvp in _map)
-                {
-                    var el = kvp.Key;
-                    var node = kvp.Value;
-                    var newValue = ExtractValue(el);
-                    var newActive = IsVisible(el);
-                    bool valueChanged = node.value != newValue;
-                    bool activeChanged = node.isActive != newActive;
-                    if (valueChanged || activeChanged)
-                    {
-                        // In-place mutation. The visibility flip is enough for
-                        // XCUITest because GetScreenRect already returns
-                        // (0,0,0,0) for clipped elements, which iOS reports as
-                        // hittable=false. We MUST NOT call ScheduleResync on
-                        // active-only flips: every scroll moves elements into
-                        // and out of the ScrollView viewport, and a republish
-                        // (SendScreenChanged) issued mid-tap makes iOS drop
-                        // the pending touch — that was the root cause of the
-                        // "no PointerDown, button moved 120pt" failure.
-                        node.value = newValue;
-                        node.isActive = newActive;
-                        if (valueChanged)
-                            valueDirty = true;
-                    }
-                }
+                RefreshNodeValuesAndActive();
                 _hierarchy.RefreshNodeFrames();
-                if (valueDirty)
-                    ScheduleResync();
-                else
-                    AssistiveSupport.notificationDispatcher?.SendLayoutChanged();
+            }
+        }
+
+        private void RefreshNodeValuesAndActive()
+        {
+            foreach (var kvp in _map)
+            {
+                var el = kvp.Key;
+                var node = kvp.Value;
+                var newValue = ExtractValue(el);
+                var newActive = IsVisible(el);
+                bool valueChanged = node.value != newValue;
+                bool activeChanged = node.isActive != newActive;
+                if (!valueChanged && !activeChanged)
+                    continue;
+
+                node.value = newValue;
+                node.isActive = newActive;
             }
         }
 
@@ -284,6 +320,7 @@ private void BuildHierarchy()
             if (_root == null)
                 return;
 
+            EnsureTapMarkerOverlay();
             UnregisterTreeCallbacks();
 
             _hierarchy ??= new AccessibilityHierarchy();
@@ -303,6 +340,8 @@ private void BuildHierarchy()
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
             _root.RegisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
+            _root.RegisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
+            _root.RegisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
 
             // One-shot ScrollView taming: BuildHierarchy can run dozens of
             // times per session (every dialog open/close, every section
@@ -315,60 +354,168 @@ private void BuildHierarchy()
                 if (mainSv != null)
                 {
                     _mainSv = mainSv;
+                    _lastScrollOffset = mainSv.scrollOffset;
+                    _lastScrollChangeMs = -1.0;
+                    _scrollLayoutChangePending = false;
                     InstallScrollViewE2EHooks(mainSv);
                     _scrollViewHooksInstalled = true;
                 }
             }
 
             WalkAndAdd(_root);
+            _lastNamedDescendantCount = CountNamedDescendants(_root);
 
             AssistiveSupport.activeHierarchy = _hierarchy;
             AssistiveSupport.notificationDispatcher?.SendScreenChanged();
             _hierarchy.RefreshNodeFrames();
-
-            Debug.Log(
-                $"[A11yBridge] Built hierarchy with {_map.Count} named nodes. "
-                    + $"Active={AssistiveSupport.activeHierarchy != null}, "
-                    + $"ScreenReader={AssistiveSupport.isScreenReaderEnabled}"
-            );
         }
 
         private void OnNamedTapPointerDown(PointerDownEvent e)
         {
-            var target = FindNamedTapTarget(e.target as VisualElement, out var action);
-            if (target == null || action == null)
+            var position = new Vector2(e.position.x, e.position.y);
+            AddTapMarker(position);
+
+            if (!TryGetE2ETapTarget(position, out var target))
                 return;
 
-            e.StopImmediatePropagation();
-            e.PreventDefault();
+            if (target.MoveTolerance < 0f)
+            {
+                target.Action();
+                return;
+            }
 
-            target.schedule.Execute(() =>
+            _pendingE2ETap = true;
+            _pendingE2ETapPointerId = e.pointerId;
+            _pendingE2ETapMoveTolerance = target.MoveTolerance;
+            _pendingE2ETapStart = position;
+            _pendingE2ETapAction = target.Action;
+            _root.schedule.Execute(() =>
             {
-                if (target.panel == null || !target.enabledInHierarchy || !IsVisible(target))
+                if (!_pendingE2ETap)
                     return;
-                action();
-                ScheduleResync();
-            }).StartingIn(NamedTapFallbackDelayMs);
+                _pendingE2ETap = false;
+                _pendingE2ETapAction?.Invoke();
+            }).StartingIn(E2ETapDelayMs);
+        }
+
+        private void OnE2ETapPointerMove(PointerMoveEvent e)
+        {
+            if (!_pendingE2ETap || _pendingE2ETapPointerId != e.pointerId)
+                return;
+
+            var position = new Vector2(e.position.x, e.position.y);
+            if (Vector2.Distance(position, _pendingE2ETapStart) > _pendingE2ETapMoveTolerance)
+                _pendingE2ETap = false;
         }
 
-        private VisualElement FindNamedTapTarget(VisualElement target, out Action action)
+        private static bool TryGetE2ETapTarget(Vector2 position, out E2ETapTarget matchedTarget)
         {
-            action = null;
-            for (var current = target; current != null; current = current.hierarchy.parent)
+            matchedTarget = null;
+            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
             {
-                if (!current.enabledInHierarchy || !IsVisible(current))
+                var target = E2ETapTargets[i];
+                if (target.Target == null)
+                {
+                    E2ETapTargets.RemoveAt(i);
+                    continue;
+                }
+
+                if (target.Target.panel == null)
                     continue;
-                if (TryGetNamedTapAction(current.name, out action))
-                    return current;
-                if (current == _root)
-                    break;
+
+                if (!target.IsEnabled() || !target.Target.worldBound.Contains(position))
+                    continue;
+
+                matchedTarget = target;
+                return true;
+            }
+
+            return false;
+        }
+
+        private void RefreshScrollAccessibilityState()
+        {
+            if (_mainSv == null || _hierarchy == null)
+                return;
+
+            var scrollOffset = _mainSv.scrollOffset;
+            if ((scrollOffset - _lastScrollOffset).sqrMagnitude > ScrollOffsetEpsilon * ScrollOffsetEpsilon)
+            {
+                _lastScrollOffset = scrollOffset;
+                _lastScrollChangeMs = Time.realtimeSinceStartupAsDouble * 1000.0;
+                _scrollLayoutChangePending = true;
+                RefreshNodeValuesAndActive();
+                _hierarchy.RefreshNodeFrames();
+                return;
             }
-            return null;
+
+            if (!_scrollLayoutChangePending || _lastScrollChangeMs < 0.0)
+                return;
+
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (now - _lastScrollChangeMs < ScrollSettleLayoutChangeDelayMs)
+                return;
+
+            _scrollLayoutChangePending = false;
+            _hierarchy.RefreshNodeFrames();
         }
 
-        private static bool TryGetNamedTapAction(string name, out Action action) =>
-            SectionBuilder.TryGetNamedTapAction(name, out action)
-            || DialogBase.TryGetNamedTapAction(name, out action);
+        private void EnsureTapMarkerOverlay()
+        {
+            if (_tapMarkerOverlay?.panel != null)
+                return;
+
+            var mainSv = _root.Q<ScrollView>("main_scroll_view");
+            var parent = mainSv?.contentContainer ?? _root;
+
+            _tapMarkerOverlay = new VisualElement();
+            _tapMarkerOverlay.pickingMode = PickingMode.Ignore;
+            _tapMarkerOverlay.style.position = Position.Absolute;
+            _tapMarkerOverlay.style.left = 0;
+            _tapMarkerOverlay.style.top = 0;
+            _tapMarkerOverlay.style.right = 0;
+            _tapMarkerOverlay.style.bottom = 0;
+            parent.Add(_tapMarkerOverlay);
+        }
+
+        private void AddTapMarker(Vector2 position)
+        {
+            EnsureTapMarkerOverlay();
+            var localPosition = _tapMarkerOverlay.WorldToLocal(position);
+
+            var marker = new VisualElement();
+            marker.pickingMode = PickingMode.Ignore;
+            marker.style.position = Position.Absolute;
+            marker.style.width = TapMarkerSize;
+            marker.style.height = TapMarkerSize;
+            marker.style.left = localPosition.x - TapMarkerSize / 2f;
+            marker.style.top = localPosition.y - TapMarkerSize / 2f;
+            marker.style.borderTopLeftRadius = TapMarkerSize / 2f;
+            marker.style.borderTopRightRadius = TapMarkerSize / 2f;
+            marker.style.borderBottomLeftRadius = TapMarkerSize / 2f;
+            marker.style.borderBottomRightRadius = TapMarkerSize / 2f;
+            marker.style.borderTopWidth = 2;
+            marker.style.borderRightWidth = 2;
+            marker.style.borderBottomWidth = 2;
+            marker.style.borderLeftWidth = 2;
+            var markerColor = new Color(0.55f, 0f, 1f, 1f);
+            marker.style.borderTopColor = markerColor;
+            marker.style.borderRightColor = markerColor;
+            marker.style.borderBottomColor = markerColor;
+            marker.style.borderLeftColor = markerColor;
+            marker.style.backgroundColor = new Color(0.55f, 0f, 1f, 0.18f);
+
+            var label = new Label((++_tapMarkerCount).ToString());
+            label.pickingMode = PickingMode.Ignore;
+            label.style.unityTextAlign = TextAnchor.MiddleCenter;
+            label.style.color = markerColor;
+            label.style.fontSize = 10;
+            marker.Add(label);
+
+            _tapMarkerOverlay.Add(marker);
+            while (_tapMarkerOverlay.childCount > MaxTapMarkers)
+                _tapMarkerOverlay.RemoveAt(0);
+        }
 
         /// <summary>
         /// Tames the main ScrollView so XCUITest taps land deterministically
@@ -474,13 +621,7 @@ private void WalkAndAdd(VisualElement el)
             // up by name, so containment doesn't affect reachability.
             if (!string.IsNullOrEmpty(el.name))
             {
-                if (_map.ContainsKey(el))
-                {
-                    Debug.LogWarning(
-                        $"[A11yBridge] Duplicate element registered for name '{el.name}'; skipping"
-                    );
-                }
-                else
+                if (!_map.ContainsKey(el))
                 {
                     var node = _hierarchy.AddNode(el.name, parent: null);
                     var captured = el;
@@ -502,26 +643,32 @@ private void WalkAndAdd(VisualElement el)
                 WalkAndAdd(el[i]);
         }
 
-        private static AccessibilityRole MapRole(VisualElement el) => el switch
-        {
-            Button => AccessibilityRole.Button,
-            Toggle => AccessibilityRole.Toggle,
-            OneSignalDemo.UI.SwitchToggle => AccessibilityRole.Toggle,
-            // ScrollView intentionally NOT exposed as AccessibilityRole.ScrollView.
-            // XCUITest's `XCUIElement.tap()` performs an implicit
-            // `scrollToVisible` on the nearest accessibility ancestor that
-            // claims a scrollable role, which under our setup invoked Unity's
-            // ScrollView mid-tap, shifted the entire content by ~120pt, and
-            // made the queued touch land on empty space (root cause of the
-            // "no PointerDown, button moved 120pt" failure on the multiple
-            // trigger test). Test code drives scrolling via raw swipes, so
-            // dropping the role is a no-op for navigation.
-            Slider => AccessibilityRole.Slider,
-            TextField => AccessibilityRole.SearchField,
-            Label => AccessibilityRole.StaticText,
-            Image => AccessibilityRole.Image,
-            _ => AccessibilityRole.None,
-        };
+        private static AccessibilityRole MapRole(VisualElement el)
+        {
+            if (IsSectionAnchor(el))
+                return AccessibilityRole.StaticText;
+
+            return el switch
+            {
+                Button => AccessibilityRole.Button,
+                Toggle => AccessibilityRole.Toggle,
+                OneSignalDemo.UI.SwitchToggle => AccessibilityRole.Toggle,
+                // ScrollView intentionally NOT exposed as AccessibilityRole.ScrollView.
+                // XCUITest's `XCUIElement.tap()` performs an implicit
+                // `scrollToVisible` on the nearest accessibility ancestor that
+                // claims a scrollable role, which under our setup invoked Unity's
+                // ScrollView mid-tap, shifted the entire content by ~120pt, and
+                // made the queued touch land on empty space (root cause of the
+                // "no PointerDown, button moved 120pt" failure on the multiple
+                // trigger test). Test code drives scrolling via raw swipes, so
+                // dropping the role is a no-op for navigation.
+                Slider => AccessibilityRole.Slider,
+                TextField => AccessibilityRole.SearchField,
+                Label => AccessibilityRole.StaticText,
+                Image => AccessibilityRole.Image,
+                _ => AccessibilityRole.None,
+            };
+        }
 
         private static string ExtractValue(VisualElement el) => el switch
         {
@@ -546,13 +693,16 @@ private static bool IsVisible(VisualElement el)
                 || s.opacity <= 0f)
                 return false;
 
+            if (IsSectionAnchor(el))
+                return true;
+
             // An element whose worldBound has been clipped away by an ancestor
             // ScrollView/clip container is visually invisible. Other SDKs get
             // this for free because they render through native UIScrollView /
             // android.widget.ScrollView whose accessibilityFrame already
             // excludes clipped children. UI Toolkit reports children's panel
             // coordinates regardless of clip, so we have to intersect here.
-            var visible = ComputeVisibleWorldBound(el);
+            var visible = ComputeVisibleWorldBound(GetFrameElement(el));
             return visible.width > 0f && visible.height > 0f;
         }
 
@@ -586,18 +736,50 @@ private static Rect ComputeVisibleWorldBound(VisualElement el)
             return r;
         }
 
+        private static VisualElement GetFrameElement(VisualElement el)
+        {
+            if (IsSectionAnchor(el) && el.childCount > 0)
+                return el[0];
+            return el;
+        }
+
+        private static bool IsSectionAnchor(VisualElement el) =>
+            !string.IsNullOrEmpty(el?.name)
+            && el.name.EndsWith("_section", StringComparison.Ordinal);
+
         private Rect GetScreenRect(VisualElement el)
         {
             if (el?.panel == null)
                 return Rect.zero;
 
-            var wb = ComputeVisibleWorldBound(el);
+            var wb = ComputeVisibleWorldBound(GetFrameElement(el));
             if (wb.width <= 0f || wb.height <= 0f)
                 return Rect.zero;
 
             float s = _panelToScreenScale;
             return new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
         }
+
+        private sealed class E2ETapTarget
+        {
+            public readonly VisualElement Target;
+            public readonly Func<bool> IsEnabled;
+            public readonly Action Action;
+            public readonly float MoveTolerance;
+
+            public E2ETapTarget(
+                VisualElement target,
+                Func<bool> isEnabled,
+                Action action,
+                float moveTolerance
+            )
+            {
+                Target = target;
+                IsEnabled = isEnabled;
+                Action = action;
+                MoveTolerance = moveTolerance;
+            }
+        }
     }
 }
 #endif
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index e31bc557..64a82681 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using OneSignalDemo.Services;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Dialogs
@@ -17,27 +17,6 @@ public abstract class DialogBase
         // from the panel root sidesteps whatever state breaks normal
         // dispatch and keeps E2E taps reliable.
         private static bool _infoFallbackHooked;
-        private static readonly Dictionary<string, Action> TapByName =
-            new Dictionary<string, Action>();
-
-        public static bool TryGetNamedTapAction(string name, out Action action)
-        {
-            action = null;
-            if (string.IsNullOrEmpty(name))
-                return false;
-            return TapByName.TryGetValue(name, out action);
-        }
-
-        protected static void RegisterNamedTap(string name, Action action)
-        {
-            if (!string.IsNullOrEmpty(name) && action != null)
-                TapByName[name] = action;
-        }
-
-        private static void RegisterNamedTap(Button button, Action action)
-        {
-            button.RegisterCallback<AttachToPanelEvent>(_ => RegisterNamedTap(button.name, action));
-        }
 
         private static void HookInfoIconFallback(VisualElement parent)
         {
@@ -73,6 +52,9 @@ private static void HookInfoIconFallback(VisualElement parent)
 
         public void Show(VisualElement parent)
         {
+            if (parent?.Q(className: "dialog-overlay") != null)
+                return;
+
             _parent = parent;
             HookInfoIconFallback(parent);
 
@@ -91,6 +73,7 @@ public void Show(VisualElement parent)
 
             Overlay.Add(Container);
             parent.Add(Overlay);
+            AccessibilityBridge.RequestImmediateResync();
         }
 
         public void Dismiss()
@@ -123,6 +106,7 @@ public void Dismiss()
                     }
                 }
                 overlay.RemoveFromHierarchy();
+                AccessibilityBridge.RequestImmediateResync();
             }
             Overlay = null;
         }
@@ -153,18 +137,21 @@ protected Button CreateConfirmButton(string text, Action onClick)
             btn.text = text;
             btn.AddToClassList("dialog-confirm-button");
             btn.AddToClassList("text-dialog-action");
-            RegisterNamedTap(btn, onClick);
+            AccessibilityBridge.RegisterE2ETapFallback(
+                btn,
+                () => btn.enabledInHierarchy,
+                onClick
+            );
             return btn;
         }
 
         protected Button CreateCancelButton(string text = "Cancel")
         {
-            Action dismiss = Dismiss;
-            var btn = new Button(dismiss);
+            var btn = new Button(Dismiss);
             btn.text = text;
             btn.AddToClassList("dialog-cancel-button");
             btn.AddToClassList("text-dialog-action");
-            RegisterNamedTap(btn, dismiss);
+            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, Dismiss);
             return btn;
         }
     }
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index bb81d2a1..4a8cfe25 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using OneSignalDemo.Services;
 using OneSignalDemo.UI;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Dialogs
@@ -15,6 +17,8 @@ public class MultiPairInputDialog : DialogBase
         private readonly List<(TextField key, TextField value, VisualElement row)> _rows = new();
         private VisualElement _rowsContainer;
         private Button _confirmButton;
+        private double _lastAddRowMs = -1.0;
+        private const double AddRowDedupeMs = 500.0;
 
         public MultiPairInputDialog(
             string title,
@@ -43,10 +47,14 @@ protected override void BuildContent(VisualElement container)
 
             AddRow();
 
-            var addRowButton = new Button(AddRow);
+            var addRowButton = new Button(InvokeAddRow);
             addRowButton.name = "multipair_add_row_button";
-            RegisterNamedTap(addRowButton.name, AddRow);
             addRowButton.AddToClassList("dialog-add-row-button");
+            AccessibilityBridge.RegisterE2ETapFallback(
+                addRowButton,
+                () => addRowButton.enabledInHierarchy,
+                InvokeAddRow
+            );
             var addIcon = new Label(MaterialIcons.Add);
             addIcon.AddToClassList("dialog-add-row-icon");
             addRowButton.Add(addIcon);
@@ -111,6 +119,17 @@ private void AddRow()
             ValidateAll();
         }
 
+        private void InvokeAddRow()
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastAddRowMs >= 0.0 && now - _lastAddRowMs < AddRowDedupeMs)
+                return;
+
+            _lastAddRowMs = now;
+            AddRow();
+            AccessibilityBridge.RequestImmediateResync();
+        }
+
         private void RemoveRow((TextField key, TextField value, VisualElement row) entry)
         {
             _rows.Remove(entry);
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
index d5d68f35..956c0888 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OneSignalDemo.Services;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Dialogs
@@ -11,7 +13,9 @@ public class MultiSelectRemoveDialog : DialogBase
         private readonly List<KeyValuePair<string, string>> _items;
         private readonly Action<List<string>> _onConfirm;
         private readonly Dictionary<string, Toggle> _toggles = new();
+        private readonly Dictionary<string, double> _lastToggleChangeMs = new();
         private Button _confirmButton;
+        private const double ToggleDedupeMs = 500.0;
 
         public MultiSelectRemoveDialog(
             string title,
@@ -40,6 +44,8 @@ protected override void BuildContent(VisualElement container)
                 toggle.name = $"remove_checkbox_{item.Key}";
                 toggle.RegisterValueChangedCallback(evt =>
                 {
+                    _lastToggleChangeMs[item.Key] =
+                        Time.realtimeSinceStartupAsDouble * 1000.0;
                     toggle.EnableInClassList("checkbox--checked", evt.newValue);
                     UpdateCount();
                 });
@@ -51,6 +57,16 @@ protected override void BuildContent(VisualElement container)
                 row.Add(label);
 
                 _toggles[item.Key] = toggle;
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    row,
+                    () => toggle.enabledInHierarchy,
+                    () => ToggleSelection(item.Key, toggle)
+                );
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    toggle,
+                    () => toggle.enabledInHierarchy,
+                    () => ToggleSelection(item.Key, toggle)
+                );
                 container.Add(row);
             }
 
@@ -74,6 +90,18 @@ private void UpdateCount()
             _confirmButton.SetEnabled(count > 0);
         }
 
+        private void ToggleSelection(string key, Toggle toggle)
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastToggleChangeMs.TryGetValue(key, out var last) && now - last < ToggleDedupeMs)
+                return;
+
+            _lastToggleChangeMs[key] = now;
+            toggle.value = !toggle.value;
+            toggle.EnableInClassList("checkbox--checked", toggle.value);
+            UpdateCount();
+        }
+
         private void OnConfirm()
         {
             var selected = _toggles.Where(kvp => kvp.Value.value).Select(kvp => kvp.Key).ToList();
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 2d80b6ed..5e6112f7 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using OneSignalDemo.Services;
 using OneSignalDemo.UI;
 using UnityEngine.UIElements;
 
@@ -15,18 +16,6 @@ public static class SectionBuilder
         // so a root-level dispatch path is used to keep E2E taps reliable.
         public static readonly Dictionary<string, Action> InfoTapByName =
             new Dictionary<string, Action>();
-        private static readonly Dictionary<string, Action> TapByName =
-            new Dictionary<string, Action>();
-
-        public static bool TryGetNamedTapAction(string name, out Action action)
-        {
-            action = null;
-            if (string.IsNullOrEmpty(name))
-                return false;
-            if (!string.IsNullOrEmpty(name) && TapByName.TryGetValue(name, out action))
-                return true;
-            return InfoTapByName.TryGetValue(name, out action);
-        }
 
         public static VisualElement CreateSection(
             string title,
@@ -35,13 +24,13 @@ public static VisualElement CreateSection(
         )
         {
             var section = new VisualElement();
-            section.name = name;
             section.AddToClassList("section-container");
 
             var header = new VisualElement();
             header.AddToClassList("section-header");
 
             var titleLabel = new Label(title.ToUpperInvariant());
+            titleLabel.name = name;
             titleLabel.AddToClassList("section-title");
             titleLabel.AddToClassList("text-section-header");
             header.Add(titleLabel);
@@ -57,6 +46,11 @@ public static VisualElement CreateSection(
                 infoBtn.AddToClassList("info-button");
                 infoBtn.pickingMode = PickingMode.Position;
                 InfoTapByName[infoBtn.name] = onInfoTap;
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    infoBtn,
+                    () => infoBtn.panel?.visualTree.Q("tooltip_title") == null,
+                    onInfoTap
+                );
                 header.Add(infoBtn);
             }
 
@@ -117,7 +111,6 @@ public static Button CreatePrimaryButton(string text, string name, Action onClic
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("primary-button");
-            RegisterNamedTap(name, onClick);
             return btn;
         }
 
@@ -127,7 +120,6 @@ public static Button CreateDestructiveButton(string text, string name, Action on
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("destructive-button");
-            RegisterNamedTap(name, onClick);
             return btn;
         }
 
@@ -174,12 +166,10 @@ public static VisualElement CreateKeyValueItem(
             {
                 var deleteBtn = new Button(onDelete);
                 if (sectionKey != null && itemKey != null)
-                {
                     deleteBtn.name = $"{sectionKey}_remove_{itemKey}";
-                    RegisterNamedTap(deleteBtn.name, onDelete);
-                }
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
+            AccessibilityBridge.RegisterE2ETapFallback(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 
@@ -232,12 +222,10 @@ public static VisualElement CreateSingleItem(
             {
                 var deleteBtn = new Button(onDelete);
                 if (sectionKey != null)
-                {
                     deleteBtn.name = $"{sectionKey}_remove_{value}";
-                    RegisterNamedTap(deleteBtn.name, onDelete);
-                }
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
+            AccessibilityBridge.RegisterE2ETapFallback(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 
@@ -267,11 +255,5 @@ private static string SectionKeyFromName(string name) =>
             name != null && name.EndsWith("_section")
                 ? name.Substring(0, name.Length - "_section".Length)
                 : name;
-
-        private static void RegisterNamedTap(string name, Action action)
-        {
-            if (!string.IsNullOrEmpty(name) && action != null)
-                TapByName[name] = action;
-        }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index 46cb2986..a33f4a23 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
+using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Sections
@@ -12,6 +14,14 @@ public class TriggersSectionController
         private VisualElement _listContainer;
         private Button _removeSelectedButton;
         private Button _clearAllButton;
+        private double _lastAddTapMs = -1.0;
+        private double _lastAddMultipleTapMs = -1.0;
+        private double _lastRemoveSelectedTapMs = -1.0;
+        private double _lastClearAllTapMs = -1.0;
+        private const float E2ETapMoveTolerance = 12f;
+        private const float EmptyCardTapMoveTolerance = -1f;
+        private const int E2ETapDelayMs = 120;
+        private const double E2ETapDedupeMs = 500.0;
 
         public Action OnInfoTap;
         public Action OnAddTap;
@@ -35,44 +45,175 @@ private VisualElement BuildSection()
             );
 
             var card = SectionBuilder.CreateCard("triggers_card");
+            if (AppViewModel.IsE2EMode)
+            {
+                card.style.paddingTop = 6;
+                card.style.paddingBottom = 6;
+                card.style.marginBottom = 4;
+                RegisterDelayedTapFallback(
+                    card,
+                    () => _viewModel.Triggers.Count == 0,
+                    InvokeAddMultiple
+                );
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    card,
+                    () => _viewModel.Triggers.Count == 0,
+                    InvokeAddMultiple,
+                    EmptyCardTapMoveTolerance
+                );
+            }
             _listContainer = new VisualElement();
             _listContainer.name = "triggers_list";
             card.Add(_listContainer);
             section.Add(card);
 
-            section.Add(
-                SectionBuilder.CreatePrimaryButton(
-                    "ADD TRIGGER",
-                    "add_trigger_button",
-                    () => OnAddTap?.Invoke()
-                )
+            var addButton = SectionBuilder.CreatePrimaryButton(
+                "ADD TRIGGER",
+                "add_trigger_button",
+                InvokeAdd
             );
-            section.Add(
-                SectionBuilder.CreatePrimaryButton(
-                    "ADD MULTIPLE TRIGGERS",
-                    "add_multiple_triggers_button",
-                    () => OnAddMultipleTap?.Invoke()
-                )
+            if (AppViewModel.IsE2EMode)
+            {
+                addButton.style.minHeight = 40;
+                addButton.style.marginBottom = 4;
+                RegisterDelayedTapFallback(addButton, () => true, InvokeAdd);
+                AccessibilityBridge.RegisterE2ETapFallback(addButton, () => true, InvokeAdd);
+            }
+            section.Add(addButton);
+            var addMultipleButton = SectionBuilder.CreatePrimaryButton(
+                "ADD MULTIPLE TRIGGERS",
+                "add_multiple_triggers_button",
+                InvokeAddMultiple
             );
+            if (AppViewModel.IsE2EMode)
+            {
+                addMultipleButton.style.minHeight = 40;
+                addMultipleButton.style.marginBottom = 4;
+                RegisterDelayedTapFallback(addMultipleButton, () => true, InvokeAddMultiple);
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    addMultipleButton,
+                    () => true,
+                    InvokeAddMultiple
+                );
+            }
+            section.Add(addMultipleButton);
 
             _removeSelectedButton = SectionBuilder.CreateDestructiveButton(
                 "REMOVE TRIGGERS",
                 "remove_triggers_button",
-                () => OnRemoveSelectedTap?.Invoke()
+                InvokeRemoveSelected
             );
+            if (AppViewModel.IsE2EMode)
+            {
+                RegisterDelayedTapFallback(_removeSelectedButton, () => true, InvokeRemoveSelected);
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    _removeSelectedButton,
+                    () => true,
+                    InvokeRemoveSelected
+                );
+            }
             section.Add(_removeSelectedButton);
 
             _clearAllButton = SectionBuilder.CreateDestructiveButton(
                 "CLEAR ALL TRIGGERS",
                 "clear_triggers_button",
-                () => _viewModel.ClearAllTriggers()
+                InvokeClearAll
             );
+            if (AppViewModel.IsE2EMode)
+            {
+                RegisterDelayedTapFallback(_clearAllButton, () => true, InvokeClearAll);
+                AccessibilityBridge.RegisterE2ETapFallback(
+                    _clearAllButton,
+                    () => true,
+                    InvokeClearAll
+                );
+            }
             section.Add(_clearAllButton);
 
             RefreshList();
             return section;
         }
 
+        private void RegisterDelayedTapFallback(
+            VisualElement element,
+            Func<bool> isEnabled,
+            Action action
+        )
+        {
+            bool pending = false;
+            int pointerId = 0;
+            Vector2 startPosition = default;
+
+            element.RegisterCallback<PointerDownEvent>(e =>
+            {
+                if (!isEnabled())
+                    return;
+
+                pending = true;
+                pointerId = e.pointerId;
+                startPosition = new Vector2(e.position.x, e.position.y);
+                element.schedule.Execute(() =>
+                {
+                    if (!pending || !isEnabled())
+                        return;
+                    pending = false;
+                    action();
+                }).StartingIn(E2ETapDelayMs);
+            });
+
+            element.RegisterCallback<PointerMoveEvent>(e =>
+            {
+                if (!pending || pointerId != e.pointerId)
+                    return;
+
+                var position = new Vector2(e.position.x, e.position.y);
+                if (Vector2.Distance(position, startPosition) > E2ETapMoveTolerance)
+                    pending = false;
+            });
+
+            element.RegisterCallback<PointerCancelEvent>(_ => pending = false);
+        }
+
+        private void InvokeAddMultiple()
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastAddMultipleTapMs >= 0.0 && now - _lastAddMultipleTapMs < E2ETapDedupeMs)
+                return;
+
+            _lastAddMultipleTapMs = now;
+            OnAddMultipleTap?.Invoke();
+        }
+
+        private void InvokeAdd()
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastAddTapMs >= 0.0 && now - _lastAddTapMs < E2ETapDedupeMs)
+                return;
+
+            _lastAddTapMs = now;
+            OnAddTap?.Invoke();
+        }
+
+        private void InvokeRemoveSelected()
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastRemoveSelectedTapMs >= 0.0 && now - _lastRemoveSelectedTapMs < E2ETapDedupeMs)
+                return;
+
+            _lastRemoveSelectedTapMs = now;
+            OnRemoveSelectedTap?.Invoke();
+        }
+
+        private void InvokeClearAll()
+        {
+            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
+            if (_lastClearAllTapMs >= 0.0 && now - _lastClearAllTapMs < E2ETapDedupeMs)
+                return;
+
+            _lastClearAllTapMs = now;
+            _viewModel.ClearAllTriggers();
+        }
+
         public void Refresh() => RefreshList();
 
         private void RefreshList()

From f6feee1d94dee1cd9e1748cfdad10d14b3eb9bfe Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 6 May 2026 11:09:07 -0700
Subject: [PATCH 22/54] fix(demo): prevent double-submit and duplicate aliases

---
 .../UI/Dialogs/MultiPairInputDialog.cs        | 16 +++++++++++-----
 .../Scripts/UI/Dialogs/PairInputDialog.cs     | 19 ++++++++++++++-----
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 15 +++++++++++++--
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index 4a8cfe25..972396f8 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -17,6 +17,7 @@ public class MultiPairInputDialog : DialogBase
         private readonly List<(TextField key, TextField value, VisualElement row)> _rows = new();
         private VisualElement _rowsContainer;
         private Button _confirmButton;
+        private bool _submitted;
         private double _lastAddRowMs = -1.0;
         private const double AddRowDedupeMs = 500.0;
 
@@ -176,6 +177,9 @@ private void ValidateAll()
 
         private void OnConfirm()
         {
+            if (_submitted)
+                return;
+
             var dict = new Dictionary<string, string>();
             foreach (var (key, value, _) in _rows)
             {
@@ -183,11 +187,13 @@ private void OnConfirm()
                     dict[key.value] = value.value;
             }
 
-            if (dict.Count > 0)
-            {
-                _onConfirm?.Invoke(dict);
-                Dismiss();
-            }
+            if (dict.Count == 0)
+                return;
+
+            _submitted = true;
+            _confirmButton?.SetEnabled(false);
+            _onConfirm?.Invoke(dict);
+            Dismiss();
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
index 1036bb21..0687295d 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
@@ -15,6 +15,7 @@ public class PairInputDialog : DialogBase
         private TextField _keyField;
         private TextField _valueField;
         private Button _confirmButton;
+        private bool _submitted;
 
         public PairInputDialog(
             string title,
@@ -96,13 +97,21 @@ private void ValidateInput()
 
         private void OnConfirm()
         {
+            // Guard against double-fire: rapid double-taps and the E2E
+            // accessibility tap fallback can both deliver a second click
+            // before Dismiss() tears the dialog down.
+            if (_submitted)
+                return;
+
             var key = _keyField?.value;
             var value = _valueField?.value;
-            if (!string.IsNullOrEmpty(key) && !string.IsNullOrEmpty(value))
-            {
-                _onConfirm?.Invoke(key, value);
-                Dismiss();
-            }
+            if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
+                return;
+
+            _submitted = true;
+            _confirmButton?.SetEnabled(false);
+            _onConfirm?.Invoke(key, value);
+            Dismiss();
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 37e9427a..ed19ea9d 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -181,7 +181,7 @@ public void LogoutUser()
         public void AddAlias(string label, string id)
         {
             OneSignal.User.AddAlias(label, id);
-            _aliasesList.Add(new KeyValuePair<string, string>(label, id));
+            UpsertAlias(label, id);
             Debug.Log($"[{Tag}] Alias added: {label}");
             ShowToast($"Alias added: {label}");
             NotifyStateChanged();
@@ -191,12 +191,23 @@ public void AddAliases(Dictionary<string, string> aliases)
         {
             OneSignal.User.AddAliases(aliases);
             foreach (var kvp in aliases)
-                _aliasesList.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Value));
+                UpsertAlias(kvp.Key, kvp.Value);
             Debug.Log($"[{Tag}] {aliases.Count} alias(es) added");
             ShowToast($"{aliases.Count} alias(es) added");
             NotifyStateChanged();
         }
 
+        // Upsert by key so the local list matches the API truth (MergePairs)
+        // and is resilient to repeat AddAlias calls.
+        private void UpsertAlias(string key, string value)
+        {
+            var idx = _aliasesList.FindIndex(p => p.Key == key);
+            if (idx >= 0)
+                _aliasesList[idx] = new KeyValuePair<string, string>(key, value);
+            else
+                _aliasesList.Add(new KeyValuePair<string, string>(key, value));
+        }
+
         public void AddEmail(string email)
         {
             OneSignal.User.AddEmail(email);

From 144d88b22d070c4a1bd78ee2c1218210e3362a5e Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 6 May 2026 11:17:09 -0700
Subject: [PATCH 23/54] refactor(demo): consolidate upsert helpers into
 MergePairs

---
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 47 ++++---------------
 1 file changed, 9 insertions(+), 38 deletions(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index ed19ea9d..73abfc02 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -181,7 +181,7 @@ public void LogoutUser()
         public void AddAlias(string label, string id)
         {
             OneSignal.User.AddAlias(label, id);
-            UpsertAlias(label, id);
+            MergePairs(_aliasesList, new Dictionary<string, string> { [label] = id });
             Debug.Log($"[{Tag}] Alias added: {label}");
             ShowToast($"Alias added: {label}");
             NotifyStateChanged();
@@ -190,29 +190,16 @@ public void AddAlias(string label, string id)
         public void AddAliases(Dictionary<string, string> aliases)
         {
             OneSignal.User.AddAliases(aliases);
-            foreach (var kvp in aliases)
-                UpsertAlias(kvp.Key, kvp.Value);
+            MergePairs(_aliasesList, aliases);
             Debug.Log($"[{Tag}] {aliases.Count} alias(es) added");
             ShowToast($"{aliases.Count} alias(es) added");
             NotifyStateChanged();
         }
 
-        // Upsert by key so the local list matches the API truth (MergePairs)
-        // and is resilient to repeat AddAlias calls.
-        private void UpsertAlias(string key, string value)
-        {
-            var idx = _aliasesList.FindIndex(p => p.Key == key);
-            if (idx >= 0)
-                _aliasesList[idx] = new KeyValuePair<string, string>(key, value);
-            else
-                _aliasesList.Add(new KeyValuePair<string, string>(key, value));
-        }
-
         public void AddEmail(string email)
         {
             OneSignal.User.AddEmail(email);
-            if (!_emailsList.Contains(email))
-                _emailsList.Add(email);
+            MergeUnique(_emailsList, new[] { email });
             Debug.Log($"[{Tag}] Email added: {email}");
             ShowToast($"Email added: {email}");
             NotifyStateChanged();
@@ -230,8 +217,7 @@ public void RemoveEmail(string email)
         public void AddSms(string smsNumber)
         {
             OneSignal.User.AddSms(smsNumber);
-            if (!_smsNumbersList.Contains(smsNumber))
-                _smsNumbersList.Add(smsNumber);
+            MergeUnique(_smsNumbersList, new[] { smsNumber });
             Debug.Log($"[{Tag}] SMS added: {smsNumber}");
             ShowToast($"SMS added: {smsNumber}");
             NotifyStateChanged();
@@ -249,7 +235,7 @@ public void RemoveSms(string smsNumber)
         public void AddTag(string key, string value)
         {
             OneSignal.User.AddTag(key, value);
-            UpsertInList(_tagsList, key, value);
+            MergePairs(_tagsList, new Dictionary<string, string> { [key] = value });
             Debug.Log($"[{Tag}] Tag added: {key}={value}");
             ShowToast($"Tag added: {key}");
             NotifyStateChanged();
@@ -258,8 +244,7 @@ public void AddTag(string key, string value)
         public void AddTags(Dictionary<string, string> tags)
         {
             OneSignal.User.AddTags(tags);
-            foreach (var kvp in tags)
-                UpsertInList(_tagsList, kvp.Key, kvp.Value);
+            MergePairs(_tagsList, tags);
             Debug.Log($"[{Tag}] {tags.Count} tag(s) added");
             ShowToast($"{tags.Count} tag(s) added");
             NotifyStateChanged();
@@ -286,7 +271,7 @@ public void RemoveSelectedTags(List<string> keys)
         public void AddTrigger(string key, string value)
         {
             OneSignal.InAppMessages.AddTrigger(key, value);
-            UpsertInList(_triggersList, key, value);
+            MergePairs(_triggersList, new Dictionary<string, string> { [key] = value });
             Debug.Log($"[{Tag}] Trigger added: {key}={value}");
             ShowToast($"Trigger added: {key}");
             NotifyStateChanged();
@@ -295,8 +280,7 @@ public void AddTrigger(string key, string value)
         public void AddTriggers(Dictionary<string, string> triggers)
         {
             OneSignal.InAppMessages.AddTriggers(triggers);
-            foreach (var kvp in triggers)
-                UpsertInList(_triggersList, kvp.Key, kvp.Value);
+            MergePairs(_triggersList, triggers);
             Debug.Log($"[{Tag}] {triggers.Count} trigger(s) added");
             ShowToast($"{triggers.Count} trigger(s) added");
             NotifyStateChanged();
@@ -333,7 +317,7 @@ public void SendInAppMessage(InAppMessageType type)
         {
             var triggerValue = type.TriggerValue();
             OneSignal.InAppMessages.AddTrigger("iam_type", triggerValue);
-            UpsertInList(_triggersList, "iam_type", triggerValue);
+            MergePairs(_triggersList, new Dictionary<string, string> { ["iam_type"] = triggerValue });
             Debug.Log($"[{Tag}] Sent In-App Message: {type.DisplayName()}");
             ShowToast($"Sent In-App Message: {type.DisplayName()}");
             NotifyStateChanged();
@@ -679,19 +663,6 @@ private void SetLoading(bool loading)
 
         private void ShowToast(string message) => OnToastMessage?.Invoke(message);
 
-        private static void UpsertInList(
-            List<KeyValuePair<string, string>> list,
-            string key,
-            string value
-        )
-        {
-            var index = list.FindIndex(kvp => kvp.Key == key);
-            if (index >= 0)
-                list[index] = new KeyValuePair<string, string>(key, value);
-            else
-                list.Add(new KeyValuePair<string, string>(key, value));
-        }
-
         private static void MergePairs(
             List<KeyValuePair<string, string>> target,
             IDictionary<string, string> source

From 5db7c85f4c1b78c56392eb9d7fc9d20fa9cc3ae3 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 6 May 2026 11:29:25 -0700
Subject: [PATCH 24/54] feat(demo): add app bar shadow element

---
 examples/demo/Assets/Resources/Theme.uss                    | 6 ++++++
 examples/demo/Assets/Scripts/UI/HomeScreenController.cs     | 4 ++++
 .../demo/Assets/Scripts/UI/SecondaryScreenController.cs     | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index a37d622c..c4055bc6 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -158,6 +158,12 @@
     color: white;
 }
 
+.app-bar-shadow {
+    height: 4px;
+    background-color: #B33A3C;
+    flex-shrink: 0;
+}
+
 .section-container {
 }
 
diff --git a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
index 16cc3505..b499bc03 100644
--- a/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/HomeScreenController.cs
@@ -149,6 +149,10 @@ private void BuildScreen()
 
             screenRoot.Add(appBar);
 
+            var appBarShadow = new VisualElement();
+            appBarShadow.AddToClassList("app-bar-shadow");
+            screenRoot.Add(appBarShadow);
+
             var scrollView = new ScrollView(ScrollViewMode.Vertical);
             scrollView.name = "main_scroll_view";
             scrollView.AddToClassList("flex-grow");
diff --git a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
index 4ddf1398..209bd332 100644
--- a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
@@ -36,6 +36,10 @@ private void OnEnable()
 
             screenRoot.Add(appBar);
 
+            var appBarShadow = new VisualElement();
+            appBarShadow.AddToClassList("app-bar-shadow");
+            screenRoot.Add(appBarShadow);
+
             var content = new VisualElement();
             content.AddToClassList("centered-content");
 

From 73517f204879cb4fd914e906c90aa0fda40e4dfb Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 11 May 2026 13:50:11 -0700
Subject: [PATCH 25/54] chore(demo): bump Unity editor and packages

---
 .../Scripts/Services/AccessibilityBridge.cs   | 53 ++++++++++++++-----
 examples/demo/Packages/manifest.json          |  8 +--
 examples/demo/Packages/packages-lock.json     |  8 +--
 .../ProjectSettings/ProjectSettings.asset     |  5 +-
 .../demo/ProjectSettings/ProjectVersion.txt   |  4 +-
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index c93bf846..62102f18 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -48,7 +48,7 @@ public class AccessibilityBridge : MonoBehaviour
         private bool _frameRefreshScheduled;
         private float _frameRefreshTimer;
         private float _structurePollTimer;
-        private int _lastNamedDescendantCount = -1;
+        private int _lastStructureSignature = -1;
         private int _tapMarkerCount;
         private VisualElement _tapMarkerOverlay;
         private Vector2 _lastScrollOffset;
@@ -158,7 +158,7 @@ public static void RequestImmediateResync()
         private void Initialize(VisualElement root)
         {
             _root = root;
-            _lastNamedDescendantCount = -1; // force first poll to rebuild
+            _lastStructureSignature = -1; // force first poll to rebuild
 
             // Without this override, AssistiveSupport.activeHierarchy is auto-cleared
             // whenever the OS reports VoiceOver/TalkBack as off. XCUITest reads the
@@ -236,10 +236,10 @@ private void Update()
             if (_structurePollTimer >= StructurePollIntervalSeconds)
             {
                 _structurePollTimer = 0f;
-                int count = CountNamedDescendants(_root);
-                if (count != _lastNamedDescendantCount)
+                int signature = ComputeStructureSignature(_root);
+                if (signature != _lastStructureSignature)
                 {
-                    _lastNamedDescendantCount = count;
+                    _lastStructureSignature = signature;
                     ScheduleResync();
                 }
             }
@@ -280,14 +280,43 @@ private void RefreshNodeValuesAndActive()
             }
         }
 
-        private static int CountNamedDescendants(VisualElement el)
+        // Order-sensitive FNV-1a hash over named descendants. A bare count missed
+        // dialog→section transitions where the closing dialog and the freshly
+        // revealed section exposed the same number of named descendants — the
+        // bridge would skip BuildHierarchy and XCUITest would keep reading a
+        // stale tree (e.g. add_multiple_tags_button stuck at active=0, rect=0x0)
+        // until the next unrelated mutation. Hashing names catches structural
+        // identity changes even when the cardinality is unchanged.
+        private static int ComputeStructureSignature(VisualElement el)
+        {
+            unchecked
+            {
+                int hash = (int)2166136261u;
+                AccumulateNameHash(el, ref hash);
+                return hash;
+            }
+        }
+
+        private static void AccumulateNameHash(VisualElement el, ref int hash)
         {
             if (el == null)
-                return 0;
-            int count = string.IsNullOrEmpty(el.name) ? 0 : 1;
-            for (int i = 0; i < el.childCount; i++)
-                count += CountNamedDescendants(el[i]);
-            return count;
+                return;
+            unchecked
+            {
+                if (!string.IsNullOrEmpty(el.name))
+                {
+                    var name = el.name;
+                    for (int i = 0; i < name.Length; i++)
+                    {
+                        hash ^= name[i];
+                        hash *= 16777619;
+                    }
+                    hash ^= '|';
+                    hash *= 16777619;
+                }
+                for (int i = 0; i < el.childCount; i++)
+                    AccumulateNameHash(el[i], ref hash);
+            }
         }
 
         private void OnScreenReaderStatusChanged(bool _)
@@ -363,7 +392,7 @@ private void BuildHierarchy()
             }
 
             WalkAndAdd(_root);
-            _lastNamedDescendantCount = CountNamedDescendants(_root);
+            _lastStructureSignature = ComputeStructureSignature(_root);
 
             AssistiveSupport.activeHierarchy = _hierarchy;
             AssistiveSupport.notificationDispatcher?.SendScreenChanged();
diff --git a/examples/demo/Packages/manifest.json b/examples/demo/Packages/manifest.json
index 53d49a3b..0bead5f1 100644
--- a/examples/demo/Packages/manifest.json
+++ b/examples/demo/Packages/manifest.json
@@ -3,13 +3,13 @@
     "com.onesignal.unity.android": "file:../../../com.onesignal.unity.android",
     "com.onesignal.unity.core": "file:../../../com.onesignal.unity.core",
     "com.onesignal.unity.ios": "file:../../../com.onesignal.unity.ios",
-    "com.unity.nuget.newtonsoft-json": "3.2.1",
-    "com.unity.ai.navigation": "2.0.10",
+    "com.unity.ai.navigation": "2.0.12",
     "com.unity.ide.rider": "3.0.39",
-    "com.unity.inputsystem": "1.18.0",
+    "com.unity.inputsystem": "1.19.0",
     "com.unity.multiplayer.center": "1.0.1",
+    "com.unity.nuget.newtonsoft-json": "3.2.2",
     "com.unity.test-framework": "1.6.0",
-    "com.unity.timeline": "1.8.10",
+    "com.unity.timeline": "1.8.12",
     "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.adaptiveperformance": "1.0.0",
diff --git a/examples/demo/Packages/packages-lock.json b/examples/demo/Packages/packages-lock.json
index fc1985d4..62e79053 100644
--- a/examples/demo/Packages/packages-lock.json
+++ b/examples/demo/Packages/packages-lock.json
@@ -23,7 +23,7 @@
       }
     },
     "com.unity.ai.navigation": {
-      "version": "2.0.10",
+      "version": "2.0.12",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -55,7 +55,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.inputsystem": {
-      "version": "1.18.0",
+      "version": "1.19.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -72,7 +72,7 @@
       }
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.2.1",
+      "version": "3.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -89,7 +89,7 @@
       }
     },
     "com.unity.timeline": {
-      "version": "1.8.10",
+      "version": "1.8.12",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/examples/demo/ProjectSettings/ProjectSettings.asset b/examples/demo/ProjectSettings/ProjectSettings.asset
index 22099579..1ed28f04 100644
--- a/examples/demo/ProjectSettings/ProjectSettings.asset
+++ b/examples/demo/ProjectSettings/ProjectSettings.asset
@@ -41,7 +41,6 @@ PlayerSettings:
     height: 1
   m_SplashScreenLogos: []
   m_VirtualRealitySplashScreen: {fileID: 0}
-  m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1920
   defaultScreenHeight: 1080
   defaultScreenWidthWeb: 960
@@ -114,6 +113,7 @@ PlayerSettings:
   xboxEnableGuest: 0
   xboxEnablePIXSampling: 0
   metalFramebufferOnly: 0
+  metalUseMetalDisplayLink: 0
   xboxOneResolution: 0
   xboxOneSResolution: 0
   xboxOneXResolution: 3
@@ -147,12 +147,10 @@ PlayerSettings:
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
-  m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 1
   xboxOneEnable7thCore: 1
   vrSettings:
     enable360StereoCapture: 0
-  isWsaHolographicRemotingEnabled: 0
   enableFrameTimingStats: 0
   enableOpenGLProfilerGPURecorders: 1
   allowHDRDisplaySupport: 0
@@ -913,6 +911,7 @@ PlayerSettings:
   captureStartupLogs: {}
   activeInputHandler: 1
   windowsGamepadBackendHint: 0
+  enableDirectStorage: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0
   qualitySettingsNames: []
diff --git a/examples/demo/ProjectSettings/ProjectVersion.txt b/examples/demo/ProjectSettings/ProjectVersion.txt
index a4b5984e..67039ec6 100644
--- a/examples/demo/ProjectSettings/ProjectVersion.txt
+++ b/examples/demo/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.3.6f1
-m_EditorVersionWithRevision: 6000.3.6f1 (bbb010bdb8a3)
+m_EditorVersion: 6000.4.6f1
+m_EditorVersionWithRevision: 6000.4.6f1 (0b051c2e5d54)

From 15eac3fd06d4e1ba3bb62a840a64e82294bafc5d Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 11 May 2026 23:59:50 -0700
Subject: [PATCH 26/54] fix(demo): trigger E2E tap on pointer up

---
 .../Scripts/Services/AccessibilityBridge.cs   | 43 ++++++++++++++++++-
 .../Scripts/UI/Sections/SectionBuilder.cs     |  2 +
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 62102f18..4486f24f 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -62,6 +62,7 @@ public class AccessibilityBridge : MonoBehaviour
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
         private readonly EventCallback<PointerDownEvent> _onNamedTapPointerDown;
+        private readonly EventCallback<PointerUpEvent> _onNamedTapPointerUp;
         private readonly EventCallback<PointerMoveEvent> _onE2ETapPointerMove;
         private readonly EventCallback<PointerCancelEvent> _onE2ETapPointerCancel;
         // Set true after the one-shot ScrollView taming hooks (WheelEvent
@@ -87,6 +88,7 @@ public AccessibilityBridge()
             _onGeometryChanged = _ => ScheduleFrameRefresh();
             _onDetachFromPanel = _ => ScheduleResync();
             _onNamedTapPointerDown = OnNamedTapPointerDown;
+            _onNamedTapPointerUp = OnNamedTapPointerUp;
             _onE2ETapPointerMove = OnE2ETapPointerMove;
             _onE2ETapPointerCancel = _ => _pendingE2ETap = false;
         }
@@ -188,6 +190,7 @@ private void UnregisterTreeCallbacks()
             {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
                 _root.UnregisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
+                _root.UnregisterCallback(_onNamedTapPointerUp, TrickleDown.TrickleDown);
                 _root.UnregisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
                 _root.UnregisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
             }
@@ -369,6 +372,7 @@ private void BuildHierarchy()
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
             _root.RegisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
+            _root.RegisterCallback(_onNamedTapPointerUp, TrickleDown.TrickleDown);
             _root.RegisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
             _root.RegisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
 
@@ -427,6 +431,18 @@ private void OnNamedTapPointerDown(PointerDownEvent e)
             }).StartingIn(E2ETapDelayMs);
         }
 
+        private void OnNamedTapPointerUp(PointerUpEvent e)
+        {
+            if (_pendingE2ETap)
+                return;
+
+            var eventTarget = e.target as VisualElement;
+            if (eventTarget == null || !TryGetE2ETapTarget(eventTarget, out var target))
+                return;
+
+            target.Action();
+        }
+
         private void OnE2ETapPointerMove(PointerMoveEvent e)
         {
             if (!_pendingE2ETap || _pendingE2ETapPointerId != e.pointerId)
@@ -462,6 +478,28 @@ private static bool TryGetE2ETapTarget(Vector2 position, out E2ETapTarget matche
             return false;
         }
 
+        private static bool TryGetE2ETapTarget(VisualElement el, out E2ETapTarget matchedTarget)
+        {
+            matchedTarget = null;
+            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
+            {
+                var target = E2ETapTargets[i];
+                if (target.Target == null)
+                {
+                    E2ETapTargets.RemoveAt(i);
+                    continue;
+                }
+
+                if (target.Target != el || !target.IsEnabled())
+                    continue;
+
+                matchedTarget = target;
+                return true;
+            }
+
+            return false;
+        }
+
         private void RefreshScrollAccessibilityState()
         {
             if (_mainSv == null || _hierarchy == null)
@@ -570,7 +608,10 @@ private void AddTapMarker(Vector2 position)
         private void InstallScrollViewE2EHooks(ScrollView mainSv)
         {
             mainSv.RegisterCallback<WheelEvent>(
-                e => e.StopImmediatePropagation(),
+                e =>
+                {
+                    e.StopImmediatePropagation();
+                },
                 TrickleDown.TrickleDown
             );
             // Touch-activity watchdog: any real Down/Move/Up resets the timer.
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 5e6112f7..b6fb3986 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -111,6 +111,7 @@ public static Button CreatePrimaryButton(string text, string name, Action onClic
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("primary-button");
+            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, onClick);
             return btn;
         }
 
@@ -120,6 +121,7 @@ public static Button CreateDestructiveButton(string text, string name, Action on
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("destructive-button");
+            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, onClick);
             return btn;
         }
 

From 0119424b22506065c0e6acd9cd85d89df4c11c48 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 00:30:08 -0700
Subject: [PATCH 27/54] feat(demo): sync accessibility on toast show/hide

---
 examples/demo/Assets/Scripts/UI/ToastView.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/demo/Assets/Scripts/UI/ToastView.cs b/examples/demo/Assets/Scripts/UI/ToastView.cs
index 221088ae..30d7466c 100644
--- a/examples/demo/Assets/Scripts/UI/ToastView.cs
+++ b/examples/demo/Assets/Scripts/UI/ToastView.cs
@@ -1,3 +1,4 @@
+using OneSignalDemo.Services;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -29,11 +30,13 @@ public void Show(string message)
             _container.pickingMode = PickingMode.Ignore;
 
             var label = new Label(message);
+            label.name = "toast_message";
             label.AddToClassList("toast-label");
             label.pickingMode = PickingMode.Ignore;
             _container.Add(label);
 
             _root.Add(_container);
+            AccessibilityBridge.RequestImmediateResync();
 
             _hideSchedule = _container.schedule.Execute(Hide).StartingIn(2500);
         }
@@ -42,6 +45,7 @@ private void Hide()
         {
             _container?.RemoveFromHierarchy();
             _container = null;
+            AccessibilityBridge.RequestImmediateResync();
         }
     }
 }

From 24c50766eb0a5c2eb5cafc3bac022b7daa3ad99d Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 10:23:41 -0700
Subject: [PATCH 28/54] fix(demo): use prefs for location shared state

---
 examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 73abfc02..a1f46ac8 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -117,7 +117,7 @@ public void LoadInitialState()
             _consentRequired = _prefs.ConsentRequired;
             _privacyConsentGiven = _prefs.PrivacyConsent;
             _inAppMessagesPaused = _prefs.IamPaused;
-            _locationShared = OneSignal.Location.IsShared;
+            _locationShared = _prefs.LocationShared;
             _externalUserId = _prefs.ExternalUserId;
 
             var rawPushId = OneSignal.User.PushSubscription.Id ?? "";

From 386b6de48e6bcd74d3ffc73ffa444d9b7006c58a Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 10:28:56 -0700
Subject: [PATCH 29/54] fix(demo): use cached location shared state

---
 examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index a1f46ac8..be4240d9 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -565,8 +565,7 @@ public void PromptLocation()
 
         public void CheckLocationShared()
         {
-            var shared = OneSignal.Location.IsShared;
-            ShowToast($"Location shared: {shared.ToString().ToLowerInvariant()}");
+            ShowToast($"Location shared: {_locationShared.ToString().ToLowerInvariant()}");
         }
 
         public async void PromptPush()

From e5f7ac8283e135ad4b3ad87c9f669561ac34148d Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 12:18:28 -0700
Subject: [PATCH 30/54] fix(demo): cancel E2E tap on click event

---
 .../Scripts/Services/AccessibilityBridge.cs   | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 4486f24f..28cccb73 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -58,6 +58,7 @@ public class AccessibilityBridge : MonoBehaviour
         private int _pendingE2ETapPointerId;
         private float _pendingE2ETapMoveTolerance;
         private Vector2 _pendingE2ETapStart;
+        private VisualElement _pendingE2ETapTarget;
         private Action _pendingE2ETapAction;
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
@@ -90,7 +91,7 @@ public AccessibilityBridge()
             _onNamedTapPointerDown = OnNamedTapPointerDown;
             _onNamedTapPointerUp = OnNamedTapPointerUp;
             _onE2ETapPointerMove = OnE2ETapPointerMove;
-            _onE2ETapPointerCancel = _ => _pendingE2ETap = false;
+            _onE2ETapPointerCancel = _ => ClearPendingE2ETap();
         }
 
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
@@ -142,11 +143,19 @@ float moveTolerance
                 return;
 
             E2ETapTargets.RemoveAll(t => t.Target == target);
+            target.UnregisterCallback<ClickEvent>(OnRegisteredTargetClick);
+            target.RegisterCallback<ClickEvent>(OnRegisteredTargetClick);
             E2ETapTargets.Add(
                 new E2ETapTarget(target, isEnabled ?? (() => true), action, moveTolerance)
             );
         }
 
+        private static void OnRegisteredTargetClick(ClickEvent e)
+        {
+            if (e.currentTarget is VisualElement target)
+                _instance?.CancelPendingE2ETap(target);
+        }
+
         public static void RequestResync()
         {
             _instance?.ScheduleResync();
@@ -421,13 +430,17 @@ private void OnNamedTapPointerDown(PointerDownEvent e)
             _pendingE2ETapPointerId = e.pointerId;
             _pendingE2ETapMoveTolerance = target.MoveTolerance;
             _pendingE2ETapStart = position;
+            _pendingE2ETapTarget = target.Target;
             _pendingE2ETapAction = target.Action;
             _root.schedule.Execute(() =>
             {
                 if (!_pendingE2ETap)
                     return;
                 _pendingE2ETap = false;
-                _pendingE2ETapAction?.Invoke();
+                var action = _pendingE2ETapAction;
+                _pendingE2ETapAction = null;
+                _pendingE2ETapTarget = null;
+                action?.Invoke();
             }).StartingIn(E2ETapDelayMs);
         }
 
@@ -450,7 +463,22 @@ private void OnE2ETapPointerMove(PointerMoveEvent e)
 
             var position = new Vector2(e.position.x, e.position.y);
             if (Vector2.Distance(position, _pendingE2ETapStart) > _pendingE2ETapMoveTolerance)
-                _pendingE2ETap = false;
+                ClearPendingE2ETap();
+        }
+
+        private void CancelPendingE2ETap(VisualElement target)
+        {
+            if (!_pendingE2ETap || _pendingE2ETapTarget != target)
+                return;
+
+            ClearPendingE2ETap();
+        }
+
+        private void ClearPendingE2ETap()
+        {
+            _pendingE2ETap = false;
+            _pendingE2ETapAction = null;
+            _pendingE2ETapTarget = null;
         }
 
         private static bool TryGetE2ETapTarget(Vector2 position, out E2ETapTarget matchedTarget)

From 459c70835fc92dda1890afa71297f00758d83214 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 14:26:43 -0700
Subject: [PATCH 31/54] feat(demo): add Android native accessibility bridge

---
 .../consumer-proguard.pro                     |   7 +-
 .../consumer-proguard.pro                     |   7 +-
 .../OneSignalUnityE2EAccessibility.java       | 256 ++++++++++++++++++
 .../demo/Assets/Scripts/AppBootstrapper.cs    |  31 ++-
 .../Scripts/Services/AccessibilityBridge.cs   | 160 ++++++++++-
 .../demo/Assets/Scripts/Services/DotEnv.cs    |  27 ++
 6 files changed, 484 insertions(+), 4 deletions(-)
 create mode 100644 examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java

diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro
index 1eb572fe..d1bea67c 100644
--- a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro
+++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro
@@ -1,4 +1,9 @@
 -keep class com.onesignal.** { *; }
 
 # Work around for IllegalStateException with kotlinx-coroutines-android
--keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
\ No newline at end of file
+-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
+
+# WorkManager initializes a Room database through AndroidX Startup before Unity starts.
+# Unity release builds run R8, so keep the generated database implementation reachable.
+-keep class androidx.work.impl.WorkDatabase* { *; }
+-keep class androidx.work.impl.model.** { *; }
diff --git a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro
index 1eb572fe..d1bea67c 100644
--- a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro
+++ b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro
@@ -1,4 +1,9 @@
 -keep class com.onesignal.** { *; }
 
 # Work around for IllegalStateException with kotlinx-coroutines-android
--keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
\ No newline at end of file
+-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
+
+# WorkManager initializes a Room database through AndroidX Startup before Unity starts.
+# Unity release builds run R8, so keep the generated database implementation reachable.
+-keep class androidx.work.impl.WorkDatabase* { *; }
+-keep class androidx.work.impl.model.** { *; }
diff --git a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
new file mode 100644
index 00000000..d92cac33
--- /dev/null
+++ b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
@@ -0,0 +1,256 @@
+package com.onesignal.onesignalsdk;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public final class OneSignalUnityE2EAccessibility {
+  private static final String UNITY_OBJECT = "OneSignalAccessibilityBridge";
+  private static final String TAG = "OneSignalUnityE2E";
+  private static final Map<String, Entry> entries = new HashMap<>();
+  private static FrameLayout overlay;
+  private static int generation;
+  private static boolean loggedOverlayReady;
+
+  private OneSignalUnityE2EAccessibility() {}
+
+  public static void beginSync() {
+    Activity activity = getActivity();
+    if (activity == null) return;
+    activity.runOnUiThread(
+        () -> {
+          ensureOverlay(activity);
+          generation++;
+        });
+  }
+
+  public static void syncElement(
+      String id,
+      String text,
+      boolean active,
+      int x,
+      int y,
+      int width,
+      int height,
+      String role,
+      boolean enabled) {
+    Activity activity = getActivity();
+    if (activity == null || id == null || id.length() == 0) return;
+    activity.runOnUiThread(
+        () -> {
+          ensureOverlay(activity);
+          Entry entry = entries.get(id);
+          if (entry == null || !entry.role.equals(role)) {
+            if (entry != null) overlay.removeView(entry.view);
+            entry = new Entry(createView(activity, id, role), role);
+            entries.put(id, entry);
+            overlay.addView(entry.view);
+          }
+
+          entry.generation = generation;
+          entry.view.setVisibility(active ? View.VISIBLE : View.GONE);
+          entry.view.setEnabled(enabled);
+          entry.view.setContentDescription(text == null ? "" : text);
+          applyText(entry.view, text == null ? "" : text);
+
+          FrameLayout.LayoutParams params =
+              new FrameLayout.LayoutParams(Math.max(1, width), Math.max(1, height));
+          params.leftMargin = x;
+          params.topMargin = y;
+          entry.view.setLayoutParams(params);
+        });
+  }
+
+  public static void endSync() {
+    Activity activity = getActivity();
+    if (activity == null) return;
+    activity.runOnUiThread(
+        () -> {
+          if (overlay == null) return;
+          Iterator<Map.Entry<String, Entry>> it = entries.entrySet().iterator();
+          while (it.hasNext()) {
+            Entry entry = it.next().getValue();
+            if (entry.generation == generation) continue;
+            overlay.removeView(entry.view);
+            it.remove();
+          }
+        });
+  }
+
+  private static void ensureOverlay(Activity activity) {
+    if (overlay != null) return;
+    overlay = new FrameLayout(activity);
+    overlay.setClipChildren(false);
+    overlay.setClipToPadding(false);
+    overlay.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+    activity.addContentView(
+        overlay,
+        new ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+    if (!loggedOverlayReady) {
+      loggedOverlayReady = true;
+      Log.d(TAG, "Native accessibility overlay ready");
+    }
+  }
+
+  private static View createView(Activity activity, String id, String role) {
+    TextView view;
+    if ("input".equals(role)) {
+      E2EEditText input = new E2EEditText(activity, id);
+      input.addTextChangedListener(
+          new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+              if (!input.isApplyingUnityValue()) sendToUnity(id, "setValue", s.toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {}
+          });
+      view = input;
+    } else if ("toggle".equals(role)) {
+      E2ECheckBox toggle = new E2ECheckBox(activity, id);
+      toggle.setOnClickListener(v -> sendToUnity(id, "click", ""));
+      view = toggle;
+    } else {
+      view = new E2ETextView(activity, id);
+      if ("button".equals(role)) {
+        view.setClickable(true);
+        view.setOnClickListener(v -> sendToUnity(id, "click", ""));
+      }
+    }
+
+    view.setGravity(Gravity.CENTER);
+    view.setBackgroundColor(Color.TRANSPARENT);
+    view.setTextColor(Color.TRANSPARENT);
+    view.setHintTextColor(Color.TRANSPARENT);
+    view.setIncludeFontPadding(false);
+    view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+    return view;
+  }
+
+  private static void applyText(View view, String text) {
+    if (view instanceof E2ECheckBox) {
+      ((E2ECheckBox) view).setChecked("1".equals(text) || "true".equalsIgnoreCase(text));
+      ((E2ECheckBox) view).setText(text);
+      return;
+    }
+
+    if (view instanceof E2EEditText) {
+      E2EEditText input = (E2EEditText) view;
+      if (!text.contentEquals(input.getText())) input.setUnityText(text);
+      return;
+    }
+
+    if (view instanceof TextView) ((TextView) view).setText(text);
+  }
+
+  private static void sendToUnity(String id, String action, String value) {
+    try {
+      Class<?> unityPlayer = Class.forName("com.unity3d.player.UnityPlayer");
+      Method sendMessage =
+          unityPlayer.getMethod("UnitySendMessage", String.class, String.class, String.class);
+      sendMessage.invoke(
+          null, UNITY_OBJECT, "HandleAndroidAccessibilityAction", id + "\n" + action + "\n" + value);
+    } catch (Exception ignored) {
+    }
+  }
+
+  private static Activity getActivity() {
+    try {
+      Class<?> unityPlayer = Class.forName("com.unity3d.player.UnityPlayer");
+      Field currentActivity = unityPlayer.getField("currentActivity");
+      Object activity = currentActivity.get(null);
+      return activity instanceof Activity ? (Activity) activity : null;
+    } catch (Exception ignored) {
+      return null;
+    }
+  }
+
+  private static final class Entry {
+    final View view;
+    final String role;
+    int generation;
+
+    Entry(View view, String role) {
+      this.view = view;
+      this.role = role;
+    }
+  }
+
+  private static class E2ETextView extends TextView {
+    private final String id;
+
+    E2ETextView(Activity activity, String id) {
+      super(activity);
+      this.id = id;
+    }
+
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+      super.onInitializeAccessibilityNodeInfo(info);
+      info.setViewIdResourceName(id);
+    }
+  }
+
+  private static final class E2EEditText extends EditText {
+    private final String id;
+    private boolean applyingUnityValue;
+
+    E2EEditText(Activity activity, String id) {
+      super(activity);
+      this.id = id;
+      setSingleLine(false);
+    }
+
+    boolean isApplyingUnityValue() {
+      return applyingUnityValue;
+    }
+
+    void setUnityText(String text) {
+      applyingUnityValue = true;
+      setText(text);
+      setSelection(getText().length());
+      applyingUnityValue = false;
+    }
+
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+      super.onInitializeAccessibilityNodeInfo(info);
+      info.setViewIdResourceName(id);
+    }
+  }
+
+  private static final class E2ECheckBox extends CheckBox {
+    private final String id;
+
+    E2ECheckBox(Activity activity, String id) {
+      super(activity);
+      this.id = id;
+    }
+
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+      super.onInitializeAccessibilityNodeInfo(info);
+      info.setViewIdResourceName(id);
+    }
+  }
+}
diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index 672e72ad..ae696be3 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -66,12 +66,41 @@ private async void Start()
             _viewModel.LoadInitialState();
             await _viewModel.LoadInitialDataAsync();
 
-            _viewModel.PromptPush();
+            PromptPushForStartup();
 
             _ = TooltipHelper.Instance.InitAsync();
             Debug.Log($"[{Tag}] App initialized");
         }
 
+        private void PromptPushForStartup()
+        {
+#if UNITY_ANDROID && !UNITY_EDITOR
+            if (DotEnv.IsE2EMode)
+            {
+                RequestAndroidPostNotificationsPermission();
+                return;
+            }
+#endif
+            _viewModel.PromptPush();
+        }
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static void RequestAndroidPostNotificationsPermission()
+        {
+            using var version = new AndroidJavaClass("android.os.Build$VERSION");
+            if (version.GetStatic<int>("SDK_INT") < 33)
+                return;
+
+            using var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+            using var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+            activity.Call(
+                "requestPermissions",
+                new[] { "android.permission.POST_NOTIFICATIONS" },
+                1001
+            );
+        }
+#endif
+
         private void RegisterSdkListeners()
         {
             OneSignal.InAppMessages.WillDisplay += OnIamWillDisplay;
diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 28cccb73..ec174192 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -37,9 +37,14 @@ public class AccessibilityBridge : MonoBehaviour
         // additions, since a freshly-created VisualElement has nothing for
         // us to subscribe to until BuildHierarchy walks it.
         private const float StructurePollIntervalSeconds = 0.1f;
+        private const string GameObjectName = "OneSignalAccessibilityBridge";
 
         private static AccessibilityBridge _instance;
         private static readonly List<E2ETapTarget> E2ETapTargets = new();
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static AndroidJavaClass _androidAccessibilityBridge;
+        private static bool _androidSyncErrorLogged;
+#endif
 
         private VisualElement _root;
         private AccessibilityHierarchy _hierarchy;
@@ -114,16 +119,24 @@ public static void EnableForE2E(VisualElement root)
             if (root == null)
                 return;
             if (!DotEnv.IsE2EMode)
+            {
+#if UNITY_ANDROID && !UNITY_EDITOR
+                Debug.LogWarning("[OneSignalDemo] E2E accessibility bridge disabled");
+#endif
                 return;
+            }
 
             if (_instance == null)
             {
-                var go = new GameObject("[AccessibilityBridge]");
+                var go = new GameObject(GameObjectName);
                 DontDestroyOnLoad(go);
                 _instance = go.AddComponent<AccessibilityBridge>();
             }
 
             _instance.Initialize(root);
+#if UNITY_ANDROID && !UNITY_EDITOR
+            Debug.Log("[OneSignalDemo] E2E accessibility bridge enabled");
+#endif
         }
 
         public static void RegisterE2ETapFallback(
@@ -220,7 +233,10 @@ private IEnumerator RefreshFramesEndOfFrame()
             yield return new WaitForEndOfFrame();
             _frameRefreshScheduled = false;
             if (_hierarchy != null)
+            {
                 _hierarchy.RefreshNodeFrames();
+                SyncAndroidNativeAccessibility();
+            }
         }
 
         private void Update()
@@ -271,6 +287,7 @@ private void Update()
                 _frameRefreshTimer = 0f;
                 RefreshNodeValuesAndActive();
                 _hierarchy.RefreshNodeFrames();
+                SyncAndroidNativeAccessibility();
             }
         }
 
@@ -410,6 +427,7 @@ private void BuildHierarchy()
             AssistiveSupport.activeHierarchy = _hierarchy;
             AssistiveSupport.notificationDispatcher?.SendScreenChanged();
             _hierarchy.RefreshNodeFrames();
+            SyncAndroidNativeAccessibility();
         }
 
         private void OnNamedTapPointerDown(PointerDownEvent e)
@@ -528,6 +546,146 @@ private static bool TryGetE2ETapTarget(VisualElement el, out E2ETapTarget matche
             return false;
         }
 
+        public void HandleAndroidAccessibilityAction(string payload)
+        {
+#if UNITY_ANDROID && !UNITY_EDITOR
+            if (string.IsNullOrEmpty(payload) || _root == null)
+                return;
+
+            var firstBreak = payload.IndexOf('\n');
+            if (firstBreak < 0)
+                return;
+            var secondBreak = payload.IndexOf('\n', firstBreak + 1);
+            if (secondBreak < 0)
+                return;
+
+            var id = payload.Substring(0, firstBreak);
+            var action = payload.Substring(firstBreak + 1, secondBreak - firstBreak - 1);
+            var value = payload.Substring(secondBreak + 1);
+
+            if (action == "setValue")
+            {
+                var field = _root.Q<TextField>(id);
+                if (field != null && field.value != value)
+                    field.value = value;
+                return;
+            }
+
+            if (action == "click")
+                InvokeAndroidNativeAction(id);
+#endif
+        }
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static AndroidJavaClass AndroidAccessibilityBridge
+        {
+            get
+            {
+                _androidAccessibilityBridge ??= new AndroidJavaClass(
+                    "com.onesignal.onesignalsdk.OneSignalUnityE2EAccessibility"
+                );
+                return _androidAccessibilityBridge;
+            }
+        }
+
+        private void SyncAndroidNativeAccessibility()
+        {
+            try
+            {
+                AndroidAccessibilityBridge.CallStatic("beginSync");
+                foreach (var kvp in _map)
+                {
+                    var el = kvp.Key;
+                    if (el == null || string.IsNullOrEmpty(el.name))
+                        continue;
+
+                    var rect = GetScreenRect(el);
+                    AndroidAccessibilityBridge.CallStatic(
+                        "syncElement",
+                        el.name,
+                        ExtractValue(el),
+                        IsVisible(el) && rect.width > 0f && rect.height > 0f,
+                        Mathf.RoundToInt(rect.x),
+                        Mathf.RoundToInt(rect.y),
+                        Mathf.RoundToInt(rect.width),
+                        Mathf.RoundToInt(rect.height),
+                        AndroidNativeRole(el),
+                        el.enabledInHierarchy
+                    );
+                }
+                AndroidAccessibilityBridge.CallStatic("endSync");
+            }
+            catch (Exception ex)
+            {
+                if (!_androidSyncErrorLogged)
+                {
+                    _androidSyncErrorLogged = true;
+                    Debug.LogWarning(
+                        $"[OneSignalDemo] Android E2E accessibility sync failed: {ex.Message}"
+                    );
+                }
+            }
+        }
+
+        private void InvokeAndroidNativeAction(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+                return;
+
+            var switchToggle = _root.Q<OneSignalDemo.UI.SwitchToggle>(id);
+            if (switchToggle != null)
+            {
+                switchToggle.SetValueAndNotify(!switchToggle.Value);
+                return;
+            }
+
+            var toggle = _root.Q<Toggle>(id);
+            if (toggle != null)
+            {
+                toggle.value = !toggle.value;
+                return;
+            }
+
+            InvokeRegisteredTap(id);
+        }
+
+        private static void InvokeRegisteredTap(string id)
+        {
+            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
+            {
+                var target = E2ETapTargets[i];
+                if (target.Target == null)
+                {
+                    E2ETapTargets.RemoveAt(i);
+                    continue;
+                }
+
+                if (target.Target.name != id || !target.IsEnabled())
+                    continue;
+
+                target.Action();
+                return;
+            }
+        }
+
+        private static string AndroidNativeRole(VisualElement el)
+        {
+            if (TryGetE2ETapTarget(el, out _))
+                return "button";
+
+            return el switch
+            {
+                TextField => "input",
+                Toggle => "toggle",
+                OneSignalDemo.UI.SwitchToggle => "toggle",
+                Button => "button",
+                _ => "text",
+            };
+        }
+#else
+        private void SyncAndroidNativeAccessibility() { }
+#endif
+
         private void RefreshScrollAccessibilityState()
         {
             if (_mainSv == null || _hierarchy == null)
diff --git a/examples/demo/Assets/Scripts/Services/DotEnv.cs b/examples/demo/Assets/Scripts/Services/DotEnv.cs
index e96339d6..d0dba686 100644
--- a/examples/demo/Assets/Scripts/Services/DotEnv.cs
+++ b/examples/demo/Assets/Scripts/Services/DotEnv.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using UnityEngine;
 
 namespace OneSignalDemo.Services
@@ -73,11 +74,37 @@ private static string ReadEnvContent()
             if (File.Exists(editorPath))
                 return File.ReadAllText(editorPath);
 #endif
+#if UNITY_ANDROID && !UNITY_EDITOR
+            return ReadAndroidAsset(".env");
+#else
             var streamingPath = Path.Combine(Application.streamingAssetsPath, ".env");
             if (File.Exists(streamingPath))
                 return File.ReadAllText(streamingPath);
 
             return null;
+#endif
         }
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static string ReadAndroidAsset(string path)
+        {
+            using var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+            using var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+            using var assets = activity.Call<AndroidJavaObject>("getAssets");
+            using var stream = assets.Call<AndroidJavaObject>("open", path);
+            using var inputStreamReader = new AndroidJavaObject("java.io.InputStreamReader", stream);
+            using var reader = new AndroidJavaObject(
+                "java.io.BufferedReader",
+                inputStreamReader
+            );
+            var content = new StringBuilder();
+
+            string line;
+            while ((line = reader.Call<string>("readLine")) != null)
+                content.AppendLine(line);
+
+            return content.ToString();
+        }
+#endif
     }
 }

From a9aa1ada3378acced8390799b7169e8b481b6cdb Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 14:40:12 -0700
Subject: [PATCH 32/54] fix(demo): hide default checkbox indicator

---
 .../onesignalsdk/OneSignalUnityE2EAccessibility.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
index d92cac33..5dce8c91 100644
--- a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
+++ b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
@@ -128,6 +128,10 @@ public void afterTextChanged(Editable s) {}
       view = input;
     } else if ("toggle".equals(role)) {
       E2ECheckBox toggle = new E2ECheckBox(activity, id);
+      // Hide the default square check indicator; the Unity-drawn pill switch
+      // is the visual. CheckBox class, isChecked() state, viewIdResourceName,
+      // and click handling are preserved for Appium/UiAutomator2.
+      toggle.setButtonDrawable(null);
       toggle.setOnClickListener(v -> sendToUnity(id, "click", ""));
       view = toggle;
     } else {

From 3654d95f9b86863568ff0f4012e861a11de33187 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 15:03:24 -0700
Subject: [PATCH 33/54] fix(demo): suppress spell-check underline on E2E input

---
 .../onesignalsdk/OneSignalUnityE2EAccessibility.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
index 5dce8c91..15435345 100644
--- a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
+++ b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.graphics.Color;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Gravity;
@@ -112,6 +113,13 @@ private static View createView(Activity activity, String id, String role) {
     TextView view;
     if ("input".equals(role)) {
       E2EEditText input = new E2EEditText(activity, id);
+      // // Hide the blinking caret; the Unity-drawn TextField renders its own.
+      // input.setCursorVisible(false);
+      // Suppress the spell-checker's red underline span. The Unity TextField
+      // is the user-visible input; the overlay only needs to forward
+      // characters back to Unity via the TextWatcher.
+      input.setInputType(
+          InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
       input.addTextChangedListener(
           new TextWatcher() {
             @Override

From f3832a0896a8975c93a41d995ebc3104f331460a Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 15:49:30 -0700
Subject: [PATCH 34/54] feat(demo): add E2E gutter swipe scroll support

---
 .../OneSignalUnityE2EAccessibility.java       | 46 ++++++++++++++++++-
 .../Scripts/Services/AccessibilityBridge.cs   | 27 +++++++++++
 .../UI/Sections/SendIamSectionController.cs   |  5 +-
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
index 15435345..f6555e80 100644
--- a/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
+++ b/examples/demo/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/java/com/onesignal/onesignalsdk/OneSignalUnityE2EAccessibility.java
@@ -7,8 +7,10 @@
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewConfiguration;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -95,7 +97,7 @@ public static void endSync() {
 
   private static void ensureOverlay(Activity activity) {
     if (overlay != null) return;
-    overlay = new FrameLayout(activity);
+    overlay = new E2EOverlay(activity);
     overlay.setClipChildren(false);
     overlay.setClipToPadding(false);
     overlay.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
@@ -208,6 +210,48 @@ private static final class Entry {
     }
   }
 
+  private static final class E2EOverlay extends FrameLayout {
+    private final int gutterWidth;
+    private final int touchSlop;
+    private boolean trackingGutterDrag;
+    private float startY;
+
+    E2EOverlay(Activity activity) {
+      super(activity);
+      // The test swipe lane is x=10. Keep this narrow so dialog checkboxes
+      // near the left edge still receive normal clicks.
+      gutterWidth = 24;
+      touchSlop = ViewConfiguration.get(activity).getScaledTouchSlop();
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+      if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+        trackingGutterDrag = event.getX() <= gutterWidth;
+        startY = event.getY();
+        if (trackingGutterDrag) return true;
+      }
+
+      if (!trackingGutterDrag) return super.dispatchTouchEvent(event);
+
+      if (event.getActionMasked() == MotionEvent.ACTION_UP) {
+        float deltaY = event.getY() - startY;
+        if (Math.abs(deltaY) > touchSlop) {
+          sendToUnity("main_scroll_view", "scroll", deltaY < 0 ? "down" : "up");
+        }
+        trackingGutterDrag = false;
+        return true;
+      }
+
+      if (event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
+        trackingGutterDrag = false;
+        return true;
+      }
+
+      return true;
+    }
+  }
+
   private static class E2ETextView extends TextView {
     private final String id;
 
diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index ec174192..1ac33608 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -572,7 +572,13 @@ public void HandleAndroidAccessibilityAction(string payload)
             }
 
             if (action == "click")
+            {
                 InvokeAndroidNativeAction(id);
+                return;
+            }
+
+            if (action == "scroll")
+                InvokeAndroidNativeScroll(value);
 #endif
         }
 
@@ -649,6 +655,27 @@ private void InvokeAndroidNativeAction(string id)
             InvokeRegisteredTap(id);
         }
 
+        private void InvokeAndroidNativeScroll(string direction)
+        {
+            if (_mainSv == null)
+                return;
+
+            var viewportHeight = _mainSv.contentViewport?.layout.height ?? _mainSv.layout.height;
+            var contentHeight = _mainSv.contentContainer?.layout.height ?? 0f;
+            if (viewportHeight <= 0f || contentHeight <= viewportHeight)
+                return;
+
+            var current = _mainSv.scrollOffset;
+            var delta = Mathf.Max(80f, viewportHeight * 0.6f);
+            var maxY = Mathf.Max(0f, contentHeight - viewportHeight);
+            var nextY = direction == "up" ? current.y - delta : current.y + delta;
+            _mainSv.scrollOffset = new Vector2(current.x, Mathf.Clamp(nextY, 0f, maxY));
+
+            RefreshNodeValuesAndActive();
+            _hierarchy?.RefreshNodeFrames();
+            SyncAndroidNativeAccessibility();
+        }
+
         private static void InvokeRegisteredTap(string id)
         {
             for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
index f5941616..a2487b80 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
@@ -1,5 +1,6 @@
 using System;
 using OneSignalDemo.Models;
+using OneSignalDemo.Services;
 using OneSignalDemo.UI;
 using OneSignalDemo.ViewModels;
 using UnityEngine.UIElements;
@@ -72,9 +73,11 @@ private VisualElement CreateIamButton(
             InAppMessageType type
         )
         {
-            var btn = new Button(() => _viewModel.SendInAppMessage(type));
+            void SendIam() => _viewModel.SendInAppMessage(type);
+            var btn = new Button(SendIam);
             btn.name = name;
             btn.AddToClassList("iam-button");
+            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, SendIam);
 
             var iconLabel = new Label(icon);
             iconLabel.AddToClassList("iam-button-icon");

From a712965cfe32be7ec0b0ce1336a05fbfe40b69a2 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 17:28:28 -0700
Subject: [PATCH 35/54] fix(demo): skip a11y sync when nothing changed

---
 .../Scripts/Services/AccessibilityBridge.cs   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 1ac33608..146e50cc 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -285,14 +285,23 @@ private void Update()
             if (_frameRefreshTimer >= FrameRefreshIntervalSeconds)
             {
                 _frameRefreshTimer = 0f;
-                RefreshNodeValuesAndActive();
-                _hierarchy.RefreshNodeFrames();
-                SyncAndroidNativeAccessibility();
+                // Only push to the platform a11y service when something actually
+                // changed. Unconditional RefreshNodeFrames + Android sync every
+                // 50ms emits a continuous stream of TYPE_WINDOW_CONTENT_CHANGED
+                // AccessibilityEvents that prevent UiAutomator2's wait-for-idle
+                // from observing 500ms of quiet, stalling every click for the
+                // full waitForIdleTimeout (default 10s).
+                if (RefreshNodeValuesAndActive())
+                {
+                    _hierarchy.RefreshNodeFrames();
+                    SyncAndroidNativeAccessibility();
+                }
             }
         }
 
-        private void RefreshNodeValuesAndActive()
+        private bool RefreshNodeValuesAndActive()
         {
+            bool anyChanged = false;
             foreach (var kvp in _map)
             {
                 var el = kvp.Key;
@@ -306,7 +315,9 @@ private void RefreshNodeValuesAndActive()
 
                 node.value = newValue;
                 node.isActive = newActive;
+                anyChanged = true;
             }
+            return anyChanged;
         }
 
         // Order-sensitive FNV-1a hash over named descendants. A bare count missed

From 152d6da9bfd58ea543aef12d31976b01c37a9bb8 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 18:01:11 -0700
Subject: [PATCH 36/54] fix(demo): use BaseBoolField for radio a11y support

---
 .../Scripts/Services/AccessibilityBridge.cs      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 146e50cc..9c6cd9f5 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -656,10 +656,14 @@ private void InvokeAndroidNativeAction(string id)
                 return;
             }
 
-            var toggle = _root.Q<Toggle>(id);
-            if (toggle != null)
+            // BaseBoolField is the common base of Toggle AND RadioButton in
+            // UI Toolkit. Q<Toggle> would miss radios entirely, leaving the
+            // overlay click as a no-op (clicking the unique/with-value radio
+            // wouldn't actually select that outcome type).
+            var boolField = _root.Q<BaseBoolField>(id);
+            if (boolField != null)
             {
-                toggle.value = !toggle.value;
+                boolField.value = !boolField.value;
                 return;
             }
 
@@ -714,7 +718,7 @@ private static string AndroidNativeRole(VisualElement el)
             return el switch
             {
                 TextField => "input",
-                Toggle => "toggle",
+                BaseBoolField => "toggle",
                 OneSignalDemo.UI.SwitchToggle => "toggle",
                 Button => "button",
                 _ => "text",
@@ -945,7 +949,7 @@ private static AccessibilityRole MapRole(VisualElement el)
             return el switch
             {
                 Button => AccessibilityRole.Button,
-                Toggle => AccessibilityRole.Toggle,
+                BaseBoolField => AccessibilityRole.Toggle,
                 OneSignalDemo.UI.SwitchToggle => AccessibilityRole.Toggle,
                 // ScrollView intentionally NOT exposed as AccessibilityRole.ScrollView.
                 // XCUITest's `XCUIElement.tap()` performs an implicit
@@ -967,7 +971,7 @@ private static AccessibilityRole MapRole(VisualElement el)
         private static string ExtractValue(VisualElement el) => el switch
         {
             TextField tf => tf.value ?? string.Empty,
-            Toggle t => t.value ? "1" : "0",
+            BaseBoolField b => b.value ? "1" : "0",
             // The demo uses a custom SwitchToggle (VisualElement) that does
             // not inherit from UnityEngine.UIElements.Toggle, so the platform
             // a11y value would be empty without this case. The selectors

From d1197464bc74f1824e03526ada04eb137c2df157 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 18:34:11 -0700
Subject: [PATCH 37/54] fix(demo): incremental a11y rebuild to preserve node
 identity

---
 .../Scripts/Services/AccessibilityBridge.cs   | 71 +++++++++++++++----
 1 file changed, 59 insertions(+), 12 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 9c6cd9f5..bfe098d4 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -393,8 +393,6 @@ private void BuildHierarchy()
             UnregisterTreeCallbacks();
 
             _hierarchy ??= new AccessibilityHierarchy();
-            _hierarchy.Clear();
-            _map.Clear();
 
             // Recompute the panel→screen scale before walking the tree so each
             // node's frameGetter sees the correct ratio.
@@ -432,11 +430,47 @@ private void BuildHierarchy()
                 }
             }
 
-            WalkAndAdd(_root);
+            // Incremental rebuild: preserve AccessibilityNode identities by
+            // name across rebuilds. _hierarchy.Clear() + re-add invalidates
+            // every WDA-cached element ref on iOS, producing a burst of
+            // "stale element - terminating request" warnings whenever a
+            // dialog opens/closes — even when most nodes are unchanged.
+            // We diff by name: reuse existing nodes (just re-bind their
+            // frameGetter to the current VisualElement instance), add new
+            // ones, remove ones whose names disappeared.
+            var existingByName = new Dictionary<string, AccessibilityNode>(_map.Count);
+            foreach (var kvp in _map)
+            {
+                var n = kvp.Value;
+                if (n != null && !string.IsNullOrEmpty(kvp.Key?.name))
+                    existingByName[kvp.Key.name] = n;
+            }
+
+            _map.Clear();
+            var seenNames = new HashSet<string>();
+            bool addedAny = false;
+            WalkAndUpsert(_root, existingByName, seenNames, ref addedAny);
+
+            bool removedAny = false;
+            foreach (var kvp in existingByName)
+            {
+                if (seenNames.Contains(kvp.Key))
+                    continue;
+                try { _hierarchy.RemoveNode(kvp.Value); }
+                catch { /* node may already be detached */ }
+                removedAny = true;
+            }
+
             _lastStructureSignature = ComputeStructureSignature(_root);
 
-            AssistiveSupport.activeHierarchy = _hierarchy;
-            AssistiveSupport.notificationDispatcher?.SendScreenChanged();
+            if (AssistiveSupport.activeHierarchy != _hierarchy)
+                AssistiveSupport.activeHierarchy = _hierarchy;
+            // SendScreenChanged tells VoiceOver/XCUITest to refresh its
+            // element snapshot, which also invalidates cached refs. Skip it
+            // when we only re-bound existing nodes — frame/value updates
+            // ride out via the normal RefreshNodeFrames path.
+            if (addedAny || removedAny)
+                AssistiveSupport.notificationDispatcher?.SendScreenChanged();
             _hierarchy.RefreshNodeFrames();
             SyncAndroidNativeAccessibility();
         }
@@ -905,7 +939,12 @@ private static void ResetScrollViewPanState(ScrollView sv)
             }
         }
 
-        private void WalkAndAdd(VisualElement el)
+        private void WalkAndUpsert(
+            VisualElement el,
+            Dictionary<string, AccessibilityNode> existingByName,
+            HashSet<string> seenNames,
+            ref bool addedAny
+        )
         {
             if (el == null)
                 return;
@@ -917,11 +956,20 @@ private void WalkAndAdd(VisualElement el)
             // descendants (XCUITest reports visible="false" even when the
             // child's frame is on screen). The test framework only ever looks
             // up by name, so containment doesn't affect reachability.
-            if (!string.IsNullOrEmpty(el.name))
+            if (!string.IsNullOrEmpty(el.name) && !_map.ContainsKey(el))
             {
-                if (!_map.ContainsKey(el))
+                var name = el.name;
+                // Two distinct VisualElements with the same name (e.g.
+                // freshly-rebuilt dialog) — first one wins; only one
+                // accessibility node per name to keep ids unambiguous.
+                if (seenNames.Add(name))
                 {
-                    var node = _hierarchy.AddNode(el.name, parent: null);
+                    AccessibilityNode node;
+                    if (!existingByName.TryGetValue(name, out node))
+                    {
+                        node = _hierarchy.AddNode(name, parent: null);
+                        addedAny = true;
+                    }
                     var captured = el;
                     node.frameGetter = () => GetScreenRect(captured);
                     node.role = MapRole(el);
@@ -931,14 +979,13 @@ private void WalkAndAdd(VisualElement el)
                     // Detach fires the moment a tracked element leaves the
                     // panel — Dismiss(), section refresh, scene swap. Drives
                     // an immediate ScheduleResync so XCUITest can't read a
-                    // node whose owner is already gone (the source of the
-                    // "stale element" warnings during dialog teardown).
+                    // node whose owner is already gone.
                     el.RegisterCallback(_onDetachFromPanel);
                 }
             }
 
             for (int i = 0; i < el.childCount; i++)
-                WalkAndAdd(el[i]);
+                WalkAndUpsert(el[i], existingByName, seenNames, ref addedAny);
         }
 
         private static AccessibilityRole MapRole(VisualElement el)

From acbfa62d0c26ec66d9a136912e1a02328a49a024 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 22:28:13 -0700
Subject: [PATCH 38/54] fix(demo): pin widget pod to OneSignal version

---
 .../App/Editor/iOS/BuildPostProcessor.cs      | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs b/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
index 1beb3d09..96cdd64a 100644
--- a/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
+++ b/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
@@ -34,6 +34,7 @@
 using UnityEditor.iOS.Xcode.Extensions;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace App.Editor.iOS
 {
@@ -159,12 +160,63 @@ static void AddWidgetExtensionToPodFile(string outputPath)
                 return;
             }
 
+            // Keep the widget extension pinned to the same OneSignalXCFramework version as the
+            // core plugin so CocoaPods can resolve a single shared version across targets.
+            var requiredVersion = ResolveOneSignalXCFrameworkVersion();
+            var versionConstraint =
+                requiredVersion != null ? $"'{requiredVersion}'" : "'>= 5.0.2', '< 6.0.0'";
+            var requiredTarget =
+                $"target '{WidgetExtensionTargetName}' do\n  pod 'OneSignalXCFramework', {versionConstraint}\nend\n";
+
             var podfile = File.ReadAllText(podfilePath);
-            podfile +=
-                $"target '{WidgetExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '>= 5.0.2', '< 6.0.0'\nend\n";
+            var podfileRegex = new Regex(
+                $@"target '{WidgetExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '(.+)'\nend\n"
+            );
+
+            if (!podfileRegex.IsMatch(podfile))
+                podfile += requiredTarget;
+            else
+            {
+                var podfileTarget = podfileRegex.Match(podfile).ToString();
+                podfile = podfile.Replace(podfileTarget, requiredTarget);
+            }
+
             File.WriteAllText(podfilePath, podfile);
         }
 
+        static string ResolveOneSignalXCFrameworkVersion()
+        {
+            var dependenciesFilePath = Path.Combine(
+                "Packages",
+                "com.onesignal.unity.ios",
+                "Editor",
+                "OneSignaliOSDependencies.xml"
+            );
+
+            if (!File.Exists(dependenciesFilePath))
+            {
+                Debug.LogWarning(
+                    $"Could not find {dependenciesFilePath}; falling back to default OneSignalXCFramework version range."
+                );
+                return null;
+            }
+
+            var dependenciesFile = File.ReadAllText(dependenciesFilePath);
+            var dependenciesRegex = new Regex(
+                "(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)"
+            );
+
+            if (!dependenciesRegex.IsMatch(dependenciesFile))
+            {
+                Debug.LogWarning(
+                    $"Could not read OneSignalXCFramework version from {dependenciesFilePath}; falling back to default version range."
+                );
+                return null;
+            }
+
+            return dependenciesRegex.Match(dependenciesFile).ToString();
+        }
+
         static void CopyFileOrDirectory(string sourcePath, string destinationPath)
         {
             var file = new FileInfo(sourcePath);

From 5f0312e9c4627f1490527482f05b543d29eb597b Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Tue, 12 May 2026 23:27:32 -0700
Subject: [PATCH 39/54] fix(demo): register SDK listeners before config

---
 examples/demo/Assets/Scripts/AppBootstrapper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index ae696be3..a8f2a8a1 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -57,11 +57,11 @@ private async void Start()
             );
 #endif
 
+            RegisterSdkListeners();
+
             OneSignal.InAppMessages.Paused = _prefs.IamPaused;
             OneSignal.Location.IsShared = _prefs.LocationShared;
 
-            RegisterSdkListeners();
-
             _viewModel.Init(_prefs, _apiService);
             _viewModel.LoadInitialState();
             await _viewModel.LoadInitialDataAsync();

From 92709232ba09951c0a6e1b511718d8456089d9c2 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 13 May 2026 11:13:29 -0700
Subject: [PATCH 40/54] refactor(demo): remove E2E tap fallback machinery

---
 .../Scripts/Services/AccessibilityBridge.cs   | 165 +++---------------
 .../UI/Sections/TriggersSectionController.cs  | 125 +------------
 2 files changed, 24 insertions(+), 266 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index bfe098d4..1bc3dabe 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -27,8 +27,6 @@ public class AccessibilityBridge : MonoBehaviour
         private const float FrameRefreshIntervalSeconds = 0.05f;
         private const float TapMarkerSize = 28f;
         private const int MaxTapMarkers = 40;
-        private const float E2ETapMoveTolerance = 12f;
-        private const int E2ETapDelayMs = 120;
         private const float ScrollOffsetEpsilon = 0.5f;
         private const double ScrollSettleLayoutChangeDelayMs = 150.0;
         // Backstop structural poll. The hot path is DetachFromPanelEvent
@@ -59,18 +57,9 @@ public class AccessibilityBridge : MonoBehaviour
         private Vector2 _lastScrollOffset;
         private double _lastScrollChangeMs = -1.0;
         private bool _scrollLayoutChangePending;
-        private bool _pendingE2ETap;
-        private int _pendingE2ETapPointerId;
-        private float _pendingE2ETapMoveTolerance;
-        private Vector2 _pendingE2ETapStart;
-        private VisualElement _pendingE2ETapTarget;
-        private Action _pendingE2ETapAction;
         private readonly EventCallback<GeometryChangedEvent> _onGeometryChanged;
         private readonly EventCallback<DetachFromPanelEvent> _onDetachFromPanel;
-        private readonly EventCallback<PointerDownEvent> _onNamedTapPointerDown;
-        private readonly EventCallback<PointerUpEvent> _onNamedTapPointerUp;
-        private readonly EventCallback<PointerMoveEvent> _onE2ETapPointerMove;
-        private readonly EventCallback<PointerCancelEvent> _onE2ETapPointerCancel;
+        private readonly EventCallback<PointerDownEvent> _onTapMarkerPointerDown;
         // Set true after the one-shot ScrollView taming hooks (WheelEvent
         // block + clamp settings) are installed; BuildHierarchy can fire many
         // times per session and we only want one subscription.
@@ -93,10 +82,7 @@ public AccessibilityBridge()
         {
             _onGeometryChanged = _ => ScheduleFrameRefresh();
             _onDetachFromPanel = _ => ScheduleResync();
-            _onNamedTapPointerDown = OnNamedTapPointerDown;
-            _onNamedTapPointerUp = OnNamedTapPointerUp;
-            _onE2ETapPointerMove = OnE2ETapPointerMove;
-            _onE2ETapPointerCancel = _ => ClearPendingE2ETap();
+            _onTapMarkerPointerDown = e => AddTapMarker(new Vector2(e.position.x, e.position.y));
         }
 
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
@@ -139,34 +125,26 @@ public static void EnableForE2E(VisualElement root)
 #endif
         }
 
+        /// <summary>
+        /// Registers a named element as a tap target so Android's native
+        /// accessibility action path (HandleAndroidAccessibilityAction →
+        /// InvokeRegisteredTap) can invoke it by element name, and so the
+        /// element is reported as role=button to UiAutomator2. iOS routes
+        /// taps through UI Toolkit's normal Clickable manipulator and does
+        /// not consult this registry — no root-level position fallback is
+        /// installed there (it leaked through modal dialog overlays).
+        /// </summary>
         public static void RegisterE2ETapFallback(
             VisualElement target,
             Func<bool> isEnabled,
             Action action
-        ) => RegisterE2ETapFallback(target, isEnabled, action, E2ETapMoveTolerance);
-
-        public static void RegisterE2ETapFallback(
-            VisualElement target,
-            Func<bool> isEnabled,
-            Action action,
-            float moveTolerance
         )
         {
             if (target == null || action == null)
                 return;
 
             E2ETapTargets.RemoveAll(t => t.Target == target);
-            target.UnregisterCallback<ClickEvent>(OnRegisteredTargetClick);
-            target.RegisterCallback<ClickEvent>(OnRegisteredTargetClick);
-            E2ETapTargets.Add(
-                new E2ETapTarget(target, isEnabled ?? (() => true), action, moveTolerance)
-            );
-        }
-
-        private static void OnRegisteredTargetClick(ClickEvent e)
-        {
-            if (e.currentTarget is VisualElement target)
-                _instance?.CancelPendingE2ETap(target);
+            E2ETapTargets.Add(new E2ETapTarget(target, isEnabled ?? (() => true), action));
         }
 
         public static void RequestResync()
@@ -211,10 +189,7 @@ private void UnregisterTreeCallbacks()
             if (_root != null)
             {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
-                _root.UnregisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
-                _root.UnregisterCallback(_onNamedTapPointerUp, TrickleDown.TrickleDown);
-                _root.UnregisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
-                _root.UnregisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
+                _root.UnregisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
             }
             foreach (var el in _map.Keys)
                 el.UnregisterCallback(_onDetachFromPanel);
@@ -406,10 +381,11 @@ private void BuildHierarchy()
             // a tap fired immediately after a scroll sees fresh frames
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
-            _root.RegisterCallback(_onNamedTapPointerDown, TrickleDown.TrickleDown);
-            _root.RegisterCallback(_onNamedTapPointerUp, TrickleDown.TrickleDown);
-            _root.RegisterCallback(_onE2ETapPointerMove, TrickleDown.TrickleDown);
-            _root.RegisterCallback(_onE2ETapPointerCancel, TrickleDown.TrickleDown);
+            // Debug-only: drop a visual marker at every tap location so the
+            // demo overlay matches XCUITest's reported coordinates. Does not
+            // dispatch any action; UI Toolkit's hit-test handles the real
+            // tap routing.
+            _root.RegisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
 
             // One-shot ScrollView taming: BuildHierarchy can run dozens of
             // times per session (every dialog open/close, every section
@@ -475,100 +451,6 @@ private void BuildHierarchy()
             SyncAndroidNativeAccessibility();
         }
 
-        private void OnNamedTapPointerDown(PointerDownEvent e)
-        {
-            var position = new Vector2(e.position.x, e.position.y);
-            AddTapMarker(position);
-
-            if (!TryGetE2ETapTarget(position, out var target))
-                return;
-
-            if (target.MoveTolerance < 0f)
-            {
-                target.Action();
-                return;
-            }
-
-            _pendingE2ETap = true;
-            _pendingE2ETapPointerId = e.pointerId;
-            _pendingE2ETapMoveTolerance = target.MoveTolerance;
-            _pendingE2ETapStart = position;
-            _pendingE2ETapTarget = target.Target;
-            _pendingE2ETapAction = target.Action;
-            _root.schedule.Execute(() =>
-            {
-                if (!_pendingE2ETap)
-                    return;
-                _pendingE2ETap = false;
-                var action = _pendingE2ETapAction;
-                _pendingE2ETapAction = null;
-                _pendingE2ETapTarget = null;
-                action?.Invoke();
-            }).StartingIn(E2ETapDelayMs);
-        }
-
-        private void OnNamedTapPointerUp(PointerUpEvent e)
-        {
-            if (_pendingE2ETap)
-                return;
-
-            var eventTarget = e.target as VisualElement;
-            if (eventTarget == null || !TryGetE2ETapTarget(eventTarget, out var target))
-                return;
-
-            target.Action();
-        }
-
-        private void OnE2ETapPointerMove(PointerMoveEvent e)
-        {
-            if (!_pendingE2ETap || _pendingE2ETapPointerId != e.pointerId)
-                return;
-
-            var position = new Vector2(e.position.x, e.position.y);
-            if (Vector2.Distance(position, _pendingE2ETapStart) > _pendingE2ETapMoveTolerance)
-                ClearPendingE2ETap();
-        }
-
-        private void CancelPendingE2ETap(VisualElement target)
-        {
-            if (!_pendingE2ETap || _pendingE2ETapTarget != target)
-                return;
-
-            ClearPendingE2ETap();
-        }
-
-        private void ClearPendingE2ETap()
-        {
-            _pendingE2ETap = false;
-            _pendingE2ETapAction = null;
-            _pendingE2ETapTarget = null;
-        }
-
-        private static bool TryGetE2ETapTarget(Vector2 position, out E2ETapTarget matchedTarget)
-        {
-            matchedTarget = null;
-            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
-            {
-                var target = E2ETapTargets[i];
-                if (target.Target == null)
-                {
-                    E2ETapTargets.RemoveAt(i);
-                    continue;
-                }
-
-                if (target.Target.panel == null)
-                    continue;
-
-                if (!target.IsEnabled() || !target.Target.worldBound.Contains(position))
-                    continue;
-
-                matchedTarget = target;
-                return true;
-            }
-
-            return false;
-        }
-
         private static bool TryGetE2ETapTarget(VisualElement el, out E2ETapTarget matchedTarget)
         {
             matchedTarget = null;
@@ -1110,19 +992,12 @@ private sealed class E2ETapTarget
             public readonly VisualElement Target;
             public readonly Func<bool> IsEnabled;
             public readonly Action Action;
-            public readonly float MoveTolerance;
-
-            public E2ETapTarget(
-                VisualElement target,
-                Func<bool> isEnabled,
-                Action action,
-                float moveTolerance
-            )
+
+            public E2ETapTarget(VisualElement target, Func<bool> isEnabled, Action action)
             {
                 Target = target;
                 IsEnabled = isEnabled;
                 Action = action;
-                MoveTolerance = moveTolerance;
             }
         }
     }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index a33f4a23..9930acde 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -14,14 +14,6 @@ public class TriggersSectionController
         private VisualElement _listContainer;
         private Button _removeSelectedButton;
         private Button _clearAllButton;
-        private double _lastAddTapMs = -1.0;
-        private double _lastAddMultipleTapMs = -1.0;
-        private double _lastRemoveSelectedTapMs = -1.0;
-        private double _lastClearAllTapMs = -1.0;
-        private const float E2ETapMoveTolerance = 12f;
-        private const float EmptyCardTapMoveTolerance = -1f;
-        private const int E2ETapDelayMs = 120;
-        private const double E2ETapDedupeMs = 500.0;
 
         public Action OnInfoTap;
         public Action OnAddTap;
@@ -50,17 +42,6 @@ private VisualElement BuildSection()
                 card.style.paddingTop = 6;
                 card.style.paddingBottom = 6;
                 card.style.marginBottom = 4;
-                RegisterDelayedTapFallback(
-                    card,
-                    () => _viewModel.Triggers.Count == 0,
-                    InvokeAddMultiple
-                );
-                AccessibilityBridge.RegisterE2ETapFallback(
-                    card,
-                    () => _viewModel.Triggers.Count == 0,
-                    InvokeAddMultiple,
-                    EmptyCardTapMoveTolerance
-                );
             }
             _listContainer = new VisualElement();
             _listContainer.name = "triggers_list";
@@ -76,8 +57,6 @@ private VisualElement BuildSection()
             {
                 addButton.style.minHeight = 40;
                 addButton.style.marginBottom = 4;
-                RegisterDelayedTapFallback(addButton, () => true, InvokeAdd);
-                AccessibilityBridge.RegisterE2ETapFallback(addButton, () => true, InvokeAdd);
             }
             section.Add(addButton);
             var addMultipleButton = SectionBuilder.CreatePrimaryButton(
@@ -89,12 +68,6 @@ private VisualElement BuildSection()
             {
                 addMultipleButton.style.minHeight = 40;
                 addMultipleButton.style.marginBottom = 4;
-                RegisterDelayedTapFallback(addMultipleButton, () => true, InvokeAddMultiple);
-                AccessibilityBridge.RegisterE2ETapFallback(
-                    addMultipleButton,
-                    () => true,
-                    InvokeAddMultiple
-                );
             }
             section.Add(addMultipleButton);
 
@@ -103,15 +76,6 @@ private VisualElement BuildSection()
                 "remove_triggers_button",
                 InvokeRemoveSelected
             );
-            if (AppViewModel.IsE2EMode)
-            {
-                RegisterDelayedTapFallback(_removeSelectedButton, () => true, InvokeRemoveSelected);
-                AccessibilityBridge.RegisterE2ETapFallback(
-                    _removeSelectedButton,
-                    () => true,
-                    InvokeRemoveSelected
-                );
-            }
             section.Add(_removeSelectedButton);
 
             _clearAllButton = SectionBuilder.CreateDestructiveButton(
@@ -119,100 +83,19 @@ private VisualElement BuildSection()
                 "clear_triggers_button",
                 InvokeClearAll
             );
-            if (AppViewModel.IsE2EMode)
-            {
-                RegisterDelayedTapFallback(_clearAllButton, () => true, InvokeClearAll);
-                AccessibilityBridge.RegisterE2ETapFallback(
-                    _clearAllButton,
-                    () => true,
-                    InvokeClearAll
-                );
-            }
             section.Add(_clearAllButton);
 
             RefreshList();
             return section;
         }
 
-        private void RegisterDelayedTapFallback(
-            VisualElement element,
-            Func<bool> isEnabled,
-            Action action
-        )
-        {
-            bool pending = false;
-            int pointerId = 0;
-            Vector2 startPosition = default;
+        private void InvokeAddMultiple() => OnAddMultipleTap?.Invoke();
 
-            element.RegisterCallback<PointerDownEvent>(e =>
-            {
-                if (!isEnabled())
-                    return;
-
-                pending = true;
-                pointerId = e.pointerId;
-                startPosition = new Vector2(e.position.x, e.position.y);
-                element.schedule.Execute(() =>
-                {
-                    if (!pending || !isEnabled())
-                        return;
-                    pending = false;
-                    action();
-                }).StartingIn(E2ETapDelayMs);
-            });
-
-            element.RegisterCallback<PointerMoveEvent>(e =>
-            {
-                if (!pending || pointerId != e.pointerId)
-                    return;
+        private void InvokeAdd() => OnAddTap?.Invoke();
 
-                var position = new Vector2(e.position.x, e.position.y);
-                if (Vector2.Distance(position, startPosition) > E2ETapMoveTolerance)
-                    pending = false;
-            });
+        private void InvokeRemoveSelected() => OnRemoveSelectedTap?.Invoke();
 
-            element.RegisterCallback<PointerCancelEvent>(_ => pending = false);
-        }
-
-        private void InvokeAddMultiple()
-        {
-            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
-            if (_lastAddMultipleTapMs >= 0.0 && now - _lastAddMultipleTapMs < E2ETapDedupeMs)
-                return;
-
-            _lastAddMultipleTapMs = now;
-            OnAddMultipleTap?.Invoke();
-        }
-
-        private void InvokeAdd()
-        {
-            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
-            if (_lastAddTapMs >= 0.0 && now - _lastAddTapMs < E2ETapDedupeMs)
-                return;
-
-            _lastAddTapMs = now;
-            OnAddTap?.Invoke();
-        }
-
-        private void InvokeRemoveSelected()
-        {
-            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
-            if (_lastRemoveSelectedTapMs >= 0.0 && now - _lastRemoveSelectedTapMs < E2ETapDedupeMs)
-                return;
-
-            _lastRemoveSelectedTapMs = now;
-            OnRemoveSelectedTap?.Invoke();
-        }
-
-        private void InvokeClearAll()
-        {
-            double now = Time.realtimeSinceStartupAsDouble * 1000.0;
-            if (_lastClearAllTapMs >= 0.0 && now - _lastClearAllTapMs < E2ETapDedupeMs)
-                return;
-
-            _lastClearAllTapMs = now;
-            _viewModel.ClearAllTriggers();
-        }
+        private void InvokeClearAll() => _viewModel.ClearAllTriggers();
 
         public void Refresh() => RefreshList();
 

From 71f3fc4ef996fa45f2dbd72a7740a16376300779 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 13 May 2026 11:38:57 -0700
Subject: [PATCH 41/54] refactor(demo): rename E2E tap registry to
 AndroidClickTarget

---
 .../Scripts/Services/AccessibilityBridge.cs   | 92 +++++++------------
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   |  4 +-
 .../UI/Dialogs/MultiPairInputDialog.cs        |  2 +-
 .../UI/Dialogs/MultiSelectRemoveDialog.cs     |  4 +-
 .../Scripts/UI/Sections/SectionBuilder.cs     | 10 +-
 .../UI/Sections/SendIamSectionController.cs   |  2 +-
 6 files changed, 44 insertions(+), 70 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 1bc3dabe..5beb5413 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -38,8 +38,15 @@ public class AccessibilityBridge : MonoBehaviour
         private const string GameObjectName = "OneSignalAccessibilityBridge";
 
         private static AccessibilityBridge _instance;
-        private static readonly List<E2ETapTarget> E2ETapTargets = new();
 #if UNITY_ANDROID && !UNITY_EDITOR
+        // Named-element click registry. UiAutomator2 only sees a flat
+        // accessibility tree, so a "click" arriving from the OS for element
+        // foo_button must be routed to the C# Action that the foo button's
+        // builder wired up. The dict is keyed by element instance and grows
+        // for the life of the app; named-element churn is bounded by the
+        // number of distinct UI builders, not test iterations.
+        private static readonly Dictionary<VisualElement, AndroidClickTarget> AndroidClickTargets
+            = new();
         private static AndroidJavaClass _androidAccessibilityBridge;
         private static bool _androidSyncErrorLogged;
 #endif
@@ -126,25 +133,26 @@ public static void EnableForE2E(VisualElement root)
         }
 
         /// <summary>
-        /// Registers a named element as a tap target so Android's native
-        /// accessibility action path (HandleAndroidAccessibilityAction →
-        /// InvokeRegisteredTap) can invoke it by element name, and so the
-        /// element is reported as role=button to UiAutomator2. iOS routes
-        /// taps through UI Toolkit's normal Clickable manipulator and does
-        /// not consult this registry — no root-level position fallback is
-        /// installed there (it leaked through modal dialog overlays).
+        /// Registers a named element as a click target for Android UiAutomator2.
+        /// The element is reported as role=button to the platform a11y service
+        /// and `HandleAndroidAccessibilityAction("click")` dispatches by name
+        /// to <paramref name="action"/>. No-op on iOS: XCUITest taps route
+        /// through UI Toolkit's normal Clickable manipulator.
         /// </summary>
-        public static void RegisterE2ETapFallback(
+        public static void RegisterE2ETapTarget(
             VisualElement target,
             Func<bool> isEnabled,
             Action action
         )
         {
+#if UNITY_ANDROID && !UNITY_EDITOR
             if (target == null || action == null)
                 return;
-
-            E2ETapTargets.RemoveAll(t => t.Target == target);
-            E2ETapTargets.Add(new E2ETapTarget(target, isEnabled ?? (() => true), action));
+            AndroidClickTargets[target] = new AndroidClickTarget(
+                isEnabled ?? (() => true),
+                action
+            );
+#endif
         }
 
         public static void RequestResync()
@@ -451,28 +459,6 @@ private void BuildHierarchy()
             SyncAndroidNativeAccessibility();
         }
 
-        private static bool TryGetE2ETapTarget(VisualElement el, out E2ETapTarget matchedTarget)
-        {
-            matchedTarget = null;
-            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
-            {
-                var target = E2ETapTargets[i];
-                if (target.Target == null)
-                {
-                    E2ETapTargets.RemoveAt(i);
-                    continue;
-                }
-
-                if (target.Target != el || !target.IsEnabled())
-                    continue;
-
-                matchedTarget = target;
-                return true;
-            }
-
-            return false;
-        }
-
         public void HandleAndroidAccessibilityAction(string payload)
         {
 #if UNITY_ANDROID && !UNITY_EDITOR
@@ -583,7 +569,14 @@ private void InvokeAndroidNativeAction(string id)
                 return;
             }
 
-            InvokeRegisteredTap(id);
+            foreach (var kvp in AndroidClickTargets)
+            {
+                var el = kvp.Key;
+                if (el == null || el.name != id || !kvp.Value.IsEnabled())
+                    continue;
+                kvp.Value.Action();
+                return;
+            }
         }
 
         private void InvokeAndroidNativeScroll(string direction)
@@ -607,28 +600,9 @@ private void InvokeAndroidNativeScroll(string direction)
             SyncAndroidNativeAccessibility();
         }
 
-        private static void InvokeRegisteredTap(string id)
-        {
-            for (int i = E2ETapTargets.Count - 1; i >= 0; i--)
-            {
-                var target = E2ETapTargets[i];
-                if (target.Target == null)
-                {
-                    E2ETapTargets.RemoveAt(i);
-                    continue;
-                }
-
-                if (target.Target.name != id || !target.IsEnabled())
-                    continue;
-
-                target.Action();
-                return;
-            }
-        }
-
         private static string AndroidNativeRole(VisualElement el)
         {
-            if (TryGetE2ETapTarget(el, out _))
+            if (AndroidClickTargets.ContainsKey(el))
                 return "button";
 
             return el switch
@@ -987,19 +961,19 @@ private Rect GetScreenRect(VisualElement el)
             return new Rect(wb.x * s, wb.y * s, wb.width * s, wb.height * s);
         }
 
-        private sealed class E2ETapTarget
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private sealed class AndroidClickTarget
         {
-            public readonly VisualElement Target;
             public readonly Func<bool> IsEnabled;
             public readonly Action Action;
 
-            public E2ETapTarget(VisualElement target, Func<bool> isEnabled, Action action)
+            public AndroidClickTarget(Func<bool> isEnabled, Action action)
             {
-                Target = target;
                 IsEnabled = isEnabled;
                 Action = action;
             }
         }
+#endif
     }
 }
 #endif
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index 64a82681..89762d9f 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -137,7 +137,7 @@ protected Button CreateConfirmButton(string text, Action onClick)
             btn.text = text;
             btn.AddToClassList("dialog-confirm-button");
             btn.AddToClassList("text-dialog-action");
-            AccessibilityBridge.RegisterE2ETapFallback(
+            AccessibilityBridge.RegisterE2ETapTarget(
                 btn,
                 () => btn.enabledInHierarchy,
                 onClick
@@ -151,7 +151,7 @@ protected Button CreateCancelButton(string text = "Cancel")
             btn.text = text;
             btn.AddToClassList("dialog-cancel-button");
             btn.AddToClassList("text-dialog-action");
-            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, Dismiss);
+            AccessibilityBridge.RegisterE2ETapTarget(btn, () => btn.enabledInHierarchy, Dismiss);
             return btn;
         }
     }
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index 972396f8..604726a4 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -51,7 +51,7 @@ protected override void BuildContent(VisualElement container)
             var addRowButton = new Button(InvokeAddRow);
             addRowButton.name = "multipair_add_row_button";
             addRowButton.AddToClassList("dialog-add-row-button");
-            AccessibilityBridge.RegisterE2ETapFallback(
+            AccessibilityBridge.RegisterE2ETapTarget(
                 addRowButton,
                 () => addRowButton.enabledInHierarchy,
                 InvokeAddRow
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
index 956c0888..c6a91177 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiSelectRemoveDialog.cs
@@ -57,12 +57,12 @@ protected override void BuildContent(VisualElement container)
                 row.Add(label);
 
                 _toggles[item.Key] = toggle;
-                AccessibilityBridge.RegisterE2ETapFallback(
+                AccessibilityBridge.RegisterE2ETapTarget(
                     row,
                     () => toggle.enabledInHierarchy,
                     () => ToggleSelection(item.Key, toggle)
                 );
-                AccessibilityBridge.RegisterE2ETapFallback(
+                AccessibilityBridge.RegisterE2ETapTarget(
                     toggle,
                     () => toggle.enabledInHierarchy,
                     () => ToggleSelection(item.Key, toggle)
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index b6fb3986..9524497a 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -46,7 +46,7 @@ public static VisualElement CreateSection(
                 infoBtn.AddToClassList("info-button");
                 infoBtn.pickingMode = PickingMode.Position;
                 InfoTapByName[infoBtn.name] = onInfoTap;
-                AccessibilityBridge.RegisterE2ETapFallback(
+                AccessibilityBridge.RegisterE2ETapTarget(
                     infoBtn,
                     () => infoBtn.panel?.visualTree.Q("tooltip_title") == null,
                     onInfoTap
@@ -111,7 +111,7 @@ public static Button CreatePrimaryButton(string text, string name, Action onClic
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("primary-button");
-            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, onClick);
+            AccessibilityBridge.RegisterE2ETapTarget(btn, () => btn.enabledInHierarchy, onClick);
             return btn;
         }
 
@@ -121,7 +121,7 @@ public static Button CreateDestructiveButton(string text, string name, Action on
             btn.name = name;
             btn.text = text;
             btn.AddToClassList("destructive-button");
-            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, onClick);
+            AccessibilityBridge.RegisterE2ETapTarget(btn, () => btn.enabledInHierarchy, onClick);
             return btn;
         }
 
@@ -171,7 +171,7 @@ public static VisualElement CreateKeyValueItem(
                     deleteBtn.name = $"{sectionKey}_remove_{itemKey}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
-            AccessibilityBridge.RegisterE2ETapFallback(deleteBtn, () => true, onDelete);
+            AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 
@@ -227,7 +227,7 @@ public static VisualElement CreateSingleItem(
                     deleteBtn.name = $"{sectionKey}_remove_{value}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
-            AccessibilityBridge.RegisterE2ETapFallback(deleteBtn, () => true, onDelete);
+            AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
index a2487b80..a87d02ed 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SendIamSectionController.cs
@@ -77,7 +77,7 @@ InAppMessageType type
             var btn = new Button(SendIam);
             btn.name = name;
             btn.AddToClassList("iam-button");
-            AccessibilityBridge.RegisterE2ETapFallback(btn, () => btn.enabledInHierarchy, SendIam);
+            AccessibilityBridge.RegisterE2ETapTarget(btn, () => btn.enabledInHierarchy, SendIam);
 
             var iconLabel = new Label(icon);
             iconLabel.AddToClassList("iam-button-icon");

From d163e1340831e2431c14b9e9b0ea8c5b01393ce4 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 13 May 2026 11:51:06 -0700
Subject: [PATCH 42/54] fix(demo): set simulator arch to arm64 for Apple
 Silicon

---
 examples/demo/Assets/Scripts/Editor/BuildScript.cs  | 6 +++++-
 examples/demo/ProjectSettings/ProjectSettings.asset | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Editor/BuildScript.cs b/examples/demo/Assets/Scripts/Editor/BuildScript.cs
index 9a17cd27..623a932e 100644
--- a/examples/demo/Assets/Scripts/Editor/BuildScript.cs
+++ b/examples/demo/Assets/Scripts/Editor/BuildScript.cs
@@ -77,9 +77,13 @@ public static void BuildiOSSimulator()
 
         PlayerSettings.SetScriptingBackend(NamedBuildTarget.iOS, ScriptingImplementation.IL2CPP);
         PlayerSettings.iOS.sdkVersion = iOSSdkVersion.SimulatorSDK;
+        // run-local.sh forces ARCHS=arm64 on Apple Silicon hosts. Match that
+        // here so Unity emits an arm64-slice baselib instead of the project
+        // default (x86_64), which fails to link in xcodebuild.
+        PlayerSettings.iOS.simulatorSdkArchitecture = AppleMobileArchitectureSimulator.Universal;
 
         Debug.Log(
-            $"[BuildScript] iOS sdk={PlayerSettings.iOS.sdkVersion} backend={PlayerSettings.GetScriptingBackend(NamedBuildTarget.iOS)}"
+            $"[BuildScript] iOS sdk={PlayerSettings.iOS.sdkVersion} simArch={PlayerSettings.iOS.simulatorSdkArchitecture} backend={PlayerSettings.GetScriptingBackend(NamedBuildTarget.iOS)}"
         );
 
         PlayerSettings.SetIl2CppCodeGeneration(
diff --git a/examples/demo/ProjectSettings/ProjectSettings.asset b/examples/demo/ProjectSettings/ProjectSettings.asset
index 1ed28f04..f6f59307 100644
--- a/examples/demo/ProjectSettings/ProjectSettings.asset
+++ b/examples/demo/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   strictShaderVariantMatching: 0
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 989
-  iOSSimulatorArchitecture: 0
+  iOSSimulatorArchitecture: 2
   iOSTargetOSVersionString: 15.0
   tvOSSdkVersion: 0
   tvOSSimulatorArchitecture: 0

From e16974f318ee82b8325c9081268d56778834d8e5 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Wed, 13 May 2026 11:51:10 -0700
Subject: [PATCH 43/54] refactor(demo): replace root PointerDown with
 ClickEvent

---
 .../Assets/Scripts/UI/Dialogs/DialogBase.cs   | 29 -------------------
 .../Scripts/UI/Sections/SectionBuilder.cs     | 26 +++++++----------
 2 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
index 89762d9f..17d05433 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/DialogBase.cs
@@ -7,34 +7,6 @@ namespace OneSignalDemo.UI.Dialogs
 {
     public abstract class DialogBase
     {
-        // Hooks a panel-root PointerDown handler that dispatches taps on
-        // section info icons (elements named "*_info_icon") through a
-        // name->Action lookup registered by SectionBuilder. UIToolkit's
-        // normal AtTarget dispatch was observed to drop PointerDown on the
-        // info Label after iOS Appium injected a mobile:scroll gesture in
-        // the same test (the panel root sees the event with the correct
-        // target, but the target's own callback never fires). Dispatching
-        // from the panel root sidesteps whatever state breaks normal
-        // dispatch and keeps E2E taps reliable.
-        private static bool _infoFallbackHooked;
-
-        private static void HookInfoIconFallback(VisualElement parent)
-        {
-            if (_infoFallbackHooked) return;
-            var root = parent?.panel?.visualTree;
-            if (root == null) return;
-            _infoFallbackHooked = true;
-            root.RegisterCallback<PointerDownEvent>(e =>
-            {
-                var t = e.target as VisualElement;
-                if (t?.name == null || !t.name.EndsWith("_info_icon")) return;
-                if (!OneSignalDemo.UI.Sections.SectionBuilder.InfoTapByName
-                    .TryGetValue(t.name, out var action) || action == null) return;
-                action();
-                e.StopPropagation();
-            }, TrickleDown.TrickleDown);
-        }
-
 #if UNITY_IOS && !UNITY_EDITOR
         // Native bridge in Assets/Plugins/iOS/OneSignalDemoKeyboard.mm.
         // Calls [keyWindow endEditing:YES] to dismiss the iOS keyboard view
@@ -56,7 +28,6 @@ public void Show(VisualElement parent)
                 return;
 
             _parent = parent;
-            HookInfoIconFallback(parent);
 
             Overlay = new VisualElement();
             Overlay.AddToClassList("dialog-overlay");
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 9524497a..124208ea 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using OneSignalDemo.Services;
 using OneSignalDemo.UI;
 using UnityEngine.UIElements;
@@ -8,15 +7,6 @@ namespace OneSignalDemo.UI.Sections
 {
     public static class SectionBuilder
     {
-        // Maps info-icon element name (e.g. "send_push_info_icon") to its
-        // onInfoTap action. DialogBase reads this from a panel-root
-        // PointerDown handler to dispatch info-icon taps. UIToolkit's normal
-        // AtTarget dispatch was observed to drop PointerDown on the Label
-        // after iOS Appium injected a mobile:scroll gesture in the same test,
-        // so a root-level dispatch path is used to keep E2E taps reliable.
-        public static readonly Dictionary<string, Action> InfoTapByName =
-            new Dictionary<string, Action>();
-
         public static VisualElement CreateSection(
             string title,
             string name,
@@ -37,15 +27,21 @@ public static VisualElement CreateSection(
 
             if (onInfoTap != null)
             {
-                // Plain Label (no Button/Clickable manipulator) so PointerDown
-                // dispatch is not affected by manipulator-level pointer
-                // capture. The actual tap handler is wired at the panel root
-                // via InfoTapByName; see DialogBase.HookInfoIconFallback.
                 var infoBtn = new Label(MaterialIcons.Info);
                 infoBtn.name = $"{SectionKeyFromName(name)}_info_icon";
                 infoBtn.AddToClassList("info-button");
                 infoBtn.pickingMode = PickingMode.Position;
-                InfoTapByName[infoBtn.name] = onInfoTap;
+                // Label has no Clickable manipulator, so wire onInfoTap to
+                // ClickEvent (UI Toolkit dispatches this once PointerDown +
+                // PointerUp land on the same element). Avoids the previous
+                // dance of a static panel-root PointerDown listener fed by
+                // a name lookup, which had a chicken-and-egg with first
+                // dialog open.
+                infoBtn.RegisterCallback<ClickEvent>(_ =>
+                {
+                    if (infoBtn.panel?.visualTree.Q("tooltip_title") == null)
+                        onInfoTap();
+                });
                 AccessibilityBridge.RegisterE2ETapTarget(
                     infoBtn,
                     () => infoBtn.panel?.visualTree.Q("tooltip_title") == null,

From d6cbdc5df239ac77cbbe65cc9c6aaa7d1d05a60e Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Thu, 14 May 2026 18:42:20 -0700
Subject: [PATCH 44/54] fix(demo): restore panel-root PointerDown for iOS info
 icons

---
 .../Scripts/Services/AccessibilityBridge.cs   | 100 +++++++++++++++++-
 .../Scripts/UI/Sections/SectionBuilder.cs     |  19 ++--
 2 files changed, 103 insertions(+), 16 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 5beb5413..8750a7dd 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -50,6 +50,20 @@ private static readonly Dictionary<VisualElement, AndroidClickTarget> AndroidCli
         private static AndroidJavaClass _androidAccessibilityBridge;
         private static bool _androidSyncErrorLogged;
 #endif
+#if UNITY_IOS && !UNITY_EDITOR
+        // iOS-only name-keyed dispatch table for "*_info_icon" Labels.
+        // Plain Label has no Clickable manipulator, so XCUITest taps reach
+        // the target via UI Toolkit's hit-test but no AtTarget callback runs.
+        // Worse, after iOS Appium injects a mobile:scroll before the tap,
+        // AtTarget dispatch on the Label is observed to drop entirely — the
+        // panel root sees the PointerDown with the correct target, but the
+        // target's own callback never fires. We bypass AtTarget by dispatching
+        // from a TrickleDown handler installed once on the panel root (see
+        // BuildHierarchy), keyed by element name so modal overlays can't
+        // bleed through.
+        private static readonly Dictionary<string, IosInfoTap> _iosInfoTapByName
+            = new();
+#endif
 
         private VisualElement _root;
         private AccessibilityHierarchy _hierarchy;
@@ -71,6 +85,9 @@ private static readonly Dictionary<VisualElement, AndroidClickTarget> AndroidCli
         // block + clamp settings) are installed; BuildHierarchy can fire many
         // times per session and we only want one subscription.
         private bool _scrollViewHooksInstalled;
+#if UNITY_IOS && !UNITY_EDITOR
+        private readonly EventCallback<PointerDownEvent> _onIosInfoIconPointerDown;
+#endif
         // E2E only: cached ScrollView ref + stale-capture watchdog. A self-
         // destroying child (e.g. triggers_remove) can leave ScrollView's
         // pending-capture latch set because the matching PointerUp is dropped
@@ -90,8 +107,27 @@ public AccessibilityBridge()
             _onGeometryChanged = _ => ScheduleFrameRefresh();
             _onDetachFromPanel = _ => ScheduleResync();
             _onTapMarkerPointerDown = e => AddTapMarker(new Vector2(e.position.x, e.position.y));
+#if UNITY_IOS && !UNITY_EDITOR
+            _onIosInfoIconPointerDown = OnIosInfoIconPointerDown;
+#endif
         }
 
+#if UNITY_IOS && !UNITY_EDITOR
+        private static void OnIosInfoIconPointerDown(PointerDownEvent e)
+        {
+            if (!(e.target is VisualElement t)
+                || string.IsNullOrEmpty(t.name)
+                || !t.name.EndsWith("_info_icon"))
+                return;
+            if (!_iosInfoTapByName.TryGetValue(t.name, out var entry))
+                return;
+            if (!entry.IsEnabled())
+                return;
+            entry.Action();
+            e.StopPropagation();
+        }
+#endif
+
         // Empirically, Unity's iOS accessibility plugin treats the Rect we
         // hand to AccessibilityNode.frameGetter as if it were already in
         // physical screen pixels, then divides by the device scale to get
@@ -133,11 +169,12 @@ public static void EnableForE2E(VisualElement root)
         }
 
         /// <summary>
-        /// Registers a named element as a click target for Android UiAutomator2.
-        /// The element is reported as role=button to the platform a11y service
-        /// and `HandleAndroidAccessibilityAction("click")` dispatches by name
-        /// to <paramref name="action"/>. No-op on iOS: XCUITest taps route
-        /// through UI Toolkit's normal Clickable manipulator.
+        /// Registers a named element as a click target. On Android, reports
+        /// the element as role=button to UiAutomator2 and routes incoming
+        /// "click" actions by name. On iOS, only "*_info_icon" Labels need
+        /// special handling — they have no Clickable manipulator, so their
+        /// action is dispatched via the bridge's panel-root PointerDown
+        /// handler. All other iOS taps ride UI Toolkit's standard Clickable.
         /// </summary>
         public static void RegisterE2ETapTarget(
             VisualElement target,
@@ -152,6 +189,15 @@ Action action
                 isEnabled ?? (() => true),
                 action
             );
+#elif UNITY_IOS && !UNITY_EDITOR
+            if (target == null || action == null || string.IsNullOrEmpty(target.name))
+                return;
+            if (!target.name.EndsWith("_info_icon"))
+                return;
+            _iosInfoTapByName[target.name] = new IosInfoTap(
+                isEnabled ?? (() => true),
+                action
+            );
 #endif
         }
 
@@ -198,6 +244,11 @@ private void UnregisterTreeCallbacks()
             {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
                 _root.UnregisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
+#if UNITY_IOS && !UNITY_EDITOR
+                var visualTree = _root.panel?.visualTree;
+                if (visualTree != null)
+                    visualTree.UnregisterCallback(_onIosInfoIconPointerDown, TrickleDown.TrickleDown);
+#endif
             }
             foreach (var el in _map.Keys)
                 el.UnregisterCallback(_onDetachFromPanel);
@@ -394,6 +445,18 @@ private void BuildHierarchy()
             // dispatch any action; UI Toolkit's hit-test handles the real
             // tap routing.
             _root.RegisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
+#if UNITY_IOS && !UNITY_EDITOR
+            // Register on the panel's visualTree (the absolute topmost
+            // dispatch point), not _root. Anything in TrickleDown above _root
+            // — including ScrollView's own pan-capture handlers — could
+            // StopPropagation before the event reaches a descendant
+            // registration. AtTarget drops on the info Label (observed after
+            // iOS Appium injects mobile:scroll mid-test) would then take the
+            // tooltip tap with them. See _iosInfoTapByName field comment.
+            var visualTree = _root.panel?.visualTree;
+            if (visualTree != null)
+                visualTree.RegisterCallback(_onIosInfoIconPointerDown, TrickleDown.TrickleDown);
+#endif
 
             // One-shot ScrollView taming: BuildHierarchy can run dozens of
             // times per session (every dialog open/close, every section
@@ -631,6 +694,11 @@ private void RefreshScrollAccessibilityState()
                 _scrollLayoutChangePending = true;
                 RefreshNodeValuesAndActive();
                 _hierarchy.RefreshNodeFrames();
+                // See settle branch below for rationale. Also ping during the
+                // scroll so a getLocation that races with the gesture's tail
+                // sees fresh data — the settle ping fires 150ms after the
+                // last change, which can land after the test's refetch.
+                AssistiveSupport.notificationDispatcher?.SendScreenChanged();
                 return;
             }
 
@@ -643,6 +711,15 @@ private void RefreshScrollAccessibilityState()
 
             _scrollLayoutChangePending = false;
             _hierarchy.RefreshNodeFrames();
+            // RefreshNodeFrames updates Unity's a11y node positions, but WDA
+            // keeps a cached element-frame snapshot until the OS reports an
+            // a11y notification. Without this ping, scrollToEl's refetch
+            // reads pre-scroll coordinates and openModal's click() lands on
+            // the icon's old off-screen spot — the modal never opens. Firing
+            // only on settle (not on every intermediate scroll frame) keeps
+            // the notification rate sane and gives WDA one clean signal that
+            // frames are stable and re-readable.
+            AssistiveSupport.notificationDispatcher?.SendScreenChanged();
         }
 
         private void EnsureTapMarkerOverlay()
@@ -973,6 +1050,19 @@ public AndroidClickTarget(Func<bool> isEnabled, Action action)
                 Action = action;
             }
         }
+#endif
+#if UNITY_IOS && !UNITY_EDITOR
+        private sealed class IosInfoTap
+        {
+            public readonly Func<bool> IsEnabled;
+            public readonly Action Action;
+
+            public IosInfoTap(Func<bool> isEnabled, Action action)
+            {
+                IsEnabled = isEnabled;
+                Action = action;
+            }
+        }
 #endif
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 124208ea..6a7bf68c 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -27,21 +27,18 @@ public static VisualElement CreateSection(
 
             if (onInfoTap != null)
             {
+                // Plain Label (no Button/Clickable manipulator). On iOS, UI
+                // Toolkit's AtTarget dispatch on this Label is observed to
+                // drop the PointerDown whenever Appium injects a mobile:scroll
+                // just before the tap (every spec's `before` hook scrolls to
+                // its section first). The bridge installs a panel-root
+                // TrickleDown handler that dispatches by name — bypasses the
+                // dropped AtTarget. On Android, the same registration drives
+                // the UiAutomator2 click route.
                 var infoBtn = new Label(MaterialIcons.Info);
                 infoBtn.name = $"{SectionKeyFromName(name)}_info_icon";
                 infoBtn.AddToClassList("info-button");
                 infoBtn.pickingMode = PickingMode.Position;
-                // Label has no Clickable manipulator, so wire onInfoTap to
-                // ClickEvent (UI Toolkit dispatches this once PointerDown +
-                // PointerUp land on the same element). Avoids the previous
-                // dance of a static panel-root PointerDown listener fed by
-                // a name lookup, which had a chicken-and-egg with first
-                // dialog open.
-                infoBtn.RegisterCallback<ClickEvent>(_ =>
-                {
-                    if (infoBtn.panel?.visualTree.Q("tooltip_title") == null)
-                        onInfoTap();
-                });
                 AccessibilityBridge.RegisterE2ETapTarget(
                     infoBtn,
                     () => infoBtn.panel?.visualTree.Q("tooltip_title") == null,

From ec0d7df16e1de866baacf9b71004dd9d8a55ed94 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Thu, 14 May 2026 23:54:46 -0700
Subject: [PATCH 45/54] refactor(demo): disable tap-marker overlay

---
 .../Assets/Scripts/Services/AccessibilityBridge.cs  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 8750a7dd..9072e741 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -243,7 +243,8 @@ private void UnregisterTreeCallbacks()
             if (_root != null)
             {
                 _root.UnregisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
-                _root.UnregisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
+                // Disabled: purple tap-marker overlay (debug visual for E2E taps).
+                // _root.UnregisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
 #if UNITY_IOS && !UNITY_EDITOR
                 var visualTree = _root.panel?.visualTree;
                 if (visualTree != null)
@@ -423,7 +424,8 @@ private void BuildHierarchy()
             if (_root == null)
                 return;
 
-            EnsureTapMarkerOverlay();
+            // Disabled: purple tap-marker overlay (debug visual for E2E taps).
+            // EnsureTapMarkerOverlay();
             UnregisterTreeCallbacks();
 
             _hierarchy ??= new AccessibilityHierarchy();
@@ -440,11 +442,12 @@ private void BuildHierarchy()
             // a tap fired immediately after a scroll sees fresh frames
             // instead of a 50ms-stale snapshot.
             _root.RegisterCallback(_onGeometryChanged, TrickleDown.TrickleDown);
-            // Debug-only: drop a visual marker at every tap location so the
-            // demo overlay matches XCUITest's reported coordinates. Does not
+            // Disabled: purple tap-marker overlay (debug visual for E2E taps).
+            // Drops a circular marker at every tap location so the demo
+            // overlay matches XCUITest's reported coordinates. Does not
             // dispatch any action; UI Toolkit's hit-test handles the real
             // tap routing.
-            _root.RegisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
+            // _root.RegisterCallback(_onTapMarkerPointerDown, TrickleDown.TrickleDown);
 #if UNITY_IOS && !UNITY_EDITOR
             // Register on the panel's visualTree (the absolute topmost
             // dispatch point), not _root. Anything in TrickleDown above _root

From ef04560c532dc7163508b17959a2147aa9fc49bc Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 00:04:42 -0700
Subject: [PATCH 46/54] refactor(demo): remove ShowToast calls

---
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index be4240d9..8b18ddc7 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -183,7 +183,6 @@ public void AddAlias(string label, string id)
             OneSignal.User.AddAlias(label, id);
             MergePairs(_aliasesList, new Dictionary<string, string> { [label] = id });
             Debug.Log($"[{Tag}] Alias added: {label}");
-            ShowToast($"Alias added: {label}");
             NotifyStateChanged();
         }
 
@@ -192,7 +191,6 @@ public void AddAliases(Dictionary<string, string> aliases)
             OneSignal.User.AddAliases(aliases);
             MergePairs(_aliasesList, aliases);
             Debug.Log($"[{Tag}] {aliases.Count} alias(es) added");
-            ShowToast($"{aliases.Count} alias(es) added");
             NotifyStateChanged();
         }
 
@@ -201,7 +199,6 @@ public void AddEmail(string email)
             OneSignal.User.AddEmail(email);
             MergeUnique(_emailsList, new[] { email });
             Debug.Log($"[{Tag}] Email added: {email}");
-            ShowToast($"Email added: {email}");
             NotifyStateChanged();
         }
 
@@ -210,7 +207,6 @@ public void RemoveEmail(string email)
             OneSignal.User.RemoveEmail(email);
             _emailsList.Remove(email);
             Debug.Log($"[{Tag}] Email removed: {email}");
-            ShowToast($"Email removed: {email}");
             NotifyStateChanged();
         }
 
@@ -219,7 +215,6 @@ public void AddSms(string smsNumber)
             OneSignal.User.AddSms(smsNumber);
             MergeUnique(_smsNumbersList, new[] { smsNumber });
             Debug.Log($"[{Tag}] SMS added: {smsNumber}");
-            ShowToast($"SMS added: {smsNumber}");
             NotifyStateChanged();
         }
 
@@ -228,7 +223,6 @@ public void RemoveSms(string smsNumber)
             OneSignal.User.RemoveSms(smsNumber);
             _smsNumbersList.Remove(smsNumber);
             Debug.Log($"[{Tag}] SMS removed: {smsNumber}");
-            ShowToast($"SMS removed: {smsNumber}");
             NotifyStateChanged();
         }
 
@@ -237,7 +231,6 @@ public void AddTag(string key, string value)
             OneSignal.User.AddTag(key, value);
             MergePairs(_tagsList, new Dictionary<string, string> { [key] = value });
             Debug.Log($"[{Tag}] Tag added: {key}={value}");
-            ShowToast($"Tag added: {key}");
             NotifyStateChanged();
         }
 
@@ -246,7 +239,6 @@ public void AddTags(Dictionary<string, string> tags)
             OneSignal.User.AddTags(tags);
             MergePairs(_tagsList, tags);
             Debug.Log($"[{Tag}] {tags.Count} tag(s) added");
-            ShowToast($"{tags.Count} tag(s) added");
             NotifyStateChanged();
         }
 
@@ -255,7 +247,6 @@ public void RemoveTag(string key)
             OneSignal.User.RemoveTag(key);
             _tagsList.RemoveAll(kvp => kvp.Key == key);
             Debug.Log($"[{Tag}] Tag removed: {key}");
-            ShowToast($"Tag removed: {key}");
             NotifyStateChanged();
         }
 
@@ -264,7 +255,6 @@ public void RemoveSelectedTags(List<string> keys)
             OneSignal.User.RemoveTags(keys.ToArray());
             _tagsList.RemoveAll(kvp => keys.Contains(kvp.Key));
             Debug.Log($"[{Tag}] {keys.Count} tag(s) removed");
-            ShowToast($"{keys.Count} tag(s) removed");
             NotifyStateChanged();
         }
 
@@ -273,7 +263,6 @@ public void AddTrigger(string key, string value)
             OneSignal.InAppMessages.AddTrigger(key, value);
             MergePairs(_triggersList, new Dictionary<string, string> { [key] = value });
             Debug.Log($"[{Tag}] Trigger added: {key}={value}");
-            ShowToast($"Trigger added: {key}");
             NotifyStateChanged();
         }
 
@@ -282,7 +271,6 @@ public void AddTriggers(Dictionary<string, string> triggers)
             OneSignal.InAppMessages.AddTriggers(triggers);
             MergePairs(_triggersList, triggers);
             Debug.Log($"[{Tag}] {triggers.Count} trigger(s) added");
-            ShowToast($"{triggers.Count} trigger(s) added");
             NotifyStateChanged();
         }
 
@@ -291,7 +279,6 @@ public void RemoveTrigger(string key)
             OneSignal.InAppMessages.RemoveTrigger(key);
             _triggersList.RemoveAll(kvp => kvp.Key == key);
             Debug.Log($"[{Tag}] Trigger removed: {key}");
-            ShowToast($"Trigger removed: {key}");
             NotifyStateChanged();
         }
 
@@ -300,7 +287,6 @@ public void RemoveSelectedTriggers(List<string> keys)
             OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
             _triggersList.RemoveAll(kvp => keys.Contains(kvp.Key));
             Debug.Log($"[{Tag}] {keys.Count} trigger(s) removed");
-            ShowToast($"{keys.Count} trigger(s) removed");
             NotifyStateChanged();
         }
 
@@ -309,7 +295,6 @@ public void ClearAllTriggers()
             OneSignal.InAppMessages.ClearTriggers();
             _triggersList.Clear();
             Debug.Log($"[{Tag}] All triggers cleared");
-            ShowToast("All triggers cleared");
             NotifyStateChanged();
         }
 
@@ -319,7 +304,6 @@ public void SendInAppMessage(InAppMessageType type)
             OneSignal.InAppMessages.AddTrigger("iam_type", triggerValue);
             MergePairs(_triggersList, new Dictionary<string, string> { ["iam_type"] = triggerValue });
             Debug.Log($"[{Tag}] Sent In-App Message: {type.DisplayName()}");
-            ShowToast($"Sent In-App Message: {type.DisplayName()}");
             NotifyStateChanged();
         }
 
@@ -359,20 +343,13 @@ public async void SendNotification(NotificationType type)
                 bool success = await _apiService.SendNotification(type, pushId);
                 var label = type.ToString();
                 if (success)
-                {
                     Debug.Log($"[{Tag}] Notification sent: {label}");
-                    ShowToast($"Notification sent: {label}");
-                }
                 else
-                {
                     Debug.LogError($"[{Tag}] Failed to send notification: {label}");
-                    ShowToast("Failed to send notification");
-                }
             }
             catch (Exception ex)
             {
                 Debug.LogError($"[{Tag}] Notification error: {ex.Message}");
-                ShowToast("Failed to send notification");
             }
         }
 
@@ -380,7 +357,6 @@ public void ClearAllNotifications()
         {
             OneSignal.Notifications.ClearAllNotifications();
             Debug.Log($"[{Tag}] All notifications cleared");
-            ShowToast("All notifications cleared");
         }
 
         public async void SendCustomNotification(string title, string body)
@@ -390,20 +366,13 @@ public async void SendCustomNotification(string title, string body)
                 var pushId = OneSignal.User.PushSubscription.Id;
                 bool success = await _apiService.SendCustomNotification(title, body, pushId);
                 if (success)
-                {
                     Debug.Log($"[{Tag}] Custom notification sent: {title}");
-                    ShowToast($"Notification sent: Custom");
-                }
                 else
-                {
                     Debug.LogError($"[{Tag}] Failed to send custom notification");
-                    ShowToast("Failed to send notification");
-                }
             }
             catch (Exception ex)
             {
                 Debug.LogError($"[{Tag}] Custom notification error: {ex.Message}");
-                ShowToast("Failed to send notification");
             }
         }
 
@@ -424,7 +393,6 @@ public void StartLiveActivity(string activityId, string orderNumber)
             _liveActivityStatusIndex = 0;
 
             Debug.Log($"[{Tag}] Started Live Activity: {activityId}");
-            ShowToast($"Started Live Activity: {activityId}");
             NotifyStateChanged();
         }
 
@@ -454,18 +422,15 @@ public async void UpdateLiveActivity(string activityId)
                 {
                     _liveActivityStatusIndex = nextIndex;
                     Debug.Log($"[{Tag}] Updated Live Activity: {activityId}");
-                    ShowToast($"Updated Live Activity: {activityId}");
                 }
                 else
                 {
                     Debug.LogError($"[{Tag}] Failed to update Live Activity");
-                    ShowToast("Failed to update Live Activity");
                 }
             }
             catch (Exception ex)
             {
                 Debug.LogError($"[{Tag}] Live Activity update error: {ex.Message}");
-                ShowToast("Failed to update Live Activity");
             }
 
             _isLiveActivityUpdating = false;
@@ -497,18 +462,15 @@ public async void EndLiveActivity(string activityId)
                 {
                     _liveActivityStatusIndex = 0;
                     Debug.Log($"[{Tag}] Ended Live Activity: {activityId}");
-                    ShowToast($"Ended Live Activity: {activityId}");
                 }
                 else
                 {
                     Debug.LogError($"[{Tag}] Failed to end Live Activity");
-                    ShowToast("Failed to end Live Activity");
                 }
             }
             catch (Exception ex)
             {
                 Debug.LogError($"[{Tag}] Live Activity end error: {ex.Message}");
-                ShowToast("Failed to end Live Activity");
             }
 
             _isLiveActivityUpdating = false;
@@ -553,7 +515,6 @@ public void SetLocationShared(bool shared)
             _prefs.LocationShared = shared;
             OneSignal.Location.IsShared = shared;
             Debug.Log($"[{Tag}] Location sharing: {(shared ? "enabled" : "disabled")}");
-            ShowToast($"Location sharing {(shared ? "enabled" : "disabled")}");
             NotifyStateChanged();
         }
 
@@ -592,7 +553,6 @@ public void SetPushEnabled(bool enabled)
 
             _pushOptedIn = enabled;
             Debug.Log($"[{Tag}] Push {(enabled ? "enabled" : "disabled")}");
-            ShowToast($"Push {(enabled ? "enabled" : "disabled")}");
             NotifyStateChanged();
         }
 

From 74a1c22668b143c60c2f06a61ac1e643ce133095 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 00:18:40 -0700
Subject: [PATCH 47/54] refactor(demo): trim inputs and extract RenderPairList

---
 examples/demo/Assets/Resources/Theme.uss      |  8 ++++
 .../Assets/Scripts/UI/Dialogs/LoginDialog.cs  |  4 +-
 .../UI/Dialogs/MultiPairInputDialog.cs        |  8 ++--
 .../Scripts/UI/Dialogs/PairInputDialog.cs     |  8 ++--
 .../Scripts/UI/Dialogs/SingleInputDialog.cs   |  4 +-
 .../UI/Sections/AliasesSectionController.cs   | 30 ++++---------
 .../LiveActivitiesSectionController.cs        | 18 ++++++--
 .../Scripts/UI/Sections/SectionBuilder.cs     | 42 +++++++++++++++++++
 .../UI/Sections/TagsSectionController.cs      | 41 +++++-------------
 .../UI/Sections/TriggersSectionController.cs  | 41 +++++-------------
 .../Assets/Scripts/ViewModels/AppViewModel.cs | 19 +++------
 11 files changed, 110 insertions(+), 113 deletions(-)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index c4055bc6..719e0707 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -106,6 +106,14 @@
     color: var(--os-text-primary);
 }
 
+.hint-text {
+    font-size: 12px;
+    color: var(--os-text-hint);
+    -unity-text-align: middle-center;
+    margin-top: 4px;
+    white-space: normal;
+}
+
 .text-warning-link {
     font-size: 12px;
     -unity-font-style: bold;
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
index 846b272a..c7db3f3c 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/LoginDialog.cs
@@ -49,12 +49,12 @@ protected override void BuildContent(VisualElement container)
 
         private void ValidateInput()
         {
-            _confirmButton?.SetEnabled(!string.IsNullOrEmpty(_externalIdField?.value));
+            _confirmButton?.SetEnabled(!string.IsNullOrWhiteSpace(_externalIdField?.value));
         }
 
         private void OnConfirm()
         {
-            var value = _externalIdField?.value;
+            var value = _externalIdField?.value?.Trim();
             if (!string.IsNullOrEmpty(value))
             {
                 _externalIdField?.Blur();
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index 604726a4..0056f232 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -166,7 +166,7 @@ private void ValidateAll()
             bool allValid = _rows.Count > 0;
             foreach (var (key, value, _) in _rows)
             {
-                if (string.IsNullOrEmpty(key.value) || string.IsNullOrEmpty(value.value))
+                if (string.IsNullOrWhiteSpace(key.value) || string.IsNullOrWhiteSpace(value.value))
                 {
                     allValid = false;
                     break;
@@ -183,8 +183,10 @@ private void OnConfirm()
             var dict = new Dictionary<string, string>();
             foreach (var (key, value, _) in _rows)
             {
-                if (!string.IsNullOrEmpty(key.value) && !string.IsNullOrEmpty(value.value))
-                    dict[key.value] = value.value;
+                var trimmedKey = key.value?.Trim();
+                var trimmedValue = value.value?.Trim();
+                if (!string.IsNullOrEmpty(trimmedKey) && !string.IsNullOrEmpty(trimmedValue))
+                    dict[trimmedKey] = trimmedValue;
             }
 
             if (dict.Count == 0)
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
index 0687295d..220c0f3d 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/PairInputDialog.cs
@@ -90,8 +90,8 @@ protected override void BuildContent(VisualElement container)
         private void ValidateInput()
         {
             bool valid =
-                !string.IsNullOrEmpty(_keyField?.value)
-                && !string.IsNullOrEmpty(_valueField?.value);
+                !string.IsNullOrWhiteSpace(_keyField?.value)
+                && !string.IsNullOrWhiteSpace(_valueField?.value);
             _confirmButton?.SetEnabled(valid);
         }
 
@@ -103,8 +103,8 @@ private void OnConfirm()
             if (_submitted)
                 return;
 
-            var key = _keyField?.value;
-            var value = _valueField?.value;
+            var key = _keyField?.value?.Trim();
+            var value = _valueField?.value?.Trim();
             if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
                 return;
 
diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
index 0a9b47b1..ed26c9f3 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/SingleInputDialog.cs
@@ -61,12 +61,12 @@ protected override void BuildContent(VisualElement container)
 
         private void ValidateInput()
         {
-            _confirmButton?.SetEnabled(!string.IsNullOrEmpty(_inputField?.value));
+            _confirmButton?.SetEnabled(!string.IsNullOrWhiteSpace(_inputField?.value));
         }
 
         private void OnConfirm()
         {
-            var value = _inputField?.value;
+            var value = _inputField?.value?.Trim();
             if (!string.IsNullOrEmpty(value))
             {
                 _onConfirm?.Invoke(value);
diff --git a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
index d14236b0..b20c02ff 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/AliasesSectionController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using OneSignalDemo.ViewModels;
 using UnityEngine.UIElements;
 
@@ -60,28 +59,13 @@ private VisualElement BuildSection()
 
         private void RefreshList()
         {
-            _listContainer.Clear();
-            var aliases = _viewModel.Aliases;
-
-            if (aliases.Count == 0)
-            {
-                _listContainer.Add(
-                    _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("aliases")
-                        : SectionBuilder.CreateEmptyState("No Aliases Added", "aliases")
-                );
-                return;
-            }
-
-            for (int i = 0; i < aliases.Count; i++)
-            {
-                if (i > 0)
-                    _listContainer.Add(SectionBuilder.CreateDivider(tight: true));
-                var kvp = aliases[i];
-                _listContainer.Add(
-                    SectionBuilder.CreateKeyValueItem(kvp.Key, kvp.Value, "aliases", kvp.Key)
-                );
-            }
+            SectionBuilder.RenderPairList(
+                _listContainer,
+                _viewModel.Aliases,
+                "No Aliases Added",
+                "aliases",
+                loading: _viewModel.IsLoading
+            );
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
index 201970cb..910a03d1 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/LiveActivitiesSectionController.cs
@@ -13,6 +13,7 @@ public class LiveActivitiesSectionController
         private Button _startButton;
         private Button _updateButton;
         private Button _endButton;
+        private Label _apiKeyHint;
 
         public Action OnInfoTap;
 
@@ -76,6 +77,11 @@ private VisualElement BuildSection()
             );
             section.Add(_endButton);
 
+            _apiKeyHint = new Label("Set ONESIGNAL_API_KEY in .env to enable update & end");
+            _apiKeyHint.name = "live_activity_api_key_hint";
+            _apiKeyHint.AddToClassList("hint-text");
+            section.Add(_apiKeyHint);
+
             RefreshButtonStates();
             return section;
         }
@@ -90,14 +96,18 @@ private void RefreshButtonStates()
             bool hasActivityId = !string.IsNullOrEmpty(_activityIdField?.value);
             bool hasApiKey = _viewModel.HasApiKey;
 
-            _startButton?.SetEnabled(hasActivityId && !_viewModel.IsLiveActivityUpdating);
+            _startButton?.SetEnabled(hasActivityId);
 
-            bool canUpdate = hasActivityId && hasApiKey && !_viewModel.IsLiveActivityUpdating;
-            _updateButton?.SetEnabled(canUpdate);
+            _updateButton?.SetEnabled(
+                hasActivityId && hasApiKey && !_viewModel.IsLiveActivityUpdating
+            );
             if (_updateButton != null)
                 _updateButton.text = $"UPDATE \u2192 {_viewModel.NextStatusLabel}";
 
-            _endButton?.SetEnabled(hasActivityId && hasApiKey && !_viewModel.IsLiveActivityUpdating);
+            _endButton?.SetEnabled(hasActivityId && hasApiKey);
+
+            if (_apiKeyHint != null)
+                _apiKeyHint.style.display = hasApiKey ? DisplayStyle.None : DisplayStyle.Flex;
         }
 
         private void OnStartTap()
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 6a7bf68c..43ccc101 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using OneSignalDemo.Services;
 using OneSignalDemo.UI;
 using UnityEngine.UIElements;
@@ -246,6 +247,47 @@ public static Label CreateLoadingState(string sectionKey)
             return label;
         }
 
+        /// <summary>
+        /// Mirrors the Capacitor demo's PairList: rebuilds <paramref name="container"/>
+        /// with a loading state, an empty state, or a divider-separated list of
+        /// key/value rows. Section-specific button visibility is owned by callers.
+        /// </summary>
+        public static void RenderPairList(
+            VisualElement container,
+            IReadOnlyList<KeyValuePair<string, string>> items,
+            string emptyText,
+            string sectionKey,
+            bool loading = false,
+            Action<string> onRemove = null
+        )
+        {
+            container.Clear();
+
+            if (items.Count == 0)
+            {
+                container.Add(
+                    loading
+                        ? CreateLoadingState(sectionKey)
+                        : CreateEmptyState(emptyText, sectionKey)
+                );
+                return;
+            }
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (i > 0)
+                    container.Add(CreateDivider(tight: true));
+                var kvp = items[i];
+                var capturedKey = kvp.Key;
+                Action delete = null;
+                if (onRemove != null)
+                    delete = () => onRemove(capturedKey);
+                container.Add(
+                    CreateKeyValueItem(capturedKey, kvp.Value, sectionKey, capturedKey, delete)
+                );
+            }
+        }
+
         private static string SectionKeyFromName(string name) =>
             name != null && name.EndsWith("_section")
                 ? name.Substring(0, name.Length - "_section".Length)
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
index 3331466f..ec27e6bb 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TagsSectionController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using OneSignalDemo.ViewModels;
 using UnityEngine.UIElements;
 
@@ -69,37 +68,17 @@ private VisualElement BuildSection()
 
         private void RefreshList()
         {
-            _listContainer.Clear();
-            var tags = _viewModel.Tags;
-
-            if (tags.Count == 0)
-            {
-                _listContainer.Add(
-                    _viewModel.IsLoading
-                        ? SectionBuilder.CreateLoadingState("tags")
-                        : SectionBuilder.CreateEmptyState("No Tags Added", "tags")
-                );
-                _removeSelectedButton.style.display = DisplayStyle.None;
-                return;
-            }
-
-            _removeSelectedButton.style.display = DisplayStyle.Flex;
+            SectionBuilder.RenderPairList(
+                _listContainer,
+                _viewModel.Tags,
+                "No Tags Added",
+                "tags",
+                loading: _viewModel.IsLoading,
+                onRemove: key => _viewModel.RemoveTag(key)
+            );
 
-            for (int i = 0; i < tags.Count; i++)
-            {
-                if (i > 0)
-                    _listContainer.Add(SectionBuilder.CreateDivider(tight: true));
-                var kvp = tags[i];
-                _listContainer.Add(
-                    SectionBuilder.CreateKeyValueItem(
-                        kvp.Key,
-                        kvp.Value,
-                        "tags",
-                        kvp.Key,
-                        () => _viewModel.RemoveTag(kvp.Key)
-                    )
-                );
-            }
+            _removeSelectedButton.style.display =
+                _viewModel.Tags.Count > 0 ? DisplayStyle.Flex : DisplayStyle.None;
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
index 9930acde..d03fe156 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/TriggersSectionController.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Linq;
-using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
-using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.UI.Sections
@@ -101,36 +98,18 @@ private VisualElement BuildSection()
 
         private void RefreshList()
         {
-            _listContainer.Clear();
-            var triggers = _viewModel.Triggers;
+            SectionBuilder.RenderPairList(
+                _listContainer,
+                _viewModel.Triggers,
+                "No triggers added",
+                "triggers",
+                onRemove: key => _viewModel.RemoveTrigger(key)
+            );
 
-            bool hasTriggers = triggers.Count > 0;
-            _removeSelectedButton.style.display = hasTriggers
-                ? DisplayStyle.Flex
-                : DisplayStyle.None;
+            bool hasTriggers = _viewModel.Triggers.Count > 0;
+            _removeSelectedButton.style.display =
+                hasTriggers ? DisplayStyle.Flex : DisplayStyle.None;
             _clearAllButton.style.display = hasTriggers ? DisplayStyle.Flex : DisplayStyle.None;
-
-            if (!hasTriggers)
-            {
-                _listContainer.Add(SectionBuilder.CreateEmptyState("No triggers added", "triggers"));
-                return;
-            }
-
-            for (int i = 0; i < triggers.Count; i++)
-            {
-                if (i > 0)
-                    _listContainer.Add(SectionBuilder.CreateDivider(tight: true));
-                var kvp = triggers[i];
-                _listContainer.Add(
-                    SectionBuilder.CreateKeyValueItem(
-                        kvp.Key,
-                        kvp.Value,
-                        "triggers",
-                        kvp.Key,
-                        () => _viewModel.RemoveTrigger(kvp.Key)
-                    )
-                );
-            }
         }
     }
 }
diff --git a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
index 8b18ddc7..1dfd8d8f 100644
--- a/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
+++ b/examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs
@@ -139,6 +139,7 @@ public async Task LoadInitialDataAsync()
 
         public void LoginUser(string externalUserId)
         {
+            externalUserId = externalUserId?.Trim();
             if (string.IsNullOrEmpty(externalUserId))
                 return;
 
@@ -439,12 +440,9 @@ public async void UpdateLiveActivity(string activityId)
 
         public async void EndLiveActivity(string activityId)
         {
-            if (string.IsNullOrEmpty(activityId) || _isLiveActivityUpdating)
+            if (string.IsNullOrEmpty(activityId))
                 return;
 
-            _isLiveActivityUpdating = true;
-            NotifyStateChanged();
-
             try
             {
                 var eventUpdates = new JObject
@@ -462,6 +460,7 @@ public async void EndLiveActivity(string activityId)
                 {
                     _liveActivityStatusIndex = 0;
                     Debug.Log($"[{Tag}] Ended Live Activity: {activityId}");
+                    NotifyStateChanged();
                 }
                 else
                 {
@@ -472,9 +471,6 @@ public async void EndLiveActivity(string activityId)
             {
                 Debug.LogError($"[{Tag}] Live Activity end error: {ex.Message}");
             }
-
-            _isLiveActivityUpdating = false;
-            NotifyStateChanged();
         }
 
         public void SetConsentRequired(bool required)
@@ -482,11 +478,6 @@ public void SetConsentRequired(bool required)
             _consentRequired = required;
             _prefs.ConsentRequired = required;
             OneSignal.ConsentRequired = required;
-            if (!required)
-            {
-                _privacyConsentGiven = false;
-                _prefs.PrivacyConsent = false;
-            }
             Debug.Log($"[{Tag}] Consent required: {required}");
             NotifyStateChanged();
         }
@@ -526,7 +517,8 @@ public void PromptLocation()
 
         public void CheckLocationShared()
         {
-            ShowToast($"Location shared: {_locationShared.ToString().ToLowerInvariant()}");
+            bool shared = OneSignal.Location.IsShared;
+            ShowToast($"Location shared: {shared.ToString().ToLowerInvariant()}");
         }
 
         public async void PromptPush()
@@ -609,6 +601,7 @@ private void ClearUserData()
             _aliasesList.Clear();
             _emailsList.Clear();
             _smsNumbersList.Clear();
+            _tagsList.Clear();
             _triggersList.Clear();
         }
 

From 3f8bb505084b740a37c0864cc9cf638b4c491ec6 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 00:49:43 -0700
Subject: [PATCH 48/54] fix(demo): suppress dev console in E2E mode

---
 examples/demo/Assets/Scripts/AppBootstrapper.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index a8f2a8a1..a5fc0fc4 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -31,6 +31,21 @@ private async void Start()
         {
             DotEnv.Load();
 
+            // iOS cancels in-progress touches when the OS suspends the app, and
+            // Unity's Input System raises "Touch was already deallocated" on the
+            // next frame. In dev builds, that pops the engine's Development
+            // Console overlay on top of the UI and occludes subsequent test taps.
+            // Appium's live-activity spec deliberately locks the screen mid-tap,
+            // so suppress the overlay when E2E mode is on; the exception itself
+            // still logs to stdout for debugging. developerConsoleEnabled
+            // prevents future pops; developerConsoleVisible hides one that's
+            // already showing.
+            if (DotEnv.IsE2EMode)
+            {
+                Debug.developerConsoleEnabled = false;
+                Debug.developerConsoleVisible = false;
+            }
+
             _prefs = new PreferencesService();
             _apiService = new OneSignalApiService();
 

From f7a94f6e0142e6a113b5092550c3344ebdc394ba Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 10:00:41 -0700
Subject: [PATCH 49/54] fix(demo): force accessibility refresh on foreground

---
 .../Scripts/Services/AccessibilityBridge.cs     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index 9072e741..ba986a67 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -238,6 +238,23 @@ private void OnDestroy()
                 _instance = null;
         }
 
+        // After returnToApp() the test runner's first query can read a stale
+        // accessibility snapshot: WDA on iOS (and to a lesser extent
+        // UiAutomator2 on Android) caches the tree, and neither
+        // BuildHierarchy's "structure changed" check nor the OS's own
+        // notifications reliably invalidate that cache when the tree is
+        // identical to before backgrounding. Rebuild and broadcast a
+        // screen-changed notification unconditionally on every foreground so
+        // the next XCUITest/UiAutomator2 query returns fresh data without the
+        // Appium side having to spin on a fixed sleep.
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            if (!hasFocus || _hierarchy == null || _root == null)
+                return;
+            BuildHierarchy();
+            AssistiveSupport.notificationDispatcher?.SendScreenChanged();
+        }
+
         private void UnregisterTreeCallbacks()
         {
             if (_root != null)

From c20454301f6e754222b076611c2e55440c6518ee Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 11:24:24 -0700
Subject: [PATCH 50/54] fix: [SDK-4406] use monotonic row index in
 MultiPairInputDialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Row TextField names were derived from `_rows.Count` at construction time,
but RemoveRow does not renumber survivors. After Add+Remove(middle)+Add,
the new row's name collided with an existing survivor's name, and
AccessibilityBridge.WalkAndUpsert dedupes by name (first-wins) — so the
new row was silently dropped from the a11y tree and Appium taps landed
on the stale row. Switch to a monotonic `_nextRowIndex++` so names are
permanently unique regardless of remove ordering.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
index 0056f232..987ffd90 100644
--- a/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
+++ b/examples/demo/Assets/Scripts/UI/Dialogs/MultiPairInputDialog.cs
@@ -20,6 +20,11 @@ public class MultiPairInputDialog : DialogBase
         private bool _submitted;
         private double _lastAddRowMs = -1.0;
         private const double AddRowDedupeMs = 500.0;
+        // Monotonic — we cannot derive ids from _rows.Count because RemoveRow
+        // does not renumber survivors, so a new row would collide with an
+        // existing name and AccessibilityBridge.WalkAndUpsert (first-wins by
+        // name) would silently drop it from the a11y tree.
+        private int _nextRowIndex;
 
         public MultiPairInputDialog(
             string title,
@@ -89,15 +94,17 @@ private void AddRow()
             var row = new VisualElement();
             row.AddToClassList("dialog-row");
 
+            var rowIndex = _nextRowIndex++;
+
             var keyField = new TextField();
-            keyField.name = $"multipair_key_{_rows.Count}";
+            keyField.name = $"multipair_key_{rowIndex}";
             keyField.AddToClassList("input-field");
             keyField.AddToClassList("dialog-field-group-left");
             keyField.textEdition.placeholder = _keyLabel;
             keyField.RegisterValueChangedCallback(_ => ValidateAll());
 
             var valueField = new TextField();
-            valueField.name = $"multipair_value_{_rows.Count}";
+            valueField.name = $"multipair_value_{rowIndex}";
             valueField.AddToClassList("input-field");
             valueField.AddToClassList("dialog-field-group");
             valueField.textEdition.placeholder = _valueLabel;

From f8ba4254c5e6472f4bbb053f9ad0c7c4ed82a7ac Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 18:28:48 -0700
Subject: [PATCH 51/54] fix(demo): fix stale Android click targets and IAM
 WebView debugging

---
 .../demo/Assets/Scripts/AppBootstrapper.cs    | 53 ++++++++++++++++++-
 .../Scripts/Services/AccessibilityBridge.cs   | 42 +++++++++++++--
 2 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/examples/demo/Assets/Scripts/AppBootstrapper.cs b/examples/demo/Assets/Scripts/AppBootstrapper.cs
index a5fc0fc4..cfc801e4 100644
--- a/examples/demo/Assets/Scripts/AppBootstrapper.cs
+++ b/examples/demo/Assets/Scripts/AppBootstrapper.cs
@@ -58,6 +58,9 @@ private async void Start()
             _apiService.SetAppId(appId);
 
             OneSignal.Debug.LogLevel = LogLevel.Verbose;
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(false);
+#endif
             OneSignal.ConsentRequired = _prefs.ConsentRequired;
             OneSignal.ConsentGiven = _prefs.PrivacyConsent;
             OneSignal.Initialize(appId);
@@ -114,6 +117,42 @@ private static void RequestAndroidPostNotificationsPermission()
                 1001
             );
         }
+
+        private static void SetAndroidWebViewDebugging(bool enabled)
+        {
+            if (!DotEnv.IsE2EMode)
+                return;
+
+            try
+            {
+                using var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+                using var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+                if (activity == null)
+                    return;
+
+                activity.Call(
+                    "runOnUiThread",
+                    new AndroidJavaRunnable(() =>
+                    {
+                        try
+                        {
+                            using var webView = new AndroidJavaClass("android.webkit.WebView");
+                            webView.CallStatic("setWebContentsDebuggingEnabled", enabled);
+                        }
+                        catch (AndroidJavaException ex)
+                        {
+                            Debug.LogWarning(
+                                $"[{Tag}] Could not set WebView debugging: {ex.Message}"
+                            );
+                        }
+                    })
+                );
+            }
+            catch (AndroidJavaException ex)
+            {
+                Debug.LogWarning($"[{Tag}] Could not set WebView debugging: {ex.Message}");
+            }
+        }
 #endif
 
         private void RegisterSdkListeners()
@@ -141,8 +180,13 @@ private void OnDestroy()
             OneSignal.Notifications.ForegroundWillDisplay -= OnNotificationForegroundWillDisplay;
         }
 
-        private void OnIamWillDisplay(object sender, InAppMessageWillDisplayEventArgs e) =>
+        private void OnIamWillDisplay(object sender, InAppMessageWillDisplayEventArgs e)
+        {
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(true);
+#endif
             Debug.Log($"[{Tag}] IAM will display: {e.Message.MessageId}");
+        }
 
         private void OnIamDidDisplay(object sender, InAppMessageDidDisplayEventArgs e) =>
             Debug.Log($"[{Tag}] IAM did display: {e.Message.MessageId}");
@@ -150,8 +194,13 @@ private void OnIamDidDisplay(object sender, InAppMessageDidDisplayEventArgs e) =
         private void OnIamWillDismiss(object sender, InAppMessageWillDismissEventArgs e) =>
             Debug.Log($"[{Tag}] IAM will dismiss: {e.Message.MessageId}");
 
-        private void OnIamDidDismiss(object sender, InAppMessageDidDismissEventArgs e) =>
+        private void OnIamDidDismiss(object sender, InAppMessageDidDismissEventArgs e)
+        {
             Debug.Log($"[{Tag}] IAM did dismiss: {e.Message.MessageId}");
+#if UNITY_ANDROID && !UNITY_EDITOR
+            SetAndroidWebViewDebugging(false);
+#endif
+        }
 
         private void OnIamClicked(object sender, InAppMessageClickEventArgs e) =>
             Debug.Log($"[{Tag}] IAM clicked: {e.Result.ActionId}");
diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index ba986a67..ad69cd6a 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -189,6 +189,7 @@ Action action
                 isEnabled ?? (() => true),
                 action
             );
+            target.RegisterCallback<DetachFromPanelEvent>(OnAndroidClickTargetDetached);
 #elif UNITY_IOS && !UNITY_EDITOR
             if (target == null || action == null || string.IsNullOrEmpty(target.name))
                 return;
@@ -201,6 +202,14 @@ Action action
 #endif
         }
 
+#if UNITY_ANDROID && !UNITY_EDITOR
+        private static void OnAndroidClickTargetDetached(DetachFromPanelEvent e)
+        {
+            if (e.target is VisualElement target)
+                AndroidClickTargets.Remove(target);
+        }
+#endif
+
         public static void RequestResync()
         {
             _instance?.ScheduleResync();
@@ -652,14 +661,41 @@ private void InvokeAndroidNativeAction(string id)
                 return;
             }
 
+            Action actionToInvoke = null;
+            List<VisualElement> detachedTargets = null;
             foreach (var kvp in AndroidClickTargets)
             {
                 var el = kvp.Key;
-                if (el == null || el.name != id || !kvp.Value.IsEnabled())
+                if (el == null || el.panel == null || !IsDescendantOfRoot(el))
+                {
+                    if (el != null)
+                    {
+                        detachedTargets ??= new List<VisualElement>();
+                        detachedTargets.Add(el);
+                    }
                     continue;
-                kvp.Value.Action();
-                return;
+                }
+                if (el.name != id || !IsVisible(el) || !kvp.Value.IsEnabled())
+                    continue;
+                actionToInvoke = kvp.Value.Action;
+                break;
+            }
+            if (detachedTargets != null)
+            {
+                foreach (var target in detachedTargets)
+                    AndroidClickTargets.Remove(target);
+            }
+            actionToInvoke?.Invoke();
+        }
+
+        private bool IsDescendantOfRoot(VisualElement el)
+        {
+            for (var current = el; current != null; current = current.hierarchy.parent)
+            {
+                if (current == _root)
+                    return true;
             }
+            return false;
         }
 
         private void InvokeAndroidNativeScroll(string direction)

From c35fb866dc22dbc120a79693840c89af43f9866e Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 19:05:50 -0700
Subject: [PATCH 52/54] fix(demo): address Unity demo PR feedback

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Scripts/Services/AccessibilityBridge.cs      | 16 +++++++++++-----
 .../Assets/Scripts/UI/Sections/SectionBuilder.cs | 15 +++++++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
index ad69cd6a..2539411a 100644
--- a/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
+++ b/examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs
@@ -222,6 +222,14 @@ public static void RequestImmediateResync()
 
         private void Initialize(VisualElement root)
         {
+            if (_root != root)
+            {
+                UnregisterTreeCallbacks();
+                _mainSv = null;
+                _lastTouchActivityMs = -1.0;
+                _scrollViewHooksInstalled = false;
+            }
+
             _root = root;
             _lastStructureSignature = -1; // force first poll to rebuild
 
@@ -487,11 +495,9 @@ private void BuildHierarchy()
                 visualTree.RegisterCallback(_onIosInfoIconPointerDown, TrickleDown.TrickleDown);
 #endif
 
-            // One-shot ScrollView taming: BuildHierarchy can run dozens of
-            // times per session (every dialog open/close, every section
-            // refresh), but the main ScrollView only needs these hooks once.
-            // The flag is reset only by OnDestroy — a fresh bridge instance
-            // re-applies them.
+            // One-shot per root ScrollView taming: BuildHierarchy can run
+            // dozens of times per scene (every dialog open/close, every
+            // section refresh), but a scene/root swap needs fresh hooks.
             if (!_scrollViewHooksInstalled)
             {
                 var mainSv = _root.Q<ScrollView>("main_scroll_view");
diff --git a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
index 43ccc101..5cb13a5b 100644
--- a/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
+++ b/examples/demo/Assets/Scripts/UI/Sections/SectionBuilder.cs
@@ -40,10 +40,17 @@ public static VisualElement CreateSection(
                 infoBtn.name = $"{SectionKeyFromName(name)}_info_icon";
                 infoBtn.AddToClassList("info-button");
                 infoBtn.pickingMode = PickingMode.Position;
+                bool CanOpenTooltip() => infoBtn.panel?.visualTree.Q("tooltip_title") == null;
+                void OpenTooltip()
+                {
+                    if (CanOpenTooltip())
+                        onInfoTap();
+                }
+                infoBtn.RegisterCallback<ClickEvent>(_ => OpenTooltip());
                 AccessibilityBridge.RegisterE2ETapTarget(
                     infoBtn,
-                    () => infoBtn.panel?.visualTree.Q("tooltip_title") == null,
-                    onInfoTap
+                    CanOpenTooltip,
+                    OpenTooltip
                 );
                 header.Add(infoBtn);
             }
@@ -165,7 +172,7 @@ public static VisualElement CreateKeyValueItem(
                     deleteBtn.name = $"{sectionKey}_remove_{itemKey}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
-            AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
+                AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 
@@ -221,7 +228,7 @@ public static VisualElement CreateSingleItem(
                     deleteBtn.name = $"{sectionKey}_remove_{value}";
                 deleteBtn.text = MaterialIcons.Close;
                 deleteBtn.AddToClassList("delete-button");
-            AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
+                AccessibilityBridge.RegisterE2ETapTarget(deleteBtn, () => true, onDelete);
                 item.Add(deleteBtn);
             }
 

From a2138035b3c9693eb7e0caa192cb72d9415eaf5a Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 20:47:03 -0700
Subject: [PATCH 53/54] fix(demo): register back button as E2E tap target

---
 .../demo/Assets/App/Editor/iOS/BuildPostProcessor.cs   |  2 +-
 .../Assets/Scripts/UI/SecondaryScreenController.cs     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs b/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
index 96cdd64a..7185d335 100644
--- a/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
+++ b/examples/demo/Assets/App/Editor/iOS/BuildPostProcessor.cs
@@ -203,7 +203,7 @@ static string ResolveOneSignalXCFrameworkVersion()
 
             var dependenciesFile = File.ReadAllText(dependenciesFilePath);
             var dependenciesRegex = new Regex(
-                "(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)"
+                "(?<=<iosPod name=\"OneSignalXCFramework\" version=\")[^\"]+(?=\" addToAllTargets=\"true\" />)"
             );
 
             if (!dependenciesRegex.IsMatch(dependenciesFile))
diff --git a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
index 209bd332..b7b40e73 100644
--- a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
@@ -24,10 +24,18 @@ private void OnEnable()
             var appBar = new VisualElement();
             appBar.AddToClassList("app-bar");
 
-            var backButton = new Button(() => SceneManager.LoadScene("Main"));
+            void GoBack() => SceneManager.LoadScene("Main");
+            var backButton = new Button(GoBack);
             backButton.name = "back_button";
             backButton.text = MaterialIcons.ArrowBack;
             backButton.AddToClassList("back-button");
+#if UNITY_ANDROID && !UNITY_EDITOR
+            OneSignalDemo.Services.AccessibilityBridge.RegisterE2ETapTarget(
+                backButton,
+                () => backButton.enabledInHierarchy,
+                GoBack
+            );
+#endif
             appBar.Add(backButton);
 
             var title = new Label("Secondary Screen");

From 384badda021e56c485d2ad8027266967b5f08d33 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Fri, 15 May 2026 20:58:05 -0700
Subject: [PATCH 54/54] fix(demo): apply safe area to secondary screen

---
 examples/demo/Assets/Resources/Theme.uss      |  4 ++
 .../Scripts/UI/SecondaryScreenController.cs   | 42 ++++++++++++++++---
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/examples/demo/Assets/Resources/Theme.uss b/examples/demo/Assets/Resources/Theme.uss
index 719e0707..b9ecdd8d 100644
--- a/examples/demo/Assets/Resources/Theme.uss
+++ b/examples/demo/Assets/Resources/Theme.uss
@@ -149,6 +149,10 @@
     border-bottom-width: 0;
 }
 
+.app-bar-left {
+    justify-content: flex-start;
+}
+
 .app-bar-logo {
     width: 99px;
     height: 22px;
diff --git a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
index b7b40e73..7070edce 100644
--- a/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
+++ b/examples/demo/Assets/Scripts/UI/SecondaryScreenController.cs
@@ -9,20 +9,29 @@ public class SecondaryScreenController : MonoBehaviour
         [SerializeField]
         private UIDocument _uiDocument;
 
+        private VisualElement _root;
+
         private void OnEnable()
         {
-            var root = _uiDocument.rootVisualElement;
-            root.Clear();
+            _root = _uiDocument.rootVisualElement;
+            _root.Clear();
 
             var themeSheet = Resources.Load<StyleSheet>("Theme");
             if (themeSheet != null)
-                root.styleSheets.Add(themeSheet);
+                _root.styleSheets.Add(themeSheet);
 
             var screenRoot = new VisualElement();
             screenRoot.AddToClassList("screen-root");
 
+            var statusSpacer = new VisualElement();
+            statusSpacer.name = "status_bar_spacer";
+            statusSpacer.AddToClassList("status-bar-spacer");
+            statusSpacer.style.height = 0;
+            screenRoot.Add(statusSpacer);
+
             var appBar = new VisualElement();
             appBar.AddToClassList("app-bar");
+            appBar.AddToClassList("app-bar-left");
 
             void GoBack() => SceneManager.LoadScene("Main");
             var backButton = new Button(GoBack);
@@ -57,11 +66,34 @@ private void OnEnable()
             content.Add(heading);
 
             screenRoot.Add(content);
-            root.Add(screenRoot);
+            _root.Add(screenRoot);
 
 #if UNITY_IOS || UNITY_ANDROID
-            OneSignalDemo.Services.AccessibilityBridge.EnableForE2E(root);
+            OneSignalDemo.Services.AccessibilityBridge.EnableForE2E(_root);
 #endif
         }
+
+        private void Update()
+        {
+            ApplySafeArea();
+        }
+
+        private void ApplySafeArea()
+        {
+            if (_root == null)
+                return;
+
+            float rootHeight = _root.resolvedStyle.height;
+            if (float.IsNaN(rootHeight) || rootHeight <= 0 || Screen.height <= 0)
+                return;
+
+            var safe = Screen.safeArea;
+            float scale = rootHeight / Screen.height;
+            float top = (Screen.height - safe.yMax) * scale;
+
+            var statusSpacer = _root.Q("status_bar_spacer");
+            if (statusSpacer != null)
+                statusSpacer.style.height = top;
+        }
     }
 }