From a2abd47947a78e67783669e03d87ca2b73469059 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 15 Jan 2025 16:03:02 +0200
Subject: [PATCH 01/21] Local web wallet redirects

---
 .../Assets/Scripts/AppInit.cs                 | 41 +++++++++++
 .../Assets/Scripts/AppKitInit.cs              |  2 +-
 .../Reown/AppKit/Views/WebWalletView.meta     |  3 +
 .../Views/WebWalletView/WebWalletView.uss     | 14 ++++
 .../WebWalletView/WebWalletView.uss.meta      |  3 +
 .../Views/WebWalletView/WebWalletView.uxml    | 18 +++++
 .../WebWalletView/WebWalletView.uxml.meta     |  3 +
 .../ModalController/ModalController.cs        |  3 +-
 .../Runtime/Controllers/RouterController.cs   |  1 +
 .../Runtime/Presenters/ConnectPresenter.cs    |  6 ++
 .../Runtime/Presenters/WebAppPresenter.cs     |  4 +-
 .../Runtime/Presenters/WebWalletPresenter.cs  | 53 +++++++++++++++
 .../Presenters/WebWalletPresenter.cs.meta     |  3 +
 .../Runtime/Views/WebWalletView.meta          |  3 +
 .../Views/WebWalletView/WebWalletView.cs      | 68 +++++++++++++++++++
 .../Views/WebWalletView/WebWalletView.cs.meta |  3 +
 .../Runtime/ReownSignUnityInterceptor.cs      |  8 +--
 src/Reown.Sign.Unity/Runtime/Linker.cs        |  4 +-
 18 files changed, 231 insertions(+), 9 deletions(-)
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/WebWalletView.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs.meta

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
index e549831..0feded0 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
@@ -1,4 +1,8 @@
+using System.Linq;
+using IngameDebugConsole;
 using mixpanel;
+using Newtonsoft.Json;
+using Reown.AppKit.Unity;
 using Skibitsky.Unity;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -39,5 +43,42 @@ private void ConfigureMixpanel()
                 Mixpanel.Track(logString, props);
             };
         }
+
+        [ConsoleMethod("accounts", "Lists all connected accounts")]
+        public static async void Accounts()
+        {
+            var accounts = await AppKit.ConnectorController.GetAccountsAsync();
+
+            if (accounts == null || accounts.Length == 0)
+            {
+                Debug.Log("No accounts connected");
+                return;
+            }
+
+            foreach (var account in accounts)
+            {
+                Debug.Log(account.AccountId);
+            }
+        }
+
+        [ConsoleMethod("sessionProps", "Prints session properties")]
+        public static void SessionProps()
+        {
+            var walletConnect = AppKit.ConnectorController.ActiveConnector as WalletConnectConnector;
+            var addressProvider = walletConnect.SignClient.AddressProvider;
+            var sessionProperties = addressProvider.DefaultSession.SessionProperties;
+
+            if (sessionProperties == null)
+            {
+                Debug.Log("No session properties found");
+                return;
+            }
+
+            var json = JsonConvert.SerializeObject(sessionProperties, new JsonSerializerSettings
+            {
+                Formatting = Formatting.Indented
+            });
+            Debug.Log(json);
+        }
     }
 }
\ No newline at end of file
diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
index b1e3e24..d6c33d7 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
@@ -56,7 +56,7 @@ private async void Start()
                 // On mobile show 5 wallets on the Connect view (the first AppKit modal screen)
                 connectViewWalletsCountMobile = 5,
                 // Assign the SIWE configuration created above. Can be null if SIWE is not used.
-                siweConfig = siweConfig
+                // siweConfig = siweConfig
             };
 
             Debug.Log("[AppKit Init] Initializing AppKit...");
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView.meta
new file mode 100644
index 0000000..8402f48
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 42856f451b544e0eb64c15dcf60730b7
+timeCreated: 1736947636
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss
new file mode 100644
index 0000000..7ee72d6
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss
@@ -0,0 +1,14 @@
+#web-wallet-view__loading-label {
+    margin-top: 10;
+    margin-bottom: 10;
+    -unity-text-align: middle-center;
+    color: var(--ro-color-fg-100);
+}
+
+#web-wallet-view__buttons {
+    margin-top: 10;
+}
+
+#web-wallet-view__buttons > Link {
+    margin-bottom: 20;
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss.meta
new file mode 100644
index 0000000..5b1c0f7
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7d8a6b9c0bb0437ab6a802d2b175ad7f
+timeCreated: 1736947648
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
new file mode 100644
index 0000000..3f808df
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
@@ -0,0 +1,18 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="WebWalletView.uss"/>
+    <ui:Label name="web-wallet-view__loading-label" class="text-large" text="Loading WalletConnect URI..."/>
+    <ui:VisualElement name="web-wallet-view__buttons">
+        <Reown.AppKit.Unity.Components.Link name="web-wallet-view__google-local"
+                                            text="Google via Localhost"
+                                            size="Small"
+                                            variant="Gray"
+                                            icon="Reown/AppKit/Icons/icon_bold_externallink"
+        />
+        <Reown.AppKit.Unity.Components.Link name="web-wallet-view__google-deployment"
+                                            text="Google via Deployment"
+                                            size="Small"
+                                            variant="Gray"
+                                            icon="Reown/AppKit/Icons/icon_bold_externallink"
+        />
+    </ui:VisualElement>
+</ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml.meta
new file mode 100644
index 0000000..b09df04
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7dddb3407bae4cefa19c541e6c910ac9
+timeCreated: 1736947662
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
index 1f3f5a0..5124f81 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
@@ -69,6 +69,7 @@ public enum ViewType
         Account,
         NetworkSearch,
         NetworkLoading,
-        Siwe
+        Siwe,
+        WebWallet
     }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
index 200b5fd..8aa07c5 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
@@ -96,6 +96,7 @@ private void RegisterDefaultModalViews()
             RegisterModalView(ViewType.Account, new AccountPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkSearch, new NetworkSearchPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkLoading, new NetworkLoadingPresenter(this, RootVisualElement));
+            RegisterModalView(ViewType.WebWallet, new WebWalletPresenter(this, RootVisualElement));
 
             if (AppKit.SiweController.IsEnabled)
                 RegisterModalView(ViewType.Siwe, new SiwePresenter(this, RootVisualElement));
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
index e0d3c67..dcf3fb8 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
@@ -4,6 +4,7 @@
 using Reown.AppKit.Unity.Components;
 using Reown.AppKit.Unity.Model;
 using Reown.AppKit.Unity.Utils;
+using Reown.AppKit.Unity.Views.WebWalletView;
 using UnityEngine;
 using UnityEngine.UIElements;
 using DeviceType = Reown.AppKit.Unity.Utils.DeviceType;
@@ -58,6 +59,11 @@ protected virtual async Task RebuildAsync()
 
         protected virtual async Task BuildAsync()
         {
+            // todo:
+            var listItem = new ListItem("Web wallet", () => Router.OpenView(ViewType.WebWallet));
+            listItem.RightSlot.Add(new Tag("ALPHA", Tag.TagType.Accent));
+            View.Add(listItem);
+            
             CreateWalletConnectButton();
 
             var recentWalletExists = WalletUtils.TryGetRecentWallet(out var recentWallet);
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/WebAppPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/WebAppPresenter.cs
index c817ec5..49330ee 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/WebAppPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/WebAppPresenter.cs
@@ -54,7 +54,9 @@ protected override void OnVisibleCore()
         private void OnOpenLinkClicked()
         {
             var encodedUri = HttpUtility.UrlEncode(_connectionProposal.Uri);
-            Application.OpenURL(Path.Combine(_wallet.WebappLink, $"wc?uri={encodedUri}"));
+            var url = Path.Combine(_wallet.WebappLink, $"wc?uri={encodedUri}");
+            Debug.Log(url);
+            Application.OpenURL(url);
         }
 
         private void OnCopyLinkClicked()
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
new file mode 100644
index 0000000..3be8615
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
@@ -0,0 +1,53 @@
+using System;
+using Reown.AppKit.Unity.Views.WebWalletView;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity
+{
+    public class WebWalletPresenter : Presenter<WebWalletView>
+    {
+        private WalletConnectConnectionProposal _connectionProposal;
+
+        public WebWalletPresenter(RouterController router, VisualElement parent, bool hideView = true) : base(router, parent, hideView)
+        {
+            View.GoogleLocalClicked += OnGoogleLocalClicked;
+            View.GoogleDeployClicked += OnGoogleDeployClicked;
+        }
+
+        protected override void OnVisibleCore()
+        {
+            base.OnVisibleCore();
+
+            if (!AppKit.ConnectorController
+                    .TryGetConnector<WalletConnectConnector>
+                        (ConnectorType.WalletConnect, out var connector))
+                throw new Exception("No WC connector"); // TODO: use custom exception
+
+            _connectionProposal = (WalletConnectConnectionProposal)connector.Connect();
+
+            _connectionProposal.ConnectionUpdated += ConnectionUpdatedHandler;
+        }
+
+        private void ConnectionUpdatedHandler(ConnectionProposal obj)
+        {
+            View.ShowButtons();
+        }
+
+        private void OnGoogleLocalClicked()
+        {
+            var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
+            var url = $"http://localhost:5173/wc?uri={encodedWcUrl}";
+            Debug.Log($"Opening URL: {url}");
+            Application.OpenURL(url);
+        }
+
+        private void OnGoogleDeployClicked()
+        {
+            var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
+            var url = $"https://reown.com/wc?uri={encodedWcUrl}"; // TODO: set vercel url
+            Debug.Log($"Opening URL: {url}");
+            Application.OpenURL(url);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs.meta b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs.meta
new file mode 100644
index 0000000..aa34d85
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 90a8f4d0618e484fa03ec5214f245d59
+timeCreated: 1736947498
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView.meta b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView.meta
new file mode 100644
index 0000000..9e42d69
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f528b380469146a4b8d45c58a1f17ca1
+timeCreated: 1736947515
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
new file mode 100644
index 0000000..0ebb426
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
@@ -0,0 +1,68 @@
+using System;
+using Reown.AppKit.Unity.Components;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Button = UnityEngine.UIElements.Button;
+
+namespace Reown.AppKit.Unity.Views.WebWalletView
+{
+    public class WebWalletView : VisualElement
+    {
+        public const string Name = "web-wallet-view";
+
+        private readonly Label _loadingLabel;
+        private readonly VisualElement _buttons;
+        private readonly Link _googleLocal;
+        private readonly Link _googleDeploy;
+
+        public event Action GoogleLocalClicked
+        {
+            add => _googleLocal.Clicked += value;
+            remove => _googleLocal.Clicked -= value;
+        }
+
+        public event Action GoogleDeployClicked
+        {
+            add => _googleDeploy.Clicked += value;
+            remove => _googleDeploy.Clicked -= value;
+        }
+
+        public new class UxmlFactory : UxmlFactory<WebWalletView>
+        {
+        }
+
+        public WebWalletView() : this(null)
+        {
+        }
+
+        public WebWalletView(string visualTreePath)
+        {
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "Reown/AppKit/Views/WebWalletView/WebWalletView");
+            Debug.Log($"Is asset null? {asset == null}");
+            asset.CloneTree(this);
+
+            name = Name;
+
+            _loadingLabel = this.Q<Label>("web-wallet-view__loading-label");
+            _buttons = this.Q<VisualElement>("web-wallet-view__buttons");
+            _googleLocal = this.Q<Link>("web-wallet-view__google-local");
+            _googleDeploy = this.Q<Link>("web-wallet-view__google-deployment");
+
+            Debug.Log("Is local google button null? " + (_googleLocal == null));
+
+            ShowLoading();
+        }
+
+        public void ShowLoading()
+        {
+            _loadingLabel.style.display = DisplayStyle.Flex;
+            _buttons.style.display = DisplayStyle.None;
+        }
+
+        public void ShowButtons()
+        {
+            _loadingLabel.style.display = DisplayStyle.None;
+            _buttons.style.display = DisplayStyle.Flex;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs.meta b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs.meta
new file mode 100644
index 0000000..6ce3c2b
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 166df56a5dd44c29b576b44c6e2f7794
+timeCreated: 1736947521
\ No newline at end of file
diff --git a/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs b/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
index d3b70a9..2111186 100644
--- a/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
+++ b/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
@@ -30,7 +30,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
         {
             var result = ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, request, route);
 
-#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
+// #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
             try
             {
                 if (ReownInterceptor.SignMethods.Contains(request.Method))
@@ -43,7 +43,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
             {
                 ReownLogger.LogError(e);
             }
-#endif
+// #endif
 
             return result;
         }
@@ -56,7 +56,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
         {
             var result = ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, method, route, paramList);
 
-#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
+// #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
             try
             {
                 if (ReownInterceptor.SignMethods.Contains(method))
@@ -69,7 +69,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
             {
                 ReownLogger.LogError(e);
             }
-#endif
+// #endif
 
             return result;
         }
diff --git a/src/Reown.Sign.Unity/Runtime/Linker.cs b/src/Reown.Sign.Unity/Runtime/Linker.cs
index bba98cb..b5796c4 100644
--- a/src/Reown.Sign.Unity/Runtime/Linker.cs
+++ b/src/Reown.Sign.Unity/Runtime/Linker.cs
@@ -69,7 +69,7 @@ public static void OpenSessionRequestDeepLink(Session session)
                     $"[Linker] No redirect found for {session.Peer.Metadata.Name}. Using deep link from the Recent Wallet."
                 );
 
-                if (!deeplink.EndsWith("://"))
+                if (!deeplink.Contains("://"))
                     deeplink = $"{deeplink}://";
 
                 Application.OpenURL(deeplink);
@@ -78,7 +78,7 @@ public static void OpenSessionRequestDeepLink(Session session)
             {
                 ReownLogger.Log($"[Linker] Open native deep link: {redirectNative}");
 
-                if (!redirectNative.EndsWith("://"))
+                if (!redirectNative.Contains("://"))
                     redirectNative = $"{redirectNative}://";
 
                 Application.OpenURL(redirectNative);

From 8532e81c0c8127468eb9dca07bdc1f13bd2f2f37 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Fri, 17 Jan 2025 18:00:22 +0200
Subject: [PATCH 02/21] Switching between eoa and smart account

---
 .../Runtime/Connectors/Connector.cs           |  24 +++-
 .../Runtime/Connectors/Profile.meta           |   3 +
 .../Connectors/Profile/ProfileConnector.cs    | 107 ++++++++++++++++++
 .../Profile/ProfileConnector.cs.meta          |   3 +
 .../WalletConnect/WalletConnectConnector.cs   |  14 ++-
 .../Controllers/ConnectorController.cs        |  19 +++-
 .../NetworkControllerCore.cs                  |   6 +-
 .../Runtime/Evm/EvmService.cs                 |  19 +++-
 .../Runtime/Evm/NethereumEvmService.cs        |   8 +-
 .../Runtime/Evm/WagmiEvmService.cs            |   8 +-
 .../Runtime/Presenters/AccountPresenter.cs    |  34 +++++-
 .../Runtime/Presenters/WebWalletPresenter.cs  |   7 +-
 .../Runtime/WebGL/Wagmi/WagmiInterop.cs       |  10 +-
 .../Runtime/WebGL/Wagmi/WagmiModel.cs         |   2 +
 .../Controllers/TypedMessageHandler.cs        |   2 +
 .../Runtime/ReownInterceptor.cs               |  24 ++--
 .../Runtime/ReownSignService.cs               |  12 +-
 .../Runtime/ReownSignServiceCore.cs           |   8 +-
 src/Reown.Sign/Runtime/Models/Account.cs      |   9 +-
 19 files changed, 255 insertions(+), 64 deletions(-)
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Connectors/Profile.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs.meta

diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Connector.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/Connector.cs
index fd86f0e..696d5a7 100644
--- a/src/Reown.AppKit.Unity/Runtime/Connectors/Connector.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Connector.cs
@@ -227,13 +227,26 @@ protected virtual void OnChainChanged(ChainChangedEventArgs e)
 
         public class AccountConnectedEventArgs : EventArgs
         {
-            public Func<Task<Account>> GetAccount { get; }
-            public Func<Task<Account[]>> GetAccounts { get; }
+            [Obsolete("Use GetAccountAsync instead")]
+            public Func<Task<Account>> GetAccount
+            {
+                get => GetAccountAsync;
+            }
+
+            [Obsolete("Use GetAccountsAsync instead")]
+            public Func<Task<Account[]>> GetAccounts
+            {
+                get => GetAccountsAsync;
+            }
+
+            public Func<Task<Account>> GetAccountAsync { get; }
+
+            public Func<Task<Account[]>> GetAccountsAsync { get; }
 
             public AccountConnectedEventArgs(Func<Task<Account>> getAccount, Func<Task<Account[]>> getAccounts)
             {
-                GetAccount = getAccount;
-                GetAccounts = getAccounts;
+                GetAccountAsync = getAccount;
+                GetAccountsAsync = getAccounts;
             }
         }
 
@@ -267,6 +280,7 @@ public enum ConnectorType
     {
         None,
         WalletConnect,
-        WebGl
+        WebGl,
+        Profile
     }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile.meta b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile.meta
new file mode 100644
index 0000000..ac721bb
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ee16640fe1c04556b2bb56f624361473
+timeCreated: 1737032723
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
new file mode 100644
index 0000000..10961d5
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Reown.Sign.Models;
+using UnityEngine;
+
+namespace Reown.AppKit.Unity.Profile
+{
+    public class ProfileConnector : WalletConnectConnector
+    {
+        public string Email { get; private set; }
+
+        public Account[] SmartAccounts { get; private set; }
+
+        public Account[] EoaAccounts { get; private set; }
+
+        public AccountType PreferredAccountType { get; private set; }
+
+        public Account PreferredAccount { get; private set; }
+
+        private const string PreferredAccountTypeKey = "PreferredAccount";
+
+        public ProfileConnector()
+        {
+            Type = ConnectorType.Profile;
+        }
+
+        protected override async void OnAccountConnected(AccountConnectedEventArgs e)
+        {
+            try
+            {
+                var addressProvider = SignClient.AddressProvider;
+                var sessionProperties = addressProvider.DefaultSession.SessionProperties;
+
+                SmartAccounts = JsonConvert
+                    .DeserializeObject<string[]>(sessionProperties["smartAccounts"])
+                    .Select(x => new Account(x))
+                    .ToArray();
+
+                var allAccounts = await GetAccountsAsyncCore();
+                EoaAccounts = allAccounts
+                    .Except(SmartAccounts)
+                    .ToArray();
+
+                Email = sessionProperties["email"];
+
+                base.OnAccountConnected(e);
+
+                var preferredAccountTypeStr = PlayerPrefs.GetString(PreferredAccountTypeKey);
+                var preferredAccountType = Enum.TryParse<AccountType>(preferredAccountTypeStr, out var accountType)
+                    ? accountType
+                    : AccountType.SmartAccount;
+                SetPreferredAccount(preferredAccountType);
+            }
+            catch (Exception exception)
+            {
+                Debug.LogException(exception);
+            }
+        }
+
+        public void SetPreferredAccount(AccountType accountType)
+        {
+            Debug.Log($"SetPreferredAccount: {accountType}. Current: {PreferredAccountType}");
+            if (PreferredAccountType == accountType)
+                return;
+
+            SetPreferredAccountCore(accountType);
+            OnAccountChanged(new AccountChangedEventArgs(GetCurrentAccount()));
+        }
+
+        private void SetPreferredAccountCore(AccountType accountType)
+        {
+            if (PreferredAccountType == accountType)
+                return;
+
+            if (AppKit.NetworkController.ActiveChain == null)
+                return;
+
+            var chainId = AppKit.NetworkController.ActiveChain.ChainId;
+
+            // Find preferred account for the current chain
+            PreferredAccount = accountType == AccountType.SmartAccount
+                ? SmartAccounts.First(a => a.ChainId == chainId)
+                : EoaAccounts.First(a => a.ChainId == chainId);
+
+            PreferredAccountType = accountType;
+
+            // The preferred account type is saved so it can be recovered after the session is resumed
+            PlayerPrefs.SetString(PreferredAccountTypeKey, accountType.ToString());
+        }
+
+        protected override Account GetCurrentAccount()
+        {
+            return PreferredAccount != default
+                ? PreferredAccount
+                : base.GetCurrentAccount();
+        }
+    }
+
+    public enum AccountType
+    {
+        None,
+        SmartAccount,
+        Eoa
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs.meta b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs.meta
new file mode 100644
index 0000000..cbf6b2d
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2a2bd0c2228b46ad8e82d3bbb4e17e54
+timeCreated: 1737032736
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnector.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnector.cs
index 413f45e..d9bad9e 100644
--- a/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnector.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnector.cs
@@ -44,7 +44,7 @@ protected override Task InitializeAsyncCore(AppKitConfig config, SignClientUnity
 
         private void ActiveSessionChangedHandler(object sender, Session session)
         {
-            if (session == null)
+            if (session == null || IsAccountConnected)
                 return;
 
             var currentAccount = GetCurrentAccount();
@@ -53,6 +53,9 @@ private void ActiveSessionChangedHandler(object sender, Session session)
 
         private async void ActiveChainIdChangedHandler(object sender, SessionEvent<JToken> sessionEvent)
         {
+            if (!IsAccountConnected)
+                return;
+            
             if (sessionEvent.ChainId == "eip155:0")
                 return;
 
@@ -213,14 +216,13 @@ protected override Task<Account> GetAccountAsyncCore()
 
         protected override Task<Account[]> GetAccountsAsyncCore()
         {
-            var caipAddresses = _signClient.AddressProvider.AllAccounts();
-            return Task.FromResult(caipAddresses.Select(caip25Address => new Account(caip25Address.Address, caip25Address.ChainId)).ToArray());
+            var accounts = _signClient.AddressProvider.AllAccounts();
+            return Task.FromResult(accounts.ToArray());
         }
 
-        private Account GetCurrentAccount()
+        protected virtual Account GetCurrentAccount()
         {
-            var caipAddress = _signClient.AddressProvider.CurrentAccount();
-            return new Account(caipAddress.Address, caipAddress.ChainId);
+            return _signClient.AddressProvider.CurrentAccount();
         }
 
         private bool ActiveSessionSupportsMethod(string method)
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/ConnectorController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/ConnectorController.cs
index e0d6d33..b98932e 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/ConnectorController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/ConnectorController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Reown.AppKit.Unity.Profile;
 using Reown.Sign.Models;
 using Reown.Sign.Unity;
 using UnityEngine;
@@ -52,7 +53,7 @@ protected override async Task InitializeAsyncCore(AppKitConfig config, SignClien
             webGlConnector.AccountChanged += AccountChangedHandler;
             webGlConnector.ChainChanged += ChainChangedHandler;
 
-            _connectors.Add(ConnectorType.WebGl, webGlConnector);
+            RegisterConnector(ConnectorType.WebGl, webGlConnector);
             
             // Only one connector is supported on WebGL
             ActiveConnector = webGlConnector;
@@ -64,7 +65,16 @@ protected override async Task InitializeAsyncCore(AppKitConfig config, SignClien
             walletConnectConnector.AccountChanged += AccountChangedHandler;
             walletConnectConnector.ChainChanged += ChainChangedHandler;
             walletConnectConnector.SignatureRequested += SignatureRequestedHandler;
-            _connectors.Add(ConnectorType.WalletConnect, walletConnectConnector);
+            RegisterConnector(ConnectorType.WalletConnect, walletConnectConnector);
+
+            // --- Reown Profile Connector
+            var profileConnector = new ProfileConnector();
+            profileConnector.AccountConnected += (_, e) => ConnectorAccountConnected(profileConnector, e);
+            profileConnector.AccountDisconnected += ConnectorAccountDisconnectedHandler;
+            profileConnector.AccountChanged += AccountChangedHandler;
+            profileConnector.ChainChanged += ChainChangedHandler;
+            profileConnector.SignatureRequested += SignatureRequestedHandler;
+            RegisterConnector(ConnectorType.Profile, profileConnector);
 #endif
 
             await Task.WhenAll(_connectors.Values.Select(c => c.InitializeAsync(config, signClient)));
@@ -117,6 +127,11 @@ protected override Task<Account[]> GetAccountsAsyncCore()
             return ActiveConnector.GetAccountsAsync();
         }
 
+        public void RegisterConnector(ConnectorType connectorType, Connector connector)
+        {
+            _connectors.Add(connectorType, connector);
+        }
+
         public bool TryGetConnector<T>(ConnectorType connectorType, out T connector) where T : Connector
         {
             var ok = _connectors.TryGetValue(connectorType, out var uncasedConnector);
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
index f1a31f0..585725e 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
@@ -58,12 +58,12 @@ protected override void ConnectorChainChangedHandlerCore(object sender, Connecto
 
         protected override async void ConnectorAccountConnectedHandlerCore(object sender, Connector.AccountConnectedEventArgs e)
         {
-            var accounts = await e.GetAccounts();
+            var accounts = await e.GetAccountsAsync();
             var previousChain = ActiveChain;
 
             if (ActiveChain == null)
             {
-                var defaultAccount = await e.GetAccount();
+                var defaultAccount = await e.GetAccountAsync();
 
                 if (Chains.TryGetValue(defaultAccount.ChainId, out var defaultAccountChain))
                 {
@@ -87,7 +87,7 @@ protected override async void ConnectorAccountConnectedHandlerCore(object sender
             }
             else
             {
-                var defaultAccount = await e.GetAccount();
+                var defaultAccount = await e.GetAccountAsync();
                 if (defaultAccount.ChainId == ActiveChain.ChainId)
                     return;
 
diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
index 9e21e61..f1795a2 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
@@ -2,6 +2,7 @@
 using System.Numerics;
 using System.Threading.Tasks;
 using Reown.Sign.Unity;
+using UnityEngine;
 
 namespace Reown.AppKit.Unity
 {
@@ -25,20 +26,26 @@ public Task<BigInteger> GetBalanceAsync(string address)
 
         // -- Sign Message ---------------------------------------------
 
-        public Task<string> SignMessageAsync(string message)
+        public async Task<string> SignMessageAsync(string message, string address = null)
         {
             if (string.IsNullOrWhiteSpace(message))
                 throw new ArgumentNullException(nameof(message));
 
-            return SignMessageAsyncCore(message);
+            address ??= (await AppKit.GetAccountAsync()).Address;
+
+            Debug.Log($"SignMessageAsync: {message}, {address}");
+
+            return await SignMessageAsyncCore(message, address);
         }
 
-        public Task<string> SignMessageAsync(byte[] rawMessage)
+        public async Task<string> SignMessageAsync(byte[] rawMessage, string address = null)
         {
             if (rawMessage == null || rawMessage.Length == 0)
                 throw new ArgumentNullException(nameof(rawMessage));
 
-            return SignMessageAsyncCore(rawMessage);
+            address ??= (await AppKit.GetAccountAsync()).Address;
+
+            return await SignMessageAsyncCore(rawMessage, address);
         }
 
 
@@ -164,8 +171,8 @@ public Task<BigInteger> GetGasPriceAsync()
 
         protected abstract Task InitializeAsyncCore(SignClientUnity signClient);
         protected abstract Task<BigInteger> GetBalanceAsyncCore(string address);
-        protected abstract Task<string> SignMessageAsyncCore(string message);
-        protected abstract Task<string> SignMessageAsyncCore(byte[] rawMessage);
+        protected abstract Task<string> SignMessageAsyncCore(string message, string address);
+        protected abstract Task<string> SignMessageAsyncCore(byte[] rawMessage, string address);
         protected abstract Task<bool> VerifyMessageSignatureAsyncCore(string address, string message, string signature);
         protected abstract Task<string> SignTypedDataAsyncCore(string dataJson);
         protected abstract Task<bool> VerifyTypedDataSignatureAsyncCore(string address, string dataJson, string signature);
diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
index 7d3fbc1..ab5b8b3 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
@@ -142,16 +142,16 @@ protected override async Task<BigInteger> GetBalanceAsyncCore(string address)
 
         // -- Sign Message ---------------------------------------------
 
-        protected override async Task<string> SignMessageAsyncCore(string message)
+        protected override async Task<string> SignMessageAsyncCore(string message, string address)
         {
             var encodedMessage = message.ToHexUTF8();
-            return await Web3.Client.SendRequestAsync<string>("personal_sign", null, encodedMessage);
+            return await Web3.Client.SendRequestAsync<string>("personal_sign", null, encodedMessage, address);
         }
 
-        protected override Task<string> SignMessageAsyncCore(byte[] rawMessage)
+        protected override Task<string> SignMessageAsyncCore(byte[] rawMessage, string address)
         {
             var encodedMessage = rawMessage.ToHex(true);
-            return Web3.Client.SendRequestAsync<string>("personal_sign", null, encodedMessage);
+            return Web3.Client.SendRequestAsync<string>("personal_sign", null, encodedMessage, address);
         }
 
 
diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/WagmiEvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/WagmiEvmService.cs
index 95ccbe0..41fd7fa 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/WagmiEvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/WagmiEvmService.cs
@@ -20,14 +20,14 @@ protected override async Task<BigInteger> GetBalanceAsyncCore(string address)
              return BigInteger.Parse(result.value);
         }
 
-        protected override Task<string> SignMessageAsyncCore(string message)
+        protected override Task<string> SignMessageAsyncCore(string message, string address)
         {
-            return WagmiInterop.SignMessageAsync(message);
+            return WagmiInterop.SignMessageAsync(message, address);
         }
 
-        protected override Task<string> SignMessageAsyncCore(byte[] rawMessage)
+        protected override Task<string> SignMessageAsyncCore(byte[] rawMessage, string address)
         {
-            return WagmiInterop.SignMessageAsync(rawMessage);
+            return WagmiInterop.SignMessageAsync(rawMessage, address);
         }
 
         protected override Task<bool> VerifyMessageSignatureAsyncCore(string address, string message, string signature)
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
index d9aa738..e82aece 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using Reown.AppKit.Unity.Components;
+using Reown.AppKit.Unity.Profile;
 using Reown.AppKit.Unity.Utils;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -24,13 +25,13 @@ public override bool HeaderBorder
         private RemoteSprite<Image> _networkIcon;
         private RemoteSprite<Image> _avatar;
 
+        private ProfileConnector _profileConnector;
+
         public AccountPresenter(RouterController router, VisualElement parent) : base(router, parent)
         {
             View.ExplorerButton.Clicked += OnBlockExplorerButtonClick;
             View.CopyLink.Clicked += OnCopyAddressButtonClick;
-
-            InitializeButtons(View.Buttons);
-
+            
             AppKit.AccountController.PropertyChanged += AccountPropertyChangedHandler;
             AppKit.NetworkController.ChainChanged += ChainChangedHandler;
         }
@@ -69,9 +70,23 @@ private void ChainChangedHandler(object sender, NetworkController.ChainChangedEv
         protected virtual void CreateButtons(VisualElement buttonsListView)
         {
             CreateNetworkButton(buttonsListView);
+            CreateSmartAccountToggleButton(buttonsListView);
             CreateDisconnectButton(buttonsListView);
         }
 
+        protected virtual void CreateSmartAccountToggleButton(VisualElement buttonsListView)
+        {
+            if (AppKit.ConnectorController.ActiveConnector is not ProfileConnector)
+                return;
+
+            _profileConnector = (ProfileConnector)AppKit.ConnectorController.ActiveConnector;
+
+            var icon = Resources.Load<VectorImage>("Reown/AppKit/Icons/icon_bold_swaphorizontal");
+            var smartAccountButton = new ListItem("Smart Account", OnSmartAccountButtonClick, icon, ListItem.IconType.Circle);
+            Buttons.Add(smartAccountButton);
+            buttonsListView.Add(smartAccountButton);
+        }
+
         protected virtual void CreateNetworkButton(VisualElement buttonsListView)
         {
             _networkButton = new ListItem("Network", OnNetworkButtonClick, null, ListItem.IconType.Circle)
@@ -124,6 +139,9 @@ protected virtual void UpdateProfileAvatar()
         protected override void OnVisibleCore()
         {
             base.OnVisibleCore();
+            Debug.Log("AccountPresenter.OnVisibleCore");
+            View.Buttons.Clear();
+            InitializeButtons(View.Buttons);
             UpdateNetworkButton(AppKit.NetworkController.ActiveChain);
         }
 
@@ -167,6 +185,16 @@ protected virtual async void OnDisconnectButtonClick()
             }
         }
 
+        private void OnSmartAccountButtonClick()
+        {
+            var currentAccountType = _profileConnector.PreferredAccountType;
+            var newAccountType = currentAccountType == AccountType.SmartAccount
+                ? AccountType.Eoa
+                : AccountType.SmartAccount;
+
+            _profileConnector.SetPreferredAccount(newAccountType);
+        }
+
         protected virtual void OnNetworkButtonClick()
         {
             Router.OpenView(ViewType.NetworkSearch);
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
index 3be8615..6b23afe 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
@@ -1,4 +1,5 @@
 using System;
+using Reown.AppKit.Unity.Profile;
 using Reown.AppKit.Unity.Views.WebWalletView;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -20,9 +21,9 @@ protected override void OnVisibleCore()
             base.OnVisibleCore();
 
             if (!AppKit.ConnectorController
-                    .TryGetConnector<WalletConnectConnector>
-                        (ConnectorType.WalletConnect, out var connector))
-                throw new Exception("No WC connector"); // TODO: use custom exception
+                    .TryGetConnector<ProfileConnector>
+                        (ConnectorType.Profile, out var connector))
+                throw new Exception("No profiles connector"); // TODO: use custom exception
 
             _connectionProposal = (WalletConnectConnectionProposal)connector.Connect();
 
diff --git a/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiInterop.cs b/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiInterop.cs
index 6a2c417..5979455 100644
--- a/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiInterop.cs
+++ b/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiInterop.cs
@@ -96,24 +96,26 @@ public static Task DisconnectAsync()
         
 
         // -- Sign Message ---------------------------------------------
-        public static Task<string> SignMessageAsync(string message)
+        public static Task<string> SignMessageAsync(string message, string address)
         {
             var parameter = new SignMessageParameter
             {
-                message = message
+                message = message,
+                account = address
             };
 
             return SignMessageAsync(parameter);
         }
 
-        public static Task<string> SignMessageAsync(byte[] rawMessage)
+        public static Task<string> SignMessageAsync(byte[] rawMessage, string address)
         {
             var parameter = new SignRawMessageParameter
             {
                 message = new
                 {
                     raw = rawMessage
-                }
+                },
+                account = address
             };
 
             return InteropCallAsync<SignRawMessageParameter, string>(WagmiMethods.SignMessage, parameter);
diff --git a/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiModel.cs b/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiModel.cs
index 550c96d..8157fd7 100644
--- a/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiModel.cs
+++ b/src/Reown.AppKit.Unity/Runtime/WebGL/Wagmi/WagmiModel.cs
@@ -19,12 +19,14 @@ public class GetBalanceReturnType
     public class SignMessageParameter
     {
         public string message;
+        public string account;
     }
 
     [Serializable]
     public class SignRawMessageParameter
     {
         public object message;
+        public string account;
     }
 
     [Serializable]
diff --git a/src/Reown.Core/Runtime/Controllers/TypedMessageHandler.cs b/src/Reown.Core/Runtime/Controllers/TypedMessageHandler.cs
index f9b9bcc..7735049 100644
--- a/src/Reown.Core/Runtime/Controllers/TypedMessageHandler.cs
+++ b/src/Reown.Core/Runtime/Controllers/TypedMessageHandler.cs
@@ -366,6 +366,8 @@ public async Task<long> SendRequest<T, TR>(string topic, T parameters, long? exp
 
             var payload = new JsonRpcRequest<T>(method, parameters, messageId);
 
+            ReownLogger.Log($"Send Request: {JsonConvert.SerializeObject(payload, Formatting.Indented)}");
+
             var message = await CoreClient.Crypto.Encode(topic, payload, options);
 
             var opts = RpcRequestOptionsFromType<T, TR>();
diff --git a/src/Reown.Sign.Nethereum/Runtime/ReownInterceptor.cs b/src/Reown.Sign.Nethereum/Runtime/ReownInterceptor.cs
index d1a2586..8f8f9c9 100644
--- a/src/Reown.Sign.Nethereum/Runtime/ReownInterceptor.cs
+++ b/src/Reown.Sign.Nethereum/Runtime/ReownInterceptor.cs
@@ -50,16 +50,18 @@ public override async Task<object> InterceptSendRequestAsync<T>(
 
                 if (request.Method == ApiMethods.personal_sign.ToString())
                 {
-                    return await _reownSignService.PersonalSignAsync((string)request.RawParameters[0]);
+                    if (request.RawParameters.Length == 1)
+                        return await _reownSignService.PersonalSignAsync((string)request.RawParameters[0]);
+
+                    return await _reownSignService.PersonalSignAsync((string)request.RawParameters[0], (string)request.RawParameters[1]);
                 }
 
                 if (request.Method == ApiMethods.eth_signTypedData_v4.ToString())
                 {
-                    // If parameter has only one element, it's a json data.
-                    // Otherwise, expect the data to be at index 1
-                    var dataIndex = request.RawParameters.Length > 1 ? 1 : 0;
-                    
-                    return await _reownSignService.EthSignTypedDataV4Async((string)request.RawParameters[dataIndex]);
+                    if (request.RawParameters.Length == 1)
+                        return await _reownSignService.EthSignTypedDataV4Async((string)request.RawParameters[0]);
+
+                    return await _reownSignService.EthSignTypedDataV4Async((string)request.RawParameters[1], (string)request.RawParameters[0]);
                 }
 
                 if (request.Method == ApiMethods.wallet_switchEthereumChain.ToString())
@@ -105,12 +107,18 @@ public override async Task<object> InterceptSendRequestAsync<T>(
 
                 if (method == ApiMethods.personal_sign.ToString())
                 {
-                    return await _reownSignService.PersonalSignAsync((string)paramList[0]);
+                    if (paramList.Length == 1)
+                        return await _reownSignService.PersonalSignAsync((string)paramList[0]);
+
+                    return await _reownSignService.PersonalSignAsync((string)paramList[0], (string)paramList[1]);
                 }
 
                 if (method == ApiMethods.eth_signTypedData_v4.ToString())
                 {
-                    return await _reownSignService.EthSignTypedDataV4Async((string)paramList[0]);
+                    if (paramList.Length == 1)
+                        return await _reownSignService.EthSignTypedDataV4Async((string)paramList[0]);
+
+                    return await _reownSignService.EthSignTypedDataV4Async((string)paramList[1], (string)paramList[0]);
                 }
 
                 if (method == ApiMethods.wallet_switchEthereumChain.ToString())
diff --git a/src/Reown.Sign.Nethereum/Runtime/ReownSignService.cs b/src/Reown.Sign.Nethereum/Runtime/ReownSignService.cs
index 12d61bd..b689915 100644
--- a/src/Reown.Sign.Nethereum/Runtime/ReownSignService.cs
+++ b/src/Reown.Sign.Nethereum/Runtime/ReownSignService.cs
@@ -23,18 +23,18 @@ public Task<object> SendTransactionAsync(TransactionInput transaction)
             return SendTransactionAsyncCore(transaction);
         }
 
-        public Task<object> PersonalSignAsync(string message)
+        public Task<object> PersonalSignAsync(string message, string address = null)
         {
             if (string.IsNullOrEmpty(message))
                 throw new System.ArgumentException("Message cannot be null or empty", nameof(message));
-            return PersonalSignAsyncCore(message);
+            return PersonalSignAsyncCore(message, address);
         }
 
-        public Task<object> EthSignTypedDataV4Async(string data)
+        public Task<object> EthSignTypedDataV4Async(string data, string address = null)
         {
             if (string.IsNullOrEmpty(data))
                 throw new System.ArgumentException("Data cannot be null or empty", nameof(data));
-            return EthSignTypedDataV4AsyncCore(data);
+            return EthSignTypedDataV4AsyncCore(data, address);
         }
 
         public Task<object> WalletSwitchEthereumChainAsync(SwitchEthereumChainParameter chainId)
@@ -49,8 +49,8 @@ public Task<object> WalletAddEthereumChainAsync(AddEthereumChainParameter chain)
 
         protected abstract bool IsMethodSupportedCore(string method);
         protected abstract Task<object> SendTransactionAsyncCore(TransactionInput transaction);
-        protected abstract Task<object> PersonalSignAsyncCore(string message);
-        protected abstract Task<object> EthSignTypedDataV4AsyncCore(string data);
+        protected abstract Task<object> PersonalSignAsyncCore(string message, string address = null);
+        protected abstract Task<object> EthSignTypedDataV4AsyncCore(string data, string address = null);
         protected abstract Task<object> WalletSwitchEthereumChainAsyncCore(SwitchEthereumChainParameter chainId);
         protected abstract Task<object> WalletAddEthereumChainAsyncCore(AddEthereumChainParameter chain);
     }
diff --git a/src/Reown.Sign.Nethereum/Runtime/ReownSignServiceCore.cs b/src/Reown.Sign.Nethereum/Runtime/ReownSignServiceCore.cs
index a2bc10c..009a9ba 100644
--- a/src/Reown.Sign.Nethereum/Runtime/ReownSignServiceCore.cs
+++ b/src/Reown.Sign.Nethereum/Runtime/ReownSignServiceCore.cs
@@ -55,16 +55,16 @@ protected override async Task<object> SendTransactionAsyncCore(TransactionInput
             return await _signClient.Request<EthSendTransaction, string>(sendTransactionRequest);
         }
 
-        protected override async Task<object> PersonalSignAsyncCore(string message)
+        protected override async Task<object> PersonalSignAsyncCore(string message, string address = null)
         {
-            var address = GetDefaultAddress();
+            address ??= GetDefaultAddress();
             var signDataRequest = new PersonalSign(message, address);
             return await _signClient.Request<PersonalSign, string>(signDataRequest);
         }
 
-        protected override async Task<object> EthSignTypedDataV4AsyncCore(string data)
+        protected override async Task<object> EthSignTypedDataV4AsyncCore(string data, string address = null)
         {
-            var address = GetDefaultAddress();
+            address ??= GetDefaultAddress();
             var signDataRequest = new EthSignTypedDataV4(address, data);
             return await _signClient.Request<EthSignTypedDataV4, string>(signDataRequest);
         }
diff --git a/src/Reown.Sign/Runtime/Models/Account.cs b/src/Reown.Sign/Runtime/Models/Account.cs
index f90440b..c04ac69 100644
--- a/src/Reown.Sign/Runtime/Models/Account.cs
+++ b/src/Reown.Sign/Runtime/Models/Account.cs
@@ -3,6 +3,7 @@
 namespace Reown.Sign.Models
 {
     // https://chainagnostic.org/CAIPs/caip-10
+    [Serializable]
     public readonly struct Account : IEquatable<Account>
     {
         public string Address { get; }
@@ -43,16 +44,12 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            unchecked
-            {
-                return (Address != null ? Address.GetHashCode() : 0) * 397 ^
-                       (ChainId != null ? ChainId.GetHashCode() : 0);
-            }
+            return AccountId.GetHashCode();
         }
 
         public static bool operator ==(Account left, Account right)
         {
-            return left.Equals(right);
+            return string.Equals(left.AccountId, right.AccountId, StringComparison.InvariantCultureIgnoreCase);
         }
 
         public static bool operator !=(Account left, Account right)

From c878200dcff868f069bc61699a4737850998166a Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Thu, 23 Jan 2025 15:28:46 +0000
Subject: [PATCH 03/21] =?UTF-8?q?Fix=20incorrect=20default=20chain=20when?=
 =?UTF-8?q?=20the=20first=20supported=20chain=20isn=E2=80=99t=20Ethereum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WalletConnect/WalletConnectConnectionProposal.cs        | 6 +++++-
 .../Controllers/NetworkController/NetworkControllerCore.cs  | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnectionProposal.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnectionProposal.cs
index 40b48db..c1d3959 100644
--- a/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnectionProposal.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/WalletConnect/WalletConnectConnectionProposal.cs
@@ -79,10 +79,14 @@ private async void SessionAuthenticatedHandler(object sender, SessionAuthenticat
             }
         }
 
-        private void SessionConnectedHandler(object sender, Session e)
+        private async void SessionConnectedHandler(object sender, Session e)
         {
             IsSignarureRequested = _siweController.IsEnabled;
             IsConnected = true;
+
+            var activeChain = AppKit.NetworkController.ActiveChain;
+            if (activeChain != null)
+                await _client.AddressProvider.SetDefaultChainIdAsync(activeChain.ChainId);
             connected?.Invoke(this);
         }
 
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
index 585725e..253e9b8 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/NetworkController/NetworkControllerCore.cs
@@ -10,9 +10,10 @@ public class NetworkControllerCore : NetworkController
     {
         protected override Task InitializeAsyncCore(IEnumerable<Chain> supportedChains)
         {
-            Chains = new ReadOnlyDictionary<string, Chain>(supportedChains.ToDictionary(c => c.ChainId, c => c));
+            var supportedChainsArray = supportedChains.ToArray();
+            Chains = new ReadOnlyDictionary<string, Chain>(supportedChainsArray.ToDictionary(c => c.ChainId, c => c));
 
-            ActiveChain = null;
+            ActiveChain = supportedChainsArray[0];
 
             return Task.CompletedTask;
         }

From 3d7576155cdca343e2f1c52c4ca44a6992c1452a Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Fri, 24 Jan 2025 17:58:03 +0200
Subject: [PATCH 04/21] test login with twitter

---
 .../Assets/Scripts/AppKitInit.cs              | 39 +++++++++++--------
 .../Reown.AppKit.Unity/Assets/Scripts/Dapp.cs | 29 +++++++-------
 .../Views/WebWalletView/WebWalletView.uxml    | 12 ++++++
 .../Runtime/Presenters/AccountPresenter.cs    |  1 -
 .../Runtime/Presenters/WebWalletPresenter.cs  | 22 ++++++++++-
 .../Views/WebWalletView/WebWalletView.cs      | 16 ++++++++
 6 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
index d6c33d7..e62405d 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
@@ -21,20 +21,20 @@ private async void Start()
             // Set up Reown logger to collect logs from AppKit
             ReownLogger.Instance = new UnityLogger();
 
-            // The very basic configuration of SIWE
-            var siweConfig = new SiweConfig
-            {
-                GetMessageParams = () => new SiweMessageParams
-                {
-                    Domain = "example.com",
-                    Uri = "https://example.com/login"
-                },
-                SignOutOnChainChange = false
-            };
-
-            // Subscribe to SIWE events
-            siweConfig.SignInSuccess += _ => Debug.Log("[Dapp] SIWE Sign In Success!");
-            siweConfig.SignOutSuccess += () => Debug.Log("[Dapp] SIWE Sign Out Success!");
+            // // The very basic configuration of SIWE
+            // var siweConfig = new SiweConfig
+            // {
+            //     GetMessageParams = () => new SiweMessageParams
+            //     {
+            //         Domain = "example.com",
+            //         Uri = "https://example.com/login"
+            //     },
+            //     SignOutOnChainChange = false
+            // };
+            //
+            // // Subscribe to SIWE events
+            // siweConfig.SignInSuccess += _ => Debug.Log("[Dapp] SIWE Sign In Success!");
+            // siweConfig.SignOutSuccess += () => Debug.Log("[Dapp] SIWE Sign Out Success!");
 
             // AppKit configuration
             var appKitConfig = new AppKitConfig
@@ -52,9 +52,16 @@ private async void Start()
                         Native = "appkit-sample-unity://"
                     }
                 ),
-                customWallets = GetCustomWallets(),
+                // customWallets = GetCustomWallets(),
                 // On mobile show 5 wallets on the Connect view (the first AppKit modal screen)
-                connectViewWalletsCountMobile = 5,
+                // connectViewWalletsCountMobile = 5,
+                supportedChains = new[]
+                {
+                    ChainConstants.Chains.Optimism,
+                    ChainConstants.Chains.Ethereum,
+                    ChainConstants.Chains.Arbitrum,
+                    ChainConstants.Chains.Base
+                }
                 // Assign the SIWE configuration created above. Can be null if SIWE is not used.
                 // siweConfig = siweConfig
             };
diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
index 0aa9e51..703289d 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
@@ -5,6 +5,7 @@
 using Nethereum.JsonRpc.Client;
 using Nethereum.Web3;
 using Reown.AppKit.Unity;
+using Reown.AppKit.Unity.Profile;
 using Reown.Core;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -55,12 +56,12 @@ private void BuildButtons()
                     OnClick = OnPersonalSignButton,
                     AccountRequired = true
                 },
-                new ButtonStruct
-                {
-                    Text = "Sign Typed Data",
-                    OnClick = OnSignTypedDataV4Button,
-                    AccountRequired = true
-                },
+                // new ButtonStruct
+                // {
+                //     Text = "Sign Typed Data",
+                //     OnClick = OnSignTypedDataV4Button,
+                //     AccountRequired = true
+                // },
                 new ButtonStruct
                 {
                     Text = "Send Transaction",
@@ -77,7 +78,7 @@ private void BuildButtons()
                 {
                     Text = "Read Contract",
                     OnClick = OnReadContractClicked,
-                    AccountRequired = true,
+                    // AccountRequired = true,
                     ChainIds = new HashSet<string>
                     {
                         "eip155:1"
@@ -335,13 +336,13 @@ public async void OnSignTypedDataV4Button()
 
         public async void OnReadContractClicked()
         {
-            if (AppKit.NetworkController.ActiveChain.ChainId != "eip155:1")
-            {
-                Notification.ShowMessage("Please switch to Ethereum mainnet.");
-                return;
-            }
+            // if (AppKit.NetworkController.ActiveChain.ChainId != "eip155:1")
+            // {
+            //     Notification.ShowMessage("Please switch to Ethereum mainnet.");
+            //     return;
+            // }
 
-            const string contractAddress = "0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb"; // on Ethereum mainnet
+            const string contractAddress = "0x64b88c73A5DfA78D1713fE1b4c69a22d7E0faAa7";
             const string yugaLabsAddress = "0xA858DDc0445d8131daC4d1DE01f834ffcbA52Ef1";
             const string abi = CryptoPunksAbi;
 
@@ -356,7 +357,7 @@ public async void OnReadContractClicked()
                 {
                     yugaLabsAddress
                 });
-                var result = $"Yuga Labs owns: {balance} {tokenName} tokens active chain.";
+                var result = $"Yuga Labs owns: {balance} {tokenName} tokens at active chain.";
 
                 Notification.ShowMessage(result);
             }
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
index 3f808df..eee0e79 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/WebWalletView/WebWalletView.uxml
@@ -8,11 +8,23 @@
                                             variant="Gray"
                                             icon="Reown/AppKit/Icons/icon_bold_externallink"
         />
+        <Reown.AppKit.Unity.Components.Link name="web-wallet-view__x-local"
+                                            text="X via Localhost"
+                                            size="Small"
+                                            variant="Gray"
+                                            icon="Reown/AppKit/Icons/icon_bold_externallink"
+        />
         <Reown.AppKit.Unity.Components.Link name="web-wallet-view__google-deployment"
                                             text="Google via Deployment"
                                             size="Small"
                                             variant="Gray"
                                             icon="Reown/AppKit/Icons/icon_bold_externallink"
         />
+        <Reown.AppKit.Unity.Components.Link name="web-wallet-view__x-deployment"
+                                            text="X via Deployment"
+                                            size="Small"
+                                            variant="Gray"
+                                            icon="Reown/AppKit/Icons/icon_bold_externallink"
+        />
     </ui:VisualElement>
 </ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
index e82aece..a59e9bf 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
@@ -139,7 +139,6 @@ protected virtual void UpdateProfileAvatar()
         protected override void OnVisibleCore()
         {
             base.OnVisibleCore();
-            Debug.Log("AccountPresenter.OnVisibleCore");
             View.Buttons.Clear();
             InitializeButtons(View.Buttons);
             UpdateNetworkButton(AppKit.NetworkController.ActiveChain);
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
index 6b23afe..3fcf6c1 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/WebWalletPresenter.cs
@@ -13,7 +13,9 @@ public class WebWalletPresenter : Presenter<WebWalletView>
         public WebWalletPresenter(RouterController router, VisualElement parent, bool hideView = true) : base(router, parent, hideView)
         {
             View.GoogleLocalClicked += OnGoogleLocalClicked;
+            View.XLocalClicked += OnXLocalClicked;
             View.GoogleDeployClicked += OnGoogleDeployClicked;
+            View.XDeployClicked += OnXDeployClicked;
         }
 
         protected override void OnVisibleCore()
@@ -38,7 +40,15 @@ private void ConnectionUpdatedHandler(ConnectionProposal obj)
         private void OnGoogleLocalClicked()
         {
             var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
-            var url = $"http://localhost:5173/wc?uri={encodedWcUrl}";
+            var url = $"http://localhost:5173/wc?uri={encodedWcUrl}&provider=google";
+            Debug.Log($"Opening URL: {url}");
+            Application.OpenURL(url);
+        }
+
+        private void OnXLocalClicked()
+        {
+            var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
+            var url = $"http://localhost:5173/wc?uri={encodedWcUrl}&provider=x";
             Debug.Log($"Opening URL: {url}");
             Application.OpenURL(url);
         }
@@ -46,7 +56,15 @@ private void OnGoogleLocalClicked()
         private void OnGoogleDeployClicked()
         {
             var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
-            var url = $"https://reown.com/wc?uri={encodedWcUrl}"; // TODO: set vercel url
+            var url = $"https://web-wallet-app-omega.vercel.app/wc?uri={encodedWcUrl}&provider=google";
+            Debug.Log($"Opening URL: {url}");
+            Application.OpenURL(url);
+        }
+
+        private void OnXDeployClicked()
+        {
+            var encodedWcUrl = Uri.EscapeDataString(_connectionProposal.Uri);
+            var url = $"https://web-wallet-app-omega.vercel.app/wc?uri={encodedWcUrl}&provider=x";
             Debug.Log($"Opening URL: {url}");
             Application.OpenURL(url);
         }
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
index 0ebb426..f2aca2e 100644
--- a/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Views/WebWalletView/WebWalletView.cs
@@ -13,7 +13,9 @@ public class WebWalletView : VisualElement
         private readonly Label _loadingLabel;
         private readonly VisualElement _buttons;
         private readonly Link _googleLocal;
+        private readonly Link _xLocal;
         private readonly Link _googleDeploy;
+        private readonly Link _xDeploy;
 
         public event Action GoogleLocalClicked
         {
@@ -21,12 +23,24 @@ public event Action GoogleLocalClicked
             remove => _googleLocal.Clicked -= value;
         }
 
+        public event Action XLocalClicked
+        {
+            add => _xLocal.Clicked += value;
+            remove => _xLocal.Clicked -= value;
+        }
+
         public event Action GoogleDeployClicked
         {
             add => _googleDeploy.Clicked += value;
             remove => _googleDeploy.Clicked -= value;
         }
 
+        public event Action XDeployClicked
+        {
+            add => _xDeploy.Clicked += value;
+            remove => _xDeploy.Clicked -= value;
+        }
+
         public new class UxmlFactory : UxmlFactory<WebWalletView>
         {
         }
@@ -46,7 +60,9 @@ public WebWalletView(string visualTreePath)
             _loadingLabel = this.Q<Label>("web-wallet-view__loading-label");
             _buttons = this.Q<VisualElement>("web-wallet-view__buttons");
             _googleLocal = this.Q<Link>("web-wallet-view__google-local");
+            _xLocal = this.Q<Link>("web-wallet-view__x-local");
             _googleDeploy = this.Q<Link>("web-wallet-view__google-deployment");
+            _xDeploy = this.Q<Link>("web-wallet-view__x-deployment");
 
             Debug.Log("Is local google button null? " + (_googleLocal == null));
 

From 06505e0be11cd38c81ab4f0e5848ecf5d05c634f Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 27 Jan 2025 11:04:45 +0200
Subject: [PATCH 05/21] Fix font weights

---
 .../Fonts & Materials/Inter/Inter-Regular SDF.asset         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Resources/Fonts & Materials/Inter/Inter-Regular SDF.asset b/src/Reown.AppKit.Unity/Resources/Fonts & Materials/Inter/Inter-Regular SDF.asset
index 7b2096f..61d6b21 100644
--- a/src/Reown.AppKit.Unity/Resources/Fonts & Materials/Inter/Inter-Regular SDF.asset	
+++ b/src/Reown.AppKit.Unity/Resources/Fonts & Materials/Inter/Inter-Regular SDF.asset	
@@ -2696,11 +2696,11 @@ MonoBehaviour:
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 11400000, guid: 2874db8c458054fa9a7c0a459981b379, type: 2}
     italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 11400000, guid: 13ca5dd63df1340ddbe089ae80e658ab, type: 2}
     italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 11400000, guid: 9ba5c39bac3324e6f83d07c1157e1476, type: 2}
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}

From d0235ba27077e5e060c839f65a2c9967fecc3106 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 27 Jan 2025 11:23:22 +0200
Subject: [PATCH 06/21] Improve account switching UI

---
 .../AppKit/Components/ListItem/ListItem.uss   |  8 +++++
 .../Runtime/Components/ListItem.cs            | 13 +++++---
 .../Connectors/Profile/ProfileConnector.cs    | 23 +++++++++++++
 .../Runtime/Controllers/EventsController.cs   |  1 -
 .../Runtime/Presenters/AccountPresenter.cs    | 32 ++++++++++++++++---
 5 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ListItem/ListItem.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ListItem/ListItem.uss
index 8cc6b41..68c7308 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ListItem/ListItem.uss
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ListItem/ListItem.uss
@@ -67,6 +67,10 @@
     background-color: var(--ro-accent-glass-020);
 }
 
+.list-item--icon-style-default #list-item__icon-container {
+    background-color: var(--ro-gray-glass-010);
+}
+
 #list-item__icon-container > Image {
     --unity-image-tint-color: white;
 }
@@ -75,6 +79,10 @@
     --unity-image-tint-color: var(--ro-color-accent-100);
 }
 
+.list-item--icon-style-default #list-item__icon-container > Image {
+    --unity-image-tint-color: var(--ro-color-fg-200);
+}
+
 .list-item--icon-style-error #list-item__icon-container {
     background-color: var(--ro-color-bg-error-100);
 }
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/ListItem.cs b/src/Reown.AppKit.Unity/Runtime/Components/ListItem.cs
index f4e4f0c..86d67d3 100644
--- a/src/Reown.AppKit.Unity/Runtime/Components/ListItem.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Components/ListItem.cs
@@ -19,6 +19,7 @@ public class ListItem : VisualElement
         public static readonly string ClassIconVariantCircle = $"{Name}--icon-variant-circle";
         public static readonly string ClassIconStyleAccent = $"{Name}--icon-style-accent";
         public static readonly string ClassIconStyleError = $"{Name}--icon-style-error";
+        public static readonly string ClassIconStyleDefault = $"{Name}--icon-style-default";
 
         public new class UxmlFactory : UxmlFactory<ListItem>
         {
@@ -80,7 +81,7 @@ public ListItem(
             Action clickEvent,
             VectorImage fallbackIcon = null,
             IconType iconType = IconType.Square,
-            IconStyle iconStyle = IconStyle.Default,
+            IconStyle iconStyle = IconStyle.None,
             StatusIconType statusIconType = StatusIconType.None)
         {
             Build(label, clickEvent, fallbackIcon, iconType, iconStyle, statusIconType);
@@ -97,7 +98,7 @@ public ListItem(
             Action clickEvent,
             VectorImage fallbackIcon = null,
             IconType iconType = IconType.Square,
-            IconStyle iconStyle = IconStyle.Default,
+            IconStyle iconStyle = IconStyle.None,
             StatusIconType statusIconType = StatusIconType.None)
         {
             Build(label, clickEvent, fallbackIcon, iconType, iconStyle, statusIconType);
@@ -110,7 +111,7 @@ public ListItem(
             Action clickEvent,
             VectorImage fallbackIcon = null,
             IconType iconType = IconType.Square,
-            IconStyle iconStyle = IconStyle.Default,
+            IconStyle iconStyle = IconStyle.None,
             StatusIconType statusIconType = StatusIconType.None)
         {
             Build(label, clickEvent, fallbackIcon, iconType, iconStyle, statusIconType);
@@ -132,7 +133,7 @@ private void Build(
             Action clickEvent,
             VectorImage fallbackIcon = null,
             IconType iconType = IconType.Square,
-            IconStyle iconStyle = IconStyle.Default,
+            IconStyle iconStyle = IconStyle.None,
             StatusIconType statusIconType = StatusIconType.None)
         {
             var asset = Resources.Load<VisualTreeAsset>("Reown/AppKit/Components/ListItem/ListItem");
@@ -185,7 +186,10 @@ public void ApplyIconStyle(IconStyle iconStyle)
 
             switch (iconStyle)
             {
+                case IconStyle.None:
+                    break;
                 case IconStyle.Default:
+                    _iconStyleClass = ClassIconStyleDefault;
                     break;
                 case IconStyle.Accent:
                     _iconStyleClass = ClassIconStyleAccent;
@@ -224,6 +228,7 @@ public enum IconType
 
         public enum IconStyle
         {
+            None,
             Default,
             Accent,
             Error
diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
index 10961d5..1071597 100644
--- a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
@@ -104,4 +104,27 @@ public enum AccountType
         SmartAccount,
         Eoa
     }
+
+    public static class AccountTypeExtensions
+    {
+        public static string ToFriendlyString(this AccountType accountType)
+        {
+            return accountType switch
+            {
+                AccountType.SmartAccount => "Smart Account",
+                AccountType.Eoa => "EOA",
+                _ => "Unknown"
+            };
+        }
+
+        public static string ToShortString(this AccountType accountType)
+        {
+            return accountType switch
+            {
+                AccountType.SmartAccount => "SA",
+                AccountType.Eoa => "EOA",
+                _ => "Unknown"
+            };
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/EventsController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/EventsController.cs
index af10623..048b114 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/EventsController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/EventsController.cs
@@ -55,7 +55,6 @@ public async void SendEvent(Event @event)
         {
             try
             {
-                Debug.Log($"Send Event {@event.name}. State: {_state.ToString()}");
                 if (_state == AnalyticsState.Disabled)
                     return;
 
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
index a59e9bf..89f8823 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
@@ -22,6 +22,7 @@ public override bool HeaderBorder
 
         private bool _disposed;
         private ListItem _networkButton;
+        private ListItem _smartAccountButton;
         private RemoteSprite<Image> _networkIcon;
         private RemoteSprite<Image> _avatar;
 
@@ -81,10 +82,14 @@ protected virtual void CreateSmartAccountToggleButton(VisualElement buttonsListV
 
             _profileConnector = (ProfileConnector)AppKit.ConnectorController.ActiveConnector;
 
+            var anotherAccountType = _profileConnector.PreferredAccountType == AccountType.SmartAccount
+                ? AccountType.Eoa.ToFriendlyString()
+                : AccountType.SmartAccount.ToFriendlyString();
+
             var icon = Resources.Load<VectorImage>("Reown/AppKit/Icons/icon_bold_swaphorizontal");
-            var smartAccountButton = new ListItem("Smart Account", OnSmartAccountButtonClick, icon, ListItem.IconType.Circle);
-            Buttons.Add(smartAccountButton);
-            buttonsListView.Add(smartAccountButton);
+            _smartAccountButton = new ListItem($"Switch to your {anotherAccountType}", OnSmartAccountButtonClick, icon, ListItem.IconType.Circle, ListItem.IconStyle.Default);
+            Buttons.Add(_smartAccountButton);
+            buttonsListView.Add(_smartAccountButton);
         }
 
         protected virtual void CreateNetworkButton(VisualElement buttonsListView)
@@ -103,7 +108,7 @@ protected virtual void CreateNetworkButton(VisualElement buttonsListView)
         protected virtual void CreateDisconnectButton(VisualElement buttonsListView)
         {
             var disconnectIcon = Resources.Load<VectorImage>("Reown/AppKit/Icons/icon_medium_disconnect");
-            var disconnectButton = new ListItem("Disconnect", OnDisconnectButtonClick, disconnectIcon, ListItem.IconType.Circle, ListItem.IconStyle.Accent);
+            var disconnectButton = new ListItem("Disconnect", OnDisconnectButtonClick, disconnectIcon, ListItem.IconType.Circle, ListItem.IconStyle.Default);
             Buttons.Add(disconnectButton);
             buttonsListView.Add(disconnectButton);
         }
@@ -146,6 +151,9 @@ protected override void OnVisibleCore()
 
         private void UpdateNetworkButton(Chain chain)
         {
+            if (_networkButton == null)
+                return;
+            
             if (chain == null)
             {
                 _networkButton.Label = "Network";
@@ -164,7 +172,7 @@ private void UpdateNetworkButton(Chain chain)
             _networkIcon.SubscribeImage(_networkButton.IconImageElement);
             _networkButton.IconImageElement.style.display = DisplayStyle.Flex;
             _networkButton.IconFallbackElement.style.display = DisplayStyle.None;
-            _networkButton.ApplyIconStyle(ListItem.IconStyle.Default);
+            _networkButton.ApplyIconStyle(ListItem.IconStyle.None);
         }
 
         protected virtual async void OnDisconnectButtonClick()
@@ -192,6 +200,20 @@ private void OnSmartAccountButtonClick()
                 : AccountType.SmartAccount;
 
             _profileConnector.SetPreferredAccount(newAccountType);
+
+            _smartAccountButton.Label = $"Switch to your {currentAccountType.ToFriendlyString()}";
+
+            AppKit.NotificationController.Notify(NotificationType.Success, $"Switched to {newAccountType.ToFriendlyString()}");
+
+            AppKit.EventsController.SendEvent(new Event
+            {
+                name = "SET_PREFERRED_ACCOUNT_TYPE",
+                properties = new Dictionary<string, object>
+                {
+                    { "network", AppKit.NetworkController.ActiveChain.Name.ToLowerInvariant() },
+                    { "accountType", newAccountType.ToShortString() }
+                }
+            });
         }
 
         protected virtual void OnNetworkButtonClick()

From dbf8afa87266faa23e789a7d75468ebd97041535 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 27 Jan 2025 15:00:51 +0200
Subject: [PATCH 07/21] Rename web wallet button

---
 src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
index dcf3fb8..2f81b58 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/ConnectPresenter.cs
@@ -60,7 +60,7 @@ protected virtual async Task RebuildAsync()
         protected virtual async Task BuildAsync()
         {
             // todo:
-            var listItem = new ListItem("Web wallet", () => Router.OpenView(ViewType.WebWallet));
+            var listItem = new ListItem("Social Login", () => Router.OpenView(ViewType.WebWallet));
             listItem.RightSlot.Add(new Tag("ALPHA", Tag.TagType.Accent));
             View.Add(listItem);
             

From 6ddf588dc9d169437007842c925506403863d2ee Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 29 Jan 2025 11:27:57 +0200
Subject: [PATCH 08/21] =?UTF-8?q?AccountView=20=E2=86=92=20AccountSettings?=
 =?UTF-8?q?View?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Scripts/AppInit.cs                 | 19 ++++++++++++
 .../ProjectSettings/ProjectSettings.asset     |  2 +-
 ...ountView.meta => AccountSettingsView.meta} |  0
 .../AccountSettingsView.uss}                  | 22 +++++++-------
 .../AccountSettingsView.uss.meta}             |  0
 .../AccountSettingsView.uxml                  | 30 +++++++++++++++++++
 .../AccountSettingsView.uxml.meta}            |  0
 .../AppKit/Views/AccountView/AccountView.uxml | 30 -------------------
 src/Reown.AppKit.Unity/Runtime/AppKitCore.cs  | 13 ++++++--
 src/Reown.AppKit.Unity/Runtime/Chain.cs       |  2 +-
 .../ModalController/ModalController.cs        |  4 ++-
 .../Runtime/Controllers/RouterController.cs   |  2 +-
 ...esenter.cs => AccountSettingsPresenter.cs} |  4 +--
 ....meta => AccountSettingsPresenter.cs.meta} |  0
 ...{AccountView.cs => AccountSettingsView.cs} | 12 ++++----
 ...ew.cs.meta => AccountSettingsView.cs.meta} |  0
 16 files changed, 85 insertions(+), 55 deletions(-)
 rename src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/{AccountView.meta => AccountSettingsView.meta} (100%)
 rename src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/{AccountView/AccountView.uss => AccountSettingsView/AccountSettingsView.uss} (67%)
 rename src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/{AccountView/AccountView.uss.meta => AccountSettingsView/AccountSettingsView.uss.meta} (100%)
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
 rename src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/{AccountView/AccountView.uxml.meta => AccountSettingsView/AccountSettingsView.uxml.meta} (100%)
 delete mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml
 rename src/Reown.AppKit.Unity/Runtime/Presenters/{AccountPresenter.cs => AccountSettingsPresenter.cs} (98%)
 rename src/Reown.AppKit.Unity/Runtime/Presenters/{AccountPresenter.cs.meta => AccountSettingsPresenter.cs.meta} (100%)
 rename src/Reown.AppKit.Unity/Runtime/Views/AccountView/{AccountView.cs => AccountSettingsView.cs} (86%)
 rename src/Reown.AppKit.Unity/Runtime/Views/AccountView/{AccountView.cs.meta => AccountSettingsView.cs.meta} (100%)

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
index 0feded0..2c92707 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
@@ -80,5 +80,24 @@ public static void SessionProps()
             });
             Debug.Log(json);
         }
+
+        [ConsoleMethod("session", "Prints active session")]
+        public static void Session()
+        {
+            var walletConnect = AppKit.ConnectorController.ActiveConnector as WalletConnectConnector;
+            var session = walletConnect.SignClient.AddressProvider.DefaultSession;
+
+            if (session == null)
+            {
+                Debug.Log("No active session found");
+                return;
+            }
+
+            var json = JsonConvert.SerializeObject(session, new JsonSerializerSettings
+            {
+                Formatting = Formatting.Indented
+            });
+            Debug.Log(json);
+        }
     }
 }
\ No newline at end of file
diff --git a/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset b/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
index 2fe0d27..ea61340 100644
--- a/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
+++ b/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
@@ -140,7 +140,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 1.2.0
+  bundleVersion: 1.3.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView.meta
similarity index 100%
rename from src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView.meta
rename to src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView.meta
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uss
similarity index 67%
rename from src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uss
rename to src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uss
index b91ebd3..2efbdb0 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uss
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uss
@@ -1,4 +1,4 @@
-#account-view__profile {
+#account-settings-view__profile {
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -7,7 +7,7 @@
     margin-top: -12px;
 }
 
-#account-view__profile-avatar {
+#account-settings-view__profile-avatar {
     width: 75px;
     height: 75px;
     border-radius: 100%;
@@ -17,12 +17,12 @@
     align-items: center;
 }
 
-#account-view__profile-avatar-image {
+#account-settings-view__profile-avatar-image {
     width: 110%;
     height: 110%;
 }
 
-#account-view__profile-address {
+#account-settings-view__profile-address {
     margin-top: 10px;
     margin-left: 22px;
     padding: 0;
@@ -31,11 +31,11 @@
     font-size: var(--ro-font-size-medium-title);
 }
 
-#account-view__profile-balance-container {
+#account-settings-view__profile-balance-container {
     flex-direction: row;
 }
 
-#account-view__profile-balance-container > Label {
+#account-settings-view__profile-balance-container > Label {
     margin-top: 2px;
     padding: 0;
     -unity-text-align: middle-center;
@@ -47,27 +47,27 @@
     margin-top: 12px;
 }
 
-#account-view__profile-address-container {
+#account-settings-view__profile-address-container {
     display: flex;
     flex-direction: row;
 }
 
-#account-view__explorer-button-text {
+#account-settings-view__explorer-button-text {
     margin: 0 6 0 6px;
     padding: 0;
     -unity-text-align: middle-center;
 }
 
-#account-view__explorer-button-icon-left {
+#account-settings-view__explorer-button-icon-left {
     --unity-image: resource('Reown/AppKit/Icons/icon_medium_compass');
 }
 
-#account-view__explorer-button-icon-right {
+#account-settings-view__explorer-button-icon-right {
     width: 8px;
     height: 8px;
     --unity-image: resource('Reown/AppKit/Icons/icon_bold_externallink');
 }
 
-#account-view__profile-address-copy-link-container {
+#account-settings-view__profile-address-copy-link-container {
     justify-content: flex-end;
 }
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uss.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uss.meta
similarity index 100%
rename from src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uss.meta
rename to src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uss.meta
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
new file mode 100644
index 0000000..27d3ade
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
@@ -0,0 +1,30 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="AccountSettingsView.uss"/>
+    <ui:VisualElement name="account-settings-view__profile">
+        <ui:VisualElement name="account-settings-view__profile-avatar">
+            <ui:Image name="account-settings-view__profile-avatar-image"/>
+        </ui:VisualElement>
+        <ui:VisualElement name="account-settings-view__profile-address-container">
+            <ui:Label name="account-settings-view__profile-address"/>
+            <ui:VisualElement name="account-settings-view__profile-address-copy-link-container">
+                <Reown.AppKit.Unity.Components.IconLink name="account-settings-view__profile-address-copy-link"
+                                                        icon="Reown/AppKit/Icons/icon_bold_copy"
+                                                        variant="Shade"
+                />
+            </ui:VisualElement>
+        </ui:VisualElement>
+        <ui:VisualElement name="account-settings-view__profile-balance-container">
+            <ui:Label name="account-settings-view__profile-balance-value"/>
+            <ui:Label name="account-settings-view__profile-balance-symbol"/>
+        </ui:VisualElement>
+        <ui:VisualElement name="account-explorer-button-container">
+            <Reown.AppKit.Unity.Components.Button name="account-settings-view__explorer-button" size="Small" variant="Shade">
+                <ui:Image name="account-settings-view__explorer-button-icon-left"/>
+                <ui:Label name="account-settings-view__explorer-button-text"
+                          text="&lt;font-weight=600&gt;Block Explorer&lt;/font-weight&gt;" class="text-small"/>
+                <ui:Image name="account-settings-view__explorer-button-icon-right"/>
+            </Reown.AppKit.Unity.Components.Button>
+        </ui:VisualElement>
+    </ui:VisualElement>
+    <ui:VisualElement name="account-settings-view__buttons"/>
+</ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml.meta
similarity index 100%
rename from src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml.meta
rename to src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml.meta
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml
deleted file mode 100644
index c581d84..0000000
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountView/AccountView.uxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <Style src="AccountView.uss"/>
-    <ui:VisualElement name="account-view__profile">
-        <ui:VisualElement name="account-view__profile-avatar">
-            <ui:Image name="account-view__profile-avatar-image"/>
-        </ui:VisualElement>
-        <ui:VisualElement name="account-view__profile-address-container">
-            <ui:Label name="account-view__profile-address"/>
-            <ui:VisualElement name="account-view__profile-address-copy-link-container">
-                <Reown.AppKit.Unity.Components.IconLink name="account-view__profile-address-copy-link"
-                                                        icon="Reown/AppKit/Icons/icon_bold_copy"
-                                                        variant="Shade"
-                />
-            </ui:VisualElement>
-        </ui:VisualElement>
-        <ui:VisualElement name="account-view__profile-balance-container">
-            <ui:Label name="account-view__profile-balance-value"/>
-            <ui:Label name="account-view__profile-balance-symbol"/>
-        </ui:VisualElement>
-        <ui:VisualElement name="account-explorer-button-container">
-            <Reown.AppKit.Unity.Components.Button name="account-view__explorer-button" size="Small" variant="Shade">
-                <ui:Image name="account-view__explorer-button-icon-left"/>
-                <ui:Label name="account-view__explorer-button-text"
-                          text="&lt;font-weight=600&gt;Block Explorer&lt;/font-weight&gt;" class="text-small"/>
-                <ui:Image name="account-view__explorer-button-icon-right"/>
-            </Reown.AppKit.Unity.Components.Button>
-        </ui:VisualElement>
-    </ui:VisualElement>
-    <ui:VisualElement name="account-view__buttons"/>
-</ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
index 6f84c4e..804f26b 100644
--- a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
+++ b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using Reown.AppKit.Unity.Components;
+using Reown.AppKit.Unity.Profile;
 using Reown.AppKit.Unity.Utils;
 using Reown.Sign.Models;
 using Reown.Sign.Unity;
@@ -67,9 +69,16 @@ await Task.WhenAll(
 
         protected override void OpenModalCore(ViewType viewType = ViewType.None)
         {
-            if (viewType == ViewType.None)
+            if (viewType is ViewType.None or ViewType.Account)
             {
-                ModalController.Open(IsAccountConnected ? ViewType.Account : ViewType.Connect);
+                if (!IsAccountConnected)
+                {
+                    ModalController.Open(ViewType.Connect);
+                    return;
+                }
+
+                var isConnectedToReownWallet = ConnectorController.ActiveConnector is ProfileConnector;
+                ModalController.Open(isConnectedToReownWallet ? ViewType.AccountPortfolio : ViewType.AccountSettings);
             }
             else
             {
diff --git a/src/Reown.AppKit.Unity/Runtime/Chain.cs b/src/Reown.AppKit.Unity/Runtime/Chain.cs
index a650bbb..c402c36 100644
--- a/src/Reown.AppKit.Unity/Runtime/Chain.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Chain.cs
@@ -170,7 +170,7 @@ public static class Chains
             public static readonly Chain Optimism = new(
                 Namespaces.Evm,
                 References.Optimism,
-                "Optimism",
+                "OP Mainnet",
                 new Currency("Ether", "ETH", 18),
                 new BlockExplorer("Optimistic Etherscan", "https://optimistic.etherscan.io"),
                 "https://mainnet.optimism.io",
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
index 5124f81..f371f53 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/ModalController/ModalController.cs
@@ -70,6 +70,8 @@ public enum ViewType
         NetworkSearch,
         NetworkLoading,
         Siwe,
-        WebWallet
+        WebWallet,
+        AccountSettings,
+        AccountPortfolio
     }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
index 8aa07c5..863ce68 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
@@ -93,7 +93,7 @@ private void RegisterDefaultModalViews()
             RegisterModalView(ViewType.QrCode, new QrCodePresenter(this, RootVisualElement));
             RegisterModalView(ViewType.Wallet, new WalletPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.WalletSearch, new WalletSearchPresenter(this, RootVisualElement));
-            RegisterModalView(ViewType.Account, new AccountPresenter(this, RootVisualElement));
+            RegisterModalView(ViewType.AccountSettings, new AccountSettingsPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkSearch, new NetworkSearchPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkLoading, new NetworkLoadingPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.WebWallet, new WebWalletPresenter(this, RootVisualElement));
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
similarity index 98%
rename from src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
rename to src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
index 89f8823..67f18a4 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
@@ -9,7 +9,7 @@
 
 namespace Reown.AppKit.Unity
 {
-    public class AccountPresenter : Presenter<AccountView>
+    public class AccountSettingsPresenter : Presenter<AccountSettingsView>
     {
         public override bool HeaderBorder
         {
@@ -28,7 +28,7 @@ public override bool HeaderBorder
 
         private ProfileConnector _profileConnector;
 
-        public AccountPresenter(RouterController router, VisualElement parent) : base(router, parent)
+        public AccountSettingsPresenter(RouterController router, VisualElement parent) : base(router, parent)
         {
             View.ExplorerButton.Clicked += OnBlockExplorerButtonClick;
             View.CopyLink.Clicked += OnCopyAddressButtonClick;
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs.meta b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs.meta
similarity index 100%
rename from src/Reown.AppKit.Unity/Runtime/Presenters/AccountPresenter.cs.meta
rename to src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs.meta
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountView.cs b/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountSettingsView.cs
similarity index 86%
rename from src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountView.cs
rename to src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountSettingsView.cs
index 8df4a4c..a8791ac 100644
--- a/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountView.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountSettingsView.cs
@@ -4,9 +4,9 @@
 
 namespace Reown.AppKit.Unity.Components
 {
-    public class AccountView : VisualElement
+    public class AccountSettingsView : VisualElement
     {
-        public const string Name = "account-view";
+        public const string Name = "account-settings-view";
         public static readonly string NameProfile = $"{Name}__profile";
         public static readonly string NameProfileAddress = $"{Name}__profile-address";
         public static readonly string NameProfileAvatarImage = $"{Name}__profile-avatar-image";
@@ -26,17 +26,17 @@ public class AccountView : VisualElement
         public VisualElement Buttons { get; }
 
 
-        public new class UxmlFactory : UxmlFactory<AccountView>
+        public new class UxmlFactory : UxmlFactory<AccountSettingsView>
         {
         }
 
-        public AccountView() : this(null)
+        public AccountSettingsView() : this(null)
         {
         }
 
-        public AccountView(string visualTreePath)
+        public AccountSettingsView(string visualTreePath)
         {
-            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "Reown/AppKit/Views/AccountView/AccountView");
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "Reown/AppKit/Views/AccountSettingsView/AccountSettingsView");
             asset.CloneTree(this);
 
             name = Name;
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountView.cs.meta b/src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountSettingsView.cs.meta
similarity index 100%
rename from src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountView.cs.meta
rename to src/Reown.AppKit.Unity/Runtime/Views/AccountView/AccountSettingsView.cs.meta

From 3a377cf361b36e624caca3f0b9c29a892cd651ee Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 29 Jan 2025 16:07:27 +0200
Subject: [PATCH 09/21] Use numerical types for account balance, add total usd
 balance

---
 .../Runtime/Controllers/AccountController.cs  | 67 ++++++++++++++-----
 .../Model/BlockchainApi/GetBalanceResponse.cs | 55 +++++++++++++++
 .../BlockchainApi/GetBalanceResponse.cs.meta  |  3 +
 .../BlockchainApi/GetIdentityResponse.cs      | 49 --------------
 .../Presenters/AccountSettingsPresenter.cs    | 18 ++---
 5 files changed, 113 insertions(+), 79 deletions(-)
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs.meta

diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
index 2f668d4..a693faa 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -48,17 +49,23 @@ public AccountAvatar ProfileAvatar
             get => _profileAvatar;
             set => SetField(ref _profileAvatar, value);
         }
-        
-        public string Balance
+
+        public float NativeTokenBalance
         {
-            get => _balance;
-            set => SetField(ref _balance, value);
+            get => _nativeTokenBalance;
+            set => SetField(ref _nativeTokenBalance, value);
         }
-        
-        public string BalanceSymbol
+
+        public string NativeTokenSymbol
         {
-            get => _balanceSymbol;
-            set => SetField(ref _balanceSymbol, value);
+            get => _nativeTokenSymbol;
+            set => SetField(ref _nativeTokenSymbol, value);
+        }
+
+        public float TotalBalanceUsd
+        {
+            get => _totalBalanceUsd;
+            set => SetField(ref _totalBalanceUsd, value);
         }
 
         private ConnectorController _connectorController;
@@ -76,6 +83,10 @@ public string BalanceSymbol
         
         private string _balance;
         private string _balanceSymbol;
+
+        private float _nativeTokenBalance;
+        private string _nativeTokenSymbol;
+        private float _totalBalanceUsd;
         
         public event PropertyChangedEventHandler PropertyChanged;
         
@@ -96,7 +107,7 @@ public async Task InitializeAsync(ConnectorController connectorController, Netwo
 
         private async void ConnectorAccountConnectedHandler(object sender, Connector.AccountConnectedEventArgs e)
         {
-            var account = await e.GetAccount();
+            var account = await e.GetAccountAsync();
             if (account.AccountId == AccountId)
                 return;
             
@@ -160,26 +171,46 @@ public async Task UpdateBalance()
                 return;
             
             var response = await _blockchainApiController.GetBalanceAsync(Address);
-            
+
+            // -- Native token balance
+            var nativeTokenSymbol = _networkController.ActiveChain.NativeCurrency.symbol;
             if (response.Balances.Length == 0)
             {
-                Balance = "0.000";
-                BalanceSymbol = _networkController.ActiveChain.NativeCurrency.symbol;
+                NativeTokenBalance = 0;
+                NativeTokenSymbol = nativeTokenSymbol;
                 return;
             }
-            
-            var balance = Array.Find(response.Balances,x => x.chainId == ChainId && string.IsNullOrWhiteSpace(x.address));
+
+            var balance = Array.Find(response.Balances, x =>
+                x.chainId == ChainId
+                // && string.IsNullOrWhiteSpace(x.address)
+                && x.symbol == nativeTokenSymbol
+            );
 
             if (string.IsNullOrWhiteSpace(balance.quantity.numeric))
             {
-                Balance = "0.000";
-                BalanceSymbol = _networkController.ActiveChain.NativeCurrency.symbol;
+                NativeTokenBalance = 0;
+                NativeTokenSymbol = nativeTokenSymbol;
             }
             else
             {
-                Balance = balance.quantity.numeric;
-                BalanceSymbol = balance.symbol;
+                if (float.TryParse(balance.quantity.numeric, out var parsedBalance))
+                    NativeTokenBalance = parsedBalance;
+                else
+                    NativeTokenBalance = 0;
+
+                NativeTokenSymbol = balance.symbol;
             }
+
+            // -- Total balance in USD
+            var totalBalanceUsd = 0f;
+            foreach (var b in response.Balances)
+            {
+                if (float.TryParse(b.value, out var result))
+                    totalBalanceUsd += result;
+            }
+
+            TotalBalanceUsd = totalBalanceUsd;
         }
 
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
diff --git a/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs
new file mode 100644
index 0000000..0f421b0
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs
@@ -0,0 +1,55 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Reown.AppKit.Unity.Model.BlockchainApi
+{
+    [Serializable]
+    public sealed class GetBalanceResponse
+    {
+        public Balance[] Balances { get; }
+
+        [JsonConstructor]
+        public GetBalanceResponse(Balance[] balances)
+        {
+            Balances = balances;
+        }
+    }
+
+    [Serializable]
+    public struct Balance
+    {
+        [JsonProperty("name")]
+        public string name;
+
+        [JsonProperty("symbol")]
+        public string symbol;
+
+        [JsonProperty("chainId")]
+        public string chainId;
+
+        [JsonProperty("address")]
+        public string address;
+
+        [JsonProperty("value")]
+        public string value;
+
+        [JsonProperty("price")]
+        public string price;
+
+        [JsonProperty("quantity")]
+        public Quantity quantity;
+
+        [JsonProperty("iconUrl")]
+        public string iconUrl;
+    }
+
+    [Serializable]
+    public struct Quantity
+    {
+        [JsonProperty("decimals")]
+        public string decimals;
+
+        [JsonProperty("numeric")]
+        public string numeric;
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs.meta b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs.meta
new file mode 100644
index 0000000..8a49d3c
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetBalanceResponse.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 872a97597d1840629f3e4c065468d55a
+timeCreated: 1738157549
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetIdentityResponse.cs b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetIdentityResponse.cs
index e5116c6..4033021 100644
--- a/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetIdentityResponse.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Model/BlockchainApi/GetIdentityResponse.cs
@@ -16,53 +16,4 @@ public GetIdentityResponse(string name, string avatar)
             Avatar = avatar;
         }
     }
-
-    [Serializable]
-    public sealed class GetBalanceResponse
-    {
-        public Balance[] Balances { get; }
-        
-        [JsonConstructor]
-        public GetBalanceResponse(Balance[] balances)
-        {
-            Balances = balances;
-        }
-    }
-
-    [Serializable]
-    public struct Balance
-    {
-        [JsonProperty("name")]
-        public string name;
-        
-        [JsonProperty("symbol")]
-        public string symbol;
-        
-        [JsonProperty("chainId")]
-        public string chainId;
-        [JsonProperty("address")]
-        public string address;
-        
-        [JsonProperty("value")]
-        public string value;
-        
-        [JsonProperty("price")]
-        public string price;
-        
-        [JsonProperty("quantity")]
-        public Quantity quantity;
-        
-        [JsonProperty("iconUrl")]
-        public string iconUrl;
-    }
-    
-    [Serializable]
-    public struct Quantity
-    {
-        [JsonProperty("decimals")]
-        public string decimals;
-        
-        [JsonProperty("numeric")]
-        public string numeric;
-    }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
index 67f18a4..71993c5 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountSettingsPresenter.cs
@@ -53,11 +53,11 @@ private void AccountPropertyChangedHandler(object sender, PropertyChangedEventAr
                 case nameof(AccountController.ProfileAvatar):
                     UpdateProfileAvatar();
                     break;
-                case nameof(AccountController.Balance):
-                    View.SetBalance(TrimToThreeDecimalPlaces(AppKit.AccountController.Balance));
+                case nameof(AccountController.NativeTokenBalance):
+                    View.SetBalance(TrimToThreeDecimalPlaces(AppKit.AccountController.NativeTokenBalance));
                     break;
-                case nameof(AccountController.BalanceSymbol):
-                    View.SetBalanceSymbol(AppKit.AccountController.BalanceSymbol);
+                case nameof(AccountController.NativeTokenSymbol):
+                    View.SetBalanceSymbol(AppKit.AccountController.NativeTokenSymbol);
                     break;
             }
         }
@@ -247,15 +247,9 @@ private void ButtonsSetEnabled(bool value)
                 button.SetEnabled(value);
         }
 
-        public static string TrimToThreeDecimalPlaces(string input)
+        public static string TrimToThreeDecimalPlaces(float input)
         {
-            if (string.IsNullOrWhiteSpace(input))
-                return input;
-
-            var dotIndex = input.IndexOf('.');
-            if (dotIndex == -1 || input.Length <= dotIndex + 4)
-                return input;
-            return input[..(dotIndex + 4)];
+            return input.ToString("F3");
         }
 
         protected override void Dispose(bool disposing)

From 8652e5fc8f3cab860536bc8feeee54824a5c18bc Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 29 Jan 2025 17:15:46 +0200
Subject: [PATCH 10/21] Show total usd balance in portfolio

---
 .../Assets/Scenes/AppKit Init.unity           | 11 ++--
 .../Assets/Scenes/Init Scene.unity            | 60 ++++++++++++++++++-
 .../Reown/AppKit/Components/Balance.meta      |  3 +
 .../AppKit/Components/Balance/Balance.uss     | 17 ++++++
 .../Components/Balance/Balance.uss.meta       |  3 +
 .../AppKit/Components/Balance/Balance.uxml    |  6 ++
 .../Components/Balance/Balance.uxml.meta      |  3 +
 .../AppKit/Views/AccountPortfolioView.meta    |  3 +
 .../AccountPortfolioView.uss                  |  4 ++
 .../AccountPortfolioView.uss.meta             |  3 +
 .../AccountPortfolioView.uxml                 |  7 +++
 .../AccountPortfolioView.uxml.meta            |  3 +
 .../Runtime/Components/Balance.cs             | 44 ++++++++++++++
 .../Runtime/Components/Balance.cs.meta        |  3 +
 .../Runtime/Controllers/RouterController.cs   |  1 +
 .../Presenters/AccountPortfolioPresenter.cs   | 24 ++++++++
 .../AccountPortfolioPresenter.cs.meta         |  3 +
 .../Runtime/Views/AccountPortfolioView.meta   |  3 +
 .../AccountPortfolioView.cs                   | 31 ++++++++++
 .../AccountPortfolioView.cs.meta              |  3 +
 .../UI Toolkit/AppKit Base Theme.tss          |  2 +-
 21 files changed, 227 insertions(+), 10 deletions(-)
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/Balance.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/Balance.cs.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs.meta

diff --git a/sample/Reown.AppKit.Unity/Assets/Scenes/AppKit Init.unity b/sample/Reown.AppKit.Unity/Assets/Scenes/AppKit Init.unity
index 8fe8fa7..85d8940 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scenes/AppKit Init.unity	
+++ b/sample/Reown.AppKit.Unity/Assets/Scenes/AppKit Init.unity	
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -42,8 +42,8 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -66,9 +66,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -327,7 +324,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1245457781}
   m_Layer: 0
-  m_Name: ----- Web3Modal
+  m_Name: ----- AppKit
   m_TagString: EditorOnly
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/sample/Reown.AppKit.Unity/Assets/Scenes/Init Scene.unity b/sample/Reown.AppKit.Unity/Assets/Scenes/Init Scene.unity
index 9a09a87..02d5601 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scenes/Init Scene.unity	
+++ b/sample/Reown.AppKit.Unity/Assets/Scenes/Init Scene.unity	
@@ -189,11 +189,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
@@ -215,6 +215,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -239,6 +247,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -343,6 +359,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -367,6 +391,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -391,6 +423,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -415,6 +455,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -439,6 +487,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance.meta
new file mode 100644
index 0000000..7b246de
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 42c084f93f074b7185c15273c2f4a68f
+timeCreated: 1738160693
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss
new file mode 100644
index 0000000..5afed25
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss
@@ -0,0 +1,17 @@
+:root {
+    flex-direction: row;
+    color: var(--ro-color-fg-100)
+}
+
+Label {
+    padding: 0;
+    margin: 0;
+}
+
+#balance__symbol {
+    padding-right: 2px;
+}
+
+#balance__decimal {
+    color: var(--ro-color-fg-200)
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss.meta
new file mode 100644
index 0000000..369c3da
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 80b4de2ee9594cefad4d38684df5f692
+timeCreated: 1738160902
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
new file mode 100644
index 0000000..0cab797
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="Balance.uss"/>
+    <ui:Label name="balance__symbol" text="$"/>
+    <ui:Label name="balance__integer" text="420"/>
+    <ui:Label name="balance__decimal" text=".69"/>
+</ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml.meta
new file mode 100644
index 0000000..f90192e
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79c03316ddae4602aef9b6db81ff71e1
+timeCreated: 1738160724
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView.meta
new file mode 100644
index 0000000..a00fc53
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: abd036840c9e4efa8ac0f4240f8b7941
+timeCreated: 1738159954
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
new file mode 100644
index 0000000..db07ba4
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
@@ -0,0 +1,4 @@
+#account-portfolio-view__balance-container {
+    align-items: center;
+    padding: 3 0 3 0;
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss.meta
new file mode 100644
index 0000000..6e1c2a8
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6b339af0c2b94ddcadf972e371de99e8
+timeCreated: 1738159988
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
new file mode 100644
index 0000000..2cffd25
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
@@ -0,0 +1,7 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="AccountPortfolioView.uss"/>
+    <ui:VisualElement name="account-portfolio-view__balance-container">
+        <Reown.AppKit.Unity.Components.Balance name="account-portfolio-view__balance" class="text-2xl"/>
+    </ui:VisualElement>
+    <ui:VisualElement name="account-portfolio-view__buttons"/>
+</ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml.meta
new file mode 100644
index 0000000..5c0171a
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 486f94815b21481dbe198329ffbc73d9
+timeCreated: 1738159978
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs b/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs
new file mode 100644
index 0000000..a42fb32
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs
@@ -0,0 +1,44 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity.Components
+{
+    public class Balance : VisualElement
+    {
+        public const string Name = "balance";
+        public static readonly string NameSymbol = $"{Name}__symbol";
+        public static readonly string NameInteger = $"{Name}__integer";
+        public static readonly string NameDecimal = $"{Name}__decimal";
+
+        public Label Symbol { get; }
+        public Label Integer { get; }
+        public Label Decimal { get; }
+
+        public new class UxmlFactory : UxmlFactory<Balance>
+        {
+        }
+
+        public Balance() : this(null)
+        {
+        }
+
+        public Balance(string visualTreePath)
+        {
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "Reown/AppKit/Components/Balance/Balance");
+            asset.CloneTree(this);
+
+            name = Name;
+
+            Symbol = this.Q<Label>(NameSymbol);
+            Integer = this.Q<Label>(NameInteger);
+            Decimal = this.Q<Label>(NameDecimal);
+        }
+
+        public void UpdateBalance(float balance, string symbol = "$")
+        {
+            Integer.text = balance.ToString("N0");
+            Decimal.text = balance.ToString("F2")[balance.ToString("F0").Length..];
+            Symbol.text = symbol;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs.meta b/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs.meta
new file mode 100644
index 0000000..31f0b9c
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/Balance.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 12feaee5879640eaa9f7a818006ea5ba
+timeCreated: 1738161046
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
index 863ce68..6aa5f25 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
@@ -94,6 +94,7 @@ private void RegisterDefaultModalViews()
             RegisterModalView(ViewType.Wallet, new WalletPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.WalletSearch, new WalletSearchPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.AccountSettings, new AccountSettingsPresenter(this, RootVisualElement));
+            RegisterModalView(ViewType.AccountPortfolio, new AccountPortfolioPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkSearch, new NetworkSearchPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.NetworkLoading, new NetworkLoadingPresenter(this, RootVisualElement));
             RegisterModalView(ViewType.WebWallet, new WebWalletPresenter(this, RootVisualElement));
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
new file mode 100644
index 0000000..827ab1b
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
@@ -0,0 +1,24 @@
+using System.ComponentModel;
+using Reown.AppKit.Unity.Components;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity
+{
+    public class AccountPortfolioPresenter : Presenter<AccountPortfolioView>
+    {
+        public AccountPortfolioPresenter(RouterController router, VisualElement parent) : base(router, parent)
+        {
+            AppKit.AccountController.PropertyChanged += AccountPropertyChangedHandler;
+        }
+
+        private void AccountPropertyChangedHandler(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(AccountController.TotalBalanceUsd):
+                    View.Balance.UpdateBalance(AppKit.AccountController.TotalBalanceUsd);
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs.meta b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs.meta
new file mode 100644
index 0000000..fdc95bc
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2522e112ca8b44dc9454355dd367d4cc
+timeCreated: 1738161468
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView.meta b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView.meta
new file mode 100644
index 0000000..7f4ecc0
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 90752da1af864671a6b053f4779ec814
+timeCreated: 1738159900
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
new file mode 100644
index 0000000..4624fb0
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
@@ -0,0 +1,31 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity.Components
+{
+    public class AccountPortfolioView : VisualElement
+    {
+        public const string Name = "account-portfolio-view";
+        public static readonly string NameBalanceUsd = $"{Name}__balance";
+
+        public Balance Balance { get; }
+
+        public new class UxmlFactory : UxmlFactory<AccountPortfolioView>
+        {
+        }
+
+        public AccountPortfolioView() : this(null)
+        {
+        }
+
+        public AccountPortfolioView(string visualTreePath)
+        {
+            var asset = Resources.Load<VisualTreeAsset>(visualTreePath ?? "Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView");
+            asset.CloneTree(this);
+
+            name = Name;
+
+            Balance = this.Q<Balance>(NameBalanceUsd);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs.meta b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs.meta
new file mode 100644
index 0000000..a616987
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 07aa8c3047d442278f941e4d825db1dc
+timeCreated: 1738159905
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/UI Toolkit/AppKit Base Theme.tss b/src/Reown.AppKit.Unity/UI Toolkit/AppKit Base Theme.tss
index 1b8534c..bf8550b 100644
--- a/src/Reown.AppKit.Unity/UI Toolkit/AppKit Base Theme.tss	
+++ b/src/Reown.AppKit.Unity/UI Toolkit/AppKit Base Theme.tss	
@@ -104,7 +104,7 @@ CardSelect {
 
 QrCode {
     --ro-qrcode-bg-color: white;
-    --ro-qrcode-fg-color: black;
+    --ro-qrcode-fg-color: var(--ro-color-bg-100);
 }
 
 .text-micro {

From 1cd52ae36f7dbdd3dc954a6caaba0a40a4741fc0 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Fri, 31 Jan 2025 16:35:11 +0200
Subject: [PATCH 11/21] Show empty native token balance by default

---
 .../AppKit/Views/AccountSettingsView/AccountSettingsView.uxml  | 2 +-
 src/Reown.AppKit.Unity/Runtime/AppKitCore.cs                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
index 27d3ade..05bbfdb 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountSettingsView/AccountSettingsView.uxml
@@ -14,7 +14,7 @@
             </ui:VisualElement>
         </ui:VisualElement>
         <ui:VisualElement name="account-settings-view__profile-balance-container">
-            <ui:Label name="account-settings-view__profile-balance-value"/>
+            <ui:Label name="account-settings-view__profile-balance-value" text="0.000"/>
             <ui:Label name="account-settings-view__profile-balance-symbol"/>
         </ui:VisualElement>
         <ui:VisualElement name="account-explorer-button-container">
diff --git a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
index 804f26b..3307094 100644
--- a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
+++ b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
@@ -78,7 +78,8 @@ protected override void OpenModalCore(ViewType viewType = ViewType.None)
                 }
 
                 var isConnectedToReownWallet = ConnectorController.ActiveConnector is ProfileConnector;
-                ModalController.Open(isConnectedToReownWallet ? ViewType.AccountPortfolio : ViewType.AccountSettings);
+                // ModalController.Open(isConnectedToReownWallet ? ViewType.AccountPortfolio : ViewType.AccountSettings);
+                ModalController.Open(ViewType.AccountSettings);
             }
             else
             {

From 76013d184deb6d9fb1ae0e72e4664f32b0ae7ac6 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Tue, 4 Feb 2025 17:20:19 +0200
Subject: [PATCH 12/21] Account chip in the portfolio view

---
 .../Components/ModalHeader/ModalHeader.uxml   |  4 +-
 .../AccountPortfolioView.uss                  | 47 +++++++++++++
 .../AccountPortfolioView.uxml                 | 11 ++++
 src/Reown.AppKit.Unity/Runtime/AppKitCore.cs  |  4 +-
 .../Runtime/Components/ModalHeader.cs         |  2 -
 .../Presenters/AccountPortfolioPresenter.cs   | 66 +++++++++++++++++++
 .../Presenters/ModalHeaderPresenter.cs        |  1 +
 .../AccountPortfolioView.cs                   | 49 +++++++++++++-
 8 files changed, 177 insertions(+), 7 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ModalHeader/ModalHeader.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ModalHeader/ModalHeader.uxml
index 17d8dfc..4501c73 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ModalHeader/ModalHeader.uxml
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/ModalHeader/ModalHeader.uxml
@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="ModalHeader.uss"/>
-    <ui:VisualElement name="modal-header__container">
+    <ui:VisualElement name="modal-header__container" picking-mode="Ignore">
         <ui:VisualElement name="modal-header__left-slot" class="modal-header__slot"/>
-        <ui:VisualElement name="modal-header__body"/>
+        <ui:VisualElement name="modal-header__body" picking-mode="Ignore"/>
         <ui:VisualElement name="modal-header__right-slot" class="modal-header__slot"/>
     </ui:VisualElement>
     <ui:VisualElement name="modal-header__snackbar-container-horizontal"
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
index db07ba4..7bcb036 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
@@ -1,4 +1,51 @@
 #account-portfolio-view__balance-container {
     align-items: center;
     padding: 3 0 3 0;
+}
+
+#account-portfolio-view__account-chip-container {
+    flex-direction: row;
+    justify-content: center;
+    margin: -35 10 10 10;
+}
+
+#account-portfolio-view__account-chip {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 8 12 8 8;
+    border-radius: var(--ro-border-radius-s);
+    border-width: 1px;
+    border-color: var(--ro-gray-glass-002);
+    overflow: hidden;
+    background-color: var(--ro-gray-glass-002);
+    transition-property: background-color;
+    transition-duration: 200ms;
+}
+
+#account-portfolio-view__account-chip:hover {
+    background-color: var(--ro-gray-glass-005);
+}
+
+#account-portfolio-view__account-chip-avatar {
+    width: 28;
+    height: 28;
+    margin-right: 8px;
+}
+
+#account-portfolio-view__account-chip-content {
+    flex-direction: row;
+}
+
+#account-portfolio-view__account-chip-content-name {
+    margin: 0 6 0 0;
+    padding: 0;
+    -unity-text-align: middle-center;
+    color: var(--ro-color-fg-100);
+    font-size: var(--ro-font-size-large);
+}
+
+#account-portfolio-view__account-chip-content-icon {
+    --unity-image-tint-color: var(--ro-color-fg-200);
+    --unity-image: resource('Reown/AppKit/Icons/icon_bold_chevronbottom');
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
index 2cffd25..6ecade7 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uxml
@@ -1,5 +1,16 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="AccountPortfolioView.uss"/>
+    <ui:VisualElement name="account-portfolio-view__account-chip-container">
+        <ui:VisualElement name="account-portfolio-view__account-chip">
+            <ui:VisualElement name="account-portfolio-view__account-chip-avatar">
+                <ui:Image name="account-portfolio-view__account-chip-avatar-image"/>
+            </ui:VisualElement>
+            <ui:VisualElement name="account-portfolio-view__account-chip-content">
+                <ui:Label name="account-portfolio-view__account-chip-content-name"/>
+                <ui:Image name="account-portfolio-view__account-chip-content-icon"/>
+            </ui:VisualElement>
+        </ui:VisualElement>
+    </ui:VisualElement>
     <ui:VisualElement name="account-portfolio-view__balance-container">
         <Reown.AppKit.Unity.Components.Balance name="account-portfolio-view__balance" class="text-2xl"/>
     </ui:VisualElement>
diff --git a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
index 3307094..9c6c6e2 100644
--- a/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
+++ b/src/Reown.AppKit.Unity/Runtime/AppKitCore.cs
@@ -78,8 +78,8 @@ protected override void OpenModalCore(ViewType viewType = ViewType.None)
                 }
 
                 var isConnectedToReownWallet = ConnectorController.ActiveConnector is ProfileConnector;
-                // ModalController.Open(isConnectedToReownWallet ? ViewType.AccountPortfolio : ViewType.AccountSettings);
-                ModalController.Open(ViewType.AccountSettings);
+                ModalController.Open(isConnectedToReownWallet ? ViewType.AccountPortfolio : ViewType.AccountSettings);
+                // ModalController.Open(ViewType.AccountSettings);
             }
             else
             {
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/ModalHeader.cs b/src/Reown.AppKit.Unity/Runtime/Components/ModalHeader.cs
index ff32a29..246158d 100644
--- a/src/Reown.AppKit.Unity/Runtime/Components/ModalHeader.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Components/ModalHeader.cs
@@ -12,8 +12,6 @@ public class ModalHeader : VisualElement
         public static readonly string NameRightSlot = $"{Name}__right-slot";
 
         public static readonly string NameSnackbar = $"{Name}__snackbar";
-        public static readonly string NameSnackbarContainerHorizontal = $"{Name}__snackbar-container-horizontal";
-        public static readonly string NameSnackbarContainerVertical = $"{Name}__snackbar-container-vertical";
 
         public readonly VisualElement container;
         public readonly VisualElement body;
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
index 827ab1b..55555a7 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
@@ -1,24 +1,90 @@
 using System.ComponentModel;
 using Reown.AppKit.Unity.Components;
+using Reown.AppKit.Unity.Utils;
 using UnityEngine.UIElements;
 
 namespace Reown.AppKit.Unity
 {
     public class AccountPortfolioPresenter : Presenter<AccountPortfolioView>
     {
+        public override bool HeaderBorder
+        {
+            get => false;
+        }
+
+        private bool _disposed;
+        private RemoteSprite<Image> _avatar;
+        
         public AccountPortfolioPresenter(RouterController router, VisualElement parent) : base(router, parent)
         {
             AppKit.AccountController.PropertyChanged += AccountPropertyChangedHandler;
+            View.AccountClicked += AccountClickedHandler;
+        }
+
+        private void AccountClickedHandler()
+        {
+            Router.OpenView(ViewType.AccountSettings);
         }
 
         private void AccountPropertyChangedHandler(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
             {
+                case nameof(AccountController.ProfileName):
+                    UpdateProfileName();
+                    break;
+                case nameof(AccountController.Address):
+                case nameof(AccountController.ProfileAvatar):
+                    UpdateProfileAvatar();
+                    break;
                 case nameof(AccountController.TotalBalanceUsd):
                     View.Balance.UpdateBalance(AppKit.AccountController.TotalBalanceUsd);
                     break;
             }
         }
+
+        protected virtual void UpdateProfileName()
+        {
+            var profileName = AppKit.AccountController.ProfileName;
+            if (profileName.Length > 15)
+                profileName = profileName.Truncate(6);
+
+            View.SetProfileName(profileName);
+        }
+
+        protected virtual void UpdateProfileAvatar()
+        {
+            var avatar = AppKit.AccountController.ProfileAvatar;
+
+            if (avatar.IsEmpty || avatar.AvatarFormat != "png" && avatar.AvatarFormat != "jpg" && avatar.AvatarFormat != "jpeg")
+            {
+                var address = AppKit.AccountController.Address;
+                var texture = UiUtils.GenerateAvatarTexture(address);
+                View.AvatarImage.image = texture;
+            }
+            else
+            {
+                var remoteSprite = RemoteSpriteFactory.GetRemoteSprite<Image>(avatar.AvatarUrl);
+                _avatar?.UnsubscribeImage(View.AvatarImage);
+                _avatar = remoteSprite;
+                _avatar.SubscribeImage(View.AvatarImage);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+                AppKit.AccountController.PropertyChanged -= AccountPropertyChangedHandler;
+
+                _avatar?.UnsubscribeImage(View.AvatarImage);
+            }
+
+            _disposed = true;
+            base.Dispose(disposing);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
index d7afa55..0593be3 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
@@ -19,6 +19,7 @@ public class ModalHeaderPresenter : Presenter<ModalHeader>
         public ModalHeaderPresenter(RouterController routerController, Modal parent) : base(routerController, parent)
         {
             View.style.display = DisplayStyle.Flex;
+            View.pickingMode = PickingMode.Ignore;
 
             Router.ViewChanged += ViewChangedHandler;
             AppKit.NotificationController.Notification += NotificationHandler;
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
index 4624fb0..9bdd984 100644
--- a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
@@ -1,3 +1,5 @@
+using System;
+using Reown.AppKit.Unity.Utils;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -7,9 +9,47 @@ public class AccountPortfolioView : VisualElement
     {
         public const string Name = "account-portfolio-view";
         public static readonly string NameBalanceUsd = $"{Name}__balance";
-
+        public static readonly string NameAccountChipContainer = $"{Name}__account-chip-container";
+        public static readonly string NameAccountChip = $"{Name}__account-chip";
+        public static readonly string NameAccountChipAvatarImage = $"{Name}__account-chip-avatar-image";
+        public static readonly string NameAccountChipContentName = $"{Name}__account-chip-content-name";
+        
         public Balance Balance { get; }
 
+        public Image AvatarImage { get; }
+
+        public Label AccountName { get; }
+
+        public event Action AccountClicked
+        {
+            add
+            {
+                if (AccountChipClickable == null)
+                    AccountChipClickable = new Clickable(value);
+                else
+                    AccountChipClickable.clicked += value;
+            }
+            remove
+            {
+                if (AccountChipClickable == null)
+                    return;
+                AccountChipClickable.clicked -= value;
+            }
+        }
+
+        public Clickable AccountChipClickable
+        {
+            get => _accountChipClickable;
+            set
+            {
+                _accountChipClickable = value;
+                this.AddManipulator(value);
+            }
+        }
+
+        private Clickable _accountChipClickable;
+        
+
         public new class UxmlFactory : UxmlFactory<AccountPortfolioView>
         {
         }
@@ -26,6 +66,13 @@ public AccountPortfolioView(string visualTreePath)
             name = Name;
 
             Balance = this.Q<Balance>(NameBalanceUsd);
+            AvatarImage = this.Q<Image>(NameAccountChipAvatarImage);
+            AccountName = this.Q<Label>(NameAccountChipContentName);
+        }
+
+        public void SetProfileName(string value)
+        {
+            AccountName.text = value.FontWeight500();
         }
     }
 }
\ No newline at end of file

From 7ecfb7c8053b6817084fc314a90864e4e5c93aa0 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 5 Feb 2025 17:12:39 +0200
Subject: [PATCH 13/21] Network selection from portfolio header

---
 .../AppKit/Components/NetworkButton.meta      |   8 +
 .../NetworkButton/NetworkButton.uss           |  45 +++++
 .../NetworkButton/NetworkButton.uss.meta      |  11 ++
 .../NetworkButton/NetworkButton.uxml          |   6 +
 .../NetworkButton/NetworkButton.uxml.meta     |  10 ++
 .../AccountPortfolioView.uss                  |   2 +-
 src/Reown.AppKit.Unity/Runtime/Chain.cs       |   5 +
 .../Runtime/Components/NetworkButton.cs       | 160 ++++++++++++++++++
 .../Runtime/Components/NetworkButton.cs.meta  |   2 +
 .../Components/NetworkButtonPresenter.cs      |  54 ++++++
 .../Components/NetworkButtonPresenter.cs.meta |   2 +
 .../Runtime/Controllers/RouterController.cs   |   5 +
 .../Presenters/ModalHeaderPresenter.cs        |  34 +++-
 .../AccountPortfolioView.cs                   |   5 +-
 14 files changed, 338 insertions(+), 11 deletions(-)
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss.meta
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml
 create mode 100644 src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs.meta
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs
 create mode 100644 src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs.meta

diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton.meta
new file mode 100644
index 0000000..d9f6059
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 33d87baafd8ac40ffac7118ec8c10518
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss
new file mode 100644
index 0000000..d86bdd6
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss
@@ -0,0 +1,45 @@
+:root {
+    border-radius: var(--ro-border-radius-s);
+    flex-direction: row;
+    align-items: center;
+    align-self: flex-start;
+    justify-content: center;
+    flex-grow: 0;
+    padding: 8 14 8 14;
+    overflow: hidden;
+    transition-property: background-color;
+    transition-duration: 100ms;
+}
+
+:root:hover {
+    background-color: var(--ro-gray-glass-005);
+}
+
+.border {
+    padding: 6 14 6 14;
+    background-color: var(--ro-gray-glass-002);
+    border-width: 1px;
+    border-color: var(--ro-gray-glass-002);
+}
+
+#network-button__name {
+    margin-left: 8px;
+    flex-grow: 1;
+    -unity-text-align: middle-left;
+    color: var(--ro-color-fg-100);
+}
+
+#network-button__icon {
+    width: 24px;
+    height: 24px;
+    border-radius: var(--ro-border-radius-full);
+    overflow: hidden;
+}
+
+#network-button__chevron{
+    width: 12px;
+    height: 12px;
+    margin-left: 8px;
+    --unity-image-tint-color: var(--ro-color-fg-200);
+    --unity-image: resource('Reown/AppKit/Icons/icon_bold_chevronbottom');
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss.meta
new file mode 100644
index 0000000..e350104
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9a374d6e35f47499a9590f374622533c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml
new file mode 100644
index 0000000..3cc6e01
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml
@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="NetworkButton.uss"/>
+    <ui:Image name="network-button__icon"/>
+    <ui:Label name="network-button__name"/>
+    <ui:Image name="network-button__chevron"/>
+</ui:UXML> 
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml.meta b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml.meta
new file mode 100644
index 0000000..e4ceab4
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/NetworkButton/NetworkButton.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 7af3f1b99a4a14b6abaef9ff7e8fa0e5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
index 7bcb036..553d536 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Views/AccountPortfolioView/AccountPortfolioView.uss
@@ -6,7 +6,7 @@
 #account-portfolio-view__account-chip-container {
     flex-direction: row;
     justify-content: center;
-    margin: -35 10 10 10;
+    margin: -25 10 10 10;
 }
 
 #account-portfolio-view__account-chip {
diff --git a/src/Reown.AppKit.Unity/Runtime/Chain.cs b/src/Reown.AppKit.Unity/Runtime/Chain.cs
index c402c36..f9158d5 100644
--- a/src/Reown.AppKit.Unity/Runtime/Chain.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Chain.cs
@@ -47,6 +47,11 @@ public Chain(
             ImageUrl = imageUrl;
             ViemName = viemName;
         }
+
+        public override string ToString()
+        {
+            return $"{Name} ({ChainId})";
+        }
     }
 
     [Serializable]
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs
new file mode 100644
index 0000000..c95f0d7
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs
@@ -0,0 +1,160 @@
+using System;
+using Reown.AppKit.Unity.Utils;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity.Components
+{
+    public class NetworkButton : VisualElement, IDisposable
+    {
+        public const string Name = "network-button";
+        public static readonly string NameIcon = $"{Name}__icon";
+        public static readonly string NameText = $"{Name}__name";
+        public static readonly string NameChevron = $"{Name}__chevron";
+
+        private bool _showName = true;
+        private bool _showChevron = true;
+        private bool _showBorder = true;
+        private bool _disposed;
+
+        private RemoteSprite<Image> _networkIcon;
+        private Clickable _clickable;
+
+        public bool ShowName
+        {
+            get => _showName;
+            set
+            {
+                _showName = value;
+                NetworkName.style.display = value ? DisplayStyle.Flex : DisplayStyle.None;
+            }
+        }
+
+        public bool ShowChevron
+        {
+            get => _showChevron;
+            set
+            {
+                _showChevron = value;
+                NetworkChevron.style.display = value ? DisplayStyle.Flex : DisplayStyle.None;
+            }
+        }
+
+        public bool ShowBorder
+        {
+            get => _showBorder;
+            set
+            {
+                _showBorder = value;
+                EnableInClassList("border", value);
+            }
+        }
+
+        public Clickable Clickable
+        {
+            get => _clickable;
+            set
+            {
+                _clickable = value;
+                this.AddManipulator(value);
+            }
+        }
+
+        public readonly Image NetworkIcon;
+        public readonly Label NetworkName;
+        public readonly Image NetworkChevron;
+
+        public new class UxmlFactory : UxmlFactory<NetworkButton, UxmlTraits>
+        {
+        }
+
+        public new class UxmlTraits : VisualElement.UxmlTraits
+        {
+            private readonly UxmlBoolAttributeDescription _showName = new()
+            {
+                name = "show-name",
+                defaultValue = true
+            };
+
+            private readonly UxmlBoolAttributeDescription _showChevron = new()
+            {
+                name = "show-chevron",
+                defaultValue = true
+            };
+
+            private readonly UxmlBoolAttributeDescription _showBorder = new()
+            {
+                name = "show-border",
+                defaultValue = true
+            };
+
+            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ve, bag, cc);
+                var networkButton = (NetworkButton)ve;
+
+                networkButton.ShowName = _showName.GetValueFromBag(bag, cc);
+                networkButton.ShowChevron = _showChevron.GetValueFromBag(bag, cc);
+                networkButton.ShowBorder = _showBorder.GetValueFromBag(bag, cc);
+            }
+        }
+
+        public NetworkButton()
+        {
+            var asset = Resources.Load<VisualTreeAsset>("Reown/AppKit/Components/NetworkButton/NetworkButton");
+            asset.CloneTree(this);
+
+            name = Name;
+            AddToClassList(Name);
+
+            NetworkIcon = this.Q<Image>(NameIcon);
+            NetworkName = this.Q<Label>(NameText);
+            NetworkChevron = this.Q<Image>(NameChevron);
+
+            ShowBorder = true;
+            focusable = true;
+
+            AppKit.NetworkController.ChainChanged += ChainChangedHandler;
+
+            // Update network data when button becomes visible
+            // ReSharper disable once HeapView.CanAvoidClosure
+            RegisterCallbackOnce<GeometryChangedEvent>(_ => UpdateNetworkButton(AppKit.NetworkController.ActiveChain));
+
+            Clickable = new Clickable(() => AppKit.OpenModal(ViewType.NetworkSearch));
+        }
+
+        private void ChainChangedHandler(object sender, NetworkController.ChainChangedEventArgs e)
+        {
+            UpdateNetworkButton(e.NewChain);
+        }
+
+        private void UpdateNetworkButton(Chain chain)
+        {
+            if (chain == null)
+            {
+                NetworkName.text = "Network";
+                NetworkIcon.style.display = DisplayStyle.None;
+                return;
+            }
+
+            NetworkName.text = chain.Name;
+
+            var newNetworkIcon = RemoteSpriteFactory.GetRemoteSprite<Image>(chain.ImageUrl);
+            _networkIcon?.UnsubscribeImage(NetworkIcon);
+            _networkIcon = newNetworkIcon;
+            _networkIcon.SubscribeImage(NetworkIcon);
+            NetworkIcon.style.display = DisplayStyle.Flex;
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+
+            AppKit.NetworkController.ChainChanged -= ChainChangedHandler;
+            _networkIcon?.UnsubscribeImage(NetworkIcon);
+
+            _disposed = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs.meta b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs.meta
new file mode 100644
index 0000000..e3cf8ac
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButton.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 193754f8834074f3c8ae5a7ec15f32f7
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs
new file mode 100644
index 0000000..f33f1aa
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs
@@ -0,0 +1,54 @@
+using Reown.AppKit.Unity.Utils;
+using UnityEngine.UIElements;
+
+namespace Reown.AppKit.Unity.Components
+{
+    public class NetworkButtonPresenter
+    {
+        private readonly NetworkButton _networkButton;
+        private RemoteSprite<Image> _networkIcon;
+        private bool _disposed;
+
+        public NetworkButtonPresenter(NetworkButton networkButton)
+        {
+            _networkButton = networkButton;
+
+            AppKit.NetworkController.ChainChanged += ChainChangedHandler;
+            UpdateNetworkButton(AppKit.NetworkController.ActiveChain);
+        }
+
+        private void ChainChangedHandler(object sender, NetworkController.ChainChangedEventArgs e)
+        {
+            UpdateNetworkButton(e.NewChain);
+        }
+
+        private void UpdateNetworkButton(Chain chain)
+        {
+            if (chain == null)
+            {
+                _networkButton.NetworkName.text = "Network";
+                _networkButton.NetworkIcon.style.display = DisplayStyle.None;
+                return;
+            }
+
+            _networkButton.NetworkName.text = chain.Name;
+
+            var newNetworkIcon = RemoteSpriteFactory.GetRemoteSprite<Image>(chain.ImageUrl);
+            _networkIcon?.UnsubscribeImage(_networkButton.NetworkIcon);
+            _networkIcon = newNetworkIcon;
+            _networkIcon.SubscribeImage(_networkButton.NetworkIcon);
+            _networkButton.NetworkIcon.style.display = DisplayStyle.Flex;
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+
+            AppKit.NetworkController.ChainChanged -= ChainChangedHandler;
+            _networkIcon?.UnsubscribeImage(_networkButton.NetworkIcon);
+
+            _disposed = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs.meta b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs.meta
new file mode 100644
index 0000000..bb131ca
--- /dev/null
+++ b/src/Reown.AppKit.Unity/Runtime/Components/NetworkButtonPresenter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b3e2c0e8884a840f5aa2998c366d693b
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
index 6aa5f25..9124426 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/RouterController.cs
@@ -16,6 +16,11 @@ public PresenterBase CurrentPresenter
             get => _modalViews[_history.Peek()];
         }
 
+        public int HistoryCount
+        {
+            get => _history.Count;
+        }
+
         public VisualElement RootVisualElement { get; }
 
         public RouterController(VisualElement parent)
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
index 0593be3..bdcd5ac 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
@@ -15,6 +15,7 @@ public class ModalHeaderPresenter : Presenter<ModalHeader>
 
         private Coroutine _snackbarCoroutine;
         private bool _disposed;
+        private IconLink _goBackIconLink;
 
         public ModalHeaderPresenter(RouterController routerController, Modal parent) : base(routerController, parent)
         {
@@ -31,7 +32,7 @@ public ModalHeaderPresenter(RouterController routerController, Modal parent) : b
             View.body.Add(_title);
 
             // Create Back button and add it to the left slot
-            var goBackIconLink = new IconLink(
+            _goBackIconLink = new IconLink(
                 Resources.Load<VectorImage>("Reown/AppKit/Icons/icon_medium_chevronleft"),
                 routerController.GoBack)
             {
@@ -40,14 +41,23 @@ public ModalHeaderPresenter(RouterController routerController, Modal parent) : b
                     display = DisplayStyle.None
                 }
             };
-            View.leftSlot.Add(goBackIconLink);
+            View.leftSlot.Add(_goBackIconLink);
+
+            // Create network button and add it to the left slot
+            var networkButton = new NetworkButton
+            {
+                ShowName = false,
+                ShowChevron = true,
+                ShowBorder = false,
+                style =
+                {
+                    display = DisplayStyle.None
+                }
+            };
+            View.leftSlot.Add(networkButton);
 
             // Assign buttons to the corresponding view types
-            _leftSlotItems.Add(ViewType.QrCode, goBackIconLink);
-            _leftSlotItems.Add(ViewType.Wallet, goBackIconLink);
-            _leftSlotItems.Add(ViewType.WalletSearch, goBackIconLink);
-            _leftSlotItems.Add(ViewType.NetworkSearch, goBackIconLink);
-            _leftSlotItems.Add(ViewType.NetworkLoading, goBackIconLink);
+            _leftSlotItems.Add(ViewType.AccountPortfolio, networkButton);
 
             // Close button
             View.rightSlot.Add(new IconLink(
@@ -122,14 +132,20 @@ private void ViewChangedHandler(object _, ViewChangedEventArgs args)
                 : Visibility.Visible;
 
             // Left slot
-            if (_leftSlotItems.TryGetValue(args.newViewType, out var newItem))
+            if (Router.HistoryCount > 1)
             {
+                _goBackIconLink.style.display = DisplayStyle.Flex;
+                View.leftSlot.style.visibility = Visibility.Visible;
+            }
+            else if (_leftSlotItems.TryGetValue(args.newViewType, out var newItem))
+            {
+                _goBackIconLink.style.display = DisplayStyle.None;
                 newItem.style.display = DisplayStyle.Flex;
                 View.leftSlot.style.visibility = Visibility.Visible;
             }
             else
             {
-                View.leftSlot.style.visibility = Visibility.Hidden;
+                View.leftSlot.style.display = DisplayStyle.None;
             }
 
             // Header border
diff --git a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
index 9bdd984..1168562 100644
--- a/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Views/AccountPortfolioView/AccountPortfolioView.cs
@@ -20,6 +20,8 @@ public class AccountPortfolioView : VisualElement
 
         public Label AccountName { get; }
 
+        public VisualElement AccountChipContainer { get; }
+
         public event Action AccountClicked
         {
             add
@@ -43,7 +45,7 @@ public Clickable AccountChipClickable
             set
             {
                 _accountChipClickable = value;
-                this.AddManipulator(value);
+                AccountChipContainer.AddManipulator(value);
             }
         }
 
@@ -66,6 +68,7 @@ public AccountPortfolioView(string visualTreePath)
             name = Name;
 
             Balance = this.Q<Balance>(NameBalanceUsd);
+            AccountChipContainer = this.Q<VisualElement>(NameAccountChipContainer);
             AvatarImage = this.Q<Image>(NameAccountChipAvatarImage);
             AccountName = this.Q<Label>(NameAccountChipContentName);
         }

From e82cfcc0ee75a7055772640b43178b5223148bff Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 5 Feb 2025 17:20:55 +0200
Subject: [PATCH 14/21] Fix missing left header button

---
 .../Runtime/Presenters/ModalHeaderPresenter.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
index bdcd5ac..a18df74 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/ModalHeaderPresenter.cs
@@ -145,7 +145,7 @@ private void ViewChangedHandler(object _, ViewChangedEventArgs args)
             }
             else
             {
-                View.leftSlot.style.display = DisplayStyle.None;
+                View.leftSlot.style.visibility = Visibility.Hidden;
             }
 
             // Header border

From 4449e66e71ab61174d24063623d7b7c531993d6d Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 10 Feb 2025 11:11:45 +0200
Subject: [PATCH 15/21] Fix racing portfolio balance refresh

---
 .../Runtime/Controllers/AccountController.cs  | 74 +++++++++++++------
 .../Controllers/BlockchainApiController.cs    | 14 ++--
 2 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
index a693faa..47eed40 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/AccountController.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using UnityEngine;
 using Reown.AppKit.Unity.Http;
 using Reown.AppKit.Unity.Utils;
@@ -80,16 +81,16 @@ public float TotalBalanceUsd
         
         private string _profileName;
         private AccountAvatar _profileAvatar;
-        
-        private string _balance;
-        private string _balanceSymbol;
 
         private float _nativeTokenBalance;
         private string _nativeTokenSymbol;
         private float _totalBalanceUsd;
         
         public event PropertyChangedEventHandler PropertyChanged;
-        
+
+        private readonly object _updateLock = new();
+        private Task _currentUpdateTask;
+
         public async Task InitializeAsync(ConnectorController connectorController, NetworkController networkController, BlockchainApiController blockchainApiController)
         {
             if (IsInitialized)
@@ -110,29 +111,57 @@ private async void ConnectorAccountConnectedHandler(object sender, Connector.Acc
             var account = await e.GetAccountAsync();
             if (account.AccountId == AccountId)
                 return;
-            
-            Address = account.Address;
-            AccountId = account.AccountId;
-            ChainId = account.ChainId;
-            
-            await Task.WhenAll(
-                UpdateBalance(),
-                UpdateProfile()
-            );
+
+            lock (_updateLock)
+            {
+                Address = account.Address;
+                AccountId = account.AccountId;
+                ChainId = account.ChainId;
+
+                _currentUpdateTask = Task.WhenAll(
+                    UpdateBalance(),
+                    UpdateProfile()
+                );
+            }
+
+            await _currentUpdateTask;
         }
 
         private async void ConnectorAccountChangedHandler(object sender, Connector.AccountChangedEventArgs e)
         {
             var oldAddress = Address;
+            Task previousTask;
 
-            Address = e.Account.Address;
-            AccountId = e.Account.AccountId;
-            ChainId = e.Account.ChainId;
+            lock (_updateLock)
+            {
+                previousTask = _currentUpdateTask;
+                Address = e.Account.Address;
+                AccountId = e.Account.AccountId;
+                ChainId = e.Account.ChainId;
+            }
 
-            await Task.WhenAll(
-                UpdateBalance(),
-                e.Account.Address != oldAddress ? UpdateProfile() : Task.CompletedTask
-            );
+            // Wait for any existing update to complete before starting new ones
+            if (previousTask != null)
+            {
+                try
+                {
+                    await previousTask;
+                }
+                catch (Exception)
+                {
+                    // Ignore any errors from previous task
+                }
+            }
+
+            lock (_updateLock)
+            {
+                _currentUpdateTask = Task.WhenAll(
+                    UpdateBalance(),
+                    e.Account.Address != oldAddress ? UpdateProfile() : Task.CompletedTask
+                );
+            }
+
+            await _currentUpdateTask;
         }
 
         public async Task UpdateProfile()
@@ -171,13 +200,14 @@ public async Task UpdateBalance()
                 return;
             
             var response = await _blockchainApiController.GetBalanceAsync(Address);
-
+            
             // -- Native token balance
             var nativeTokenSymbol = _networkController.ActiveChain.NativeCurrency.symbol;
             if (response.Balances.Length == 0)
             {
                 NativeTokenBalance = 0;
                 NativeTokenSymbol = nativeTokenSymbol;
+                TotalBalanceUsd = 0;
                 return;
             }
 
@@ -207,7 +237,9 @@ public async Task UpdateBalance()
             foreach (var b in response.Balances)
             {
                 if (float.TryParse(b.value, out var result))
+                {
                     totalBalanceUsd += result;
+                }
             }
 
             TotalBalanceUsd = totalBalanceUsd;
diff --git a/src/Reown.AppKit.Unity/Runtime/Controllers/BlockchainApiController.cs b/src/Reown.AppKit.Unity/Runtime/Controllers/BlockchainApiController.cs
index 906cb02..1146d7a 100644
--- a/src/Reown.AppKit.Unity/Runtime/Controllers/BlockchainApiController.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Controllers/BlockchainApiController.cs
@@ -4,6 +4,7 @@
 using Reown.AppKit.Unity.Http;
 using Reown.AppKit.Unity.Model.BlockchainApi;
 using Reown.Sign.Interfaces;
+using UnityEngine;
 
 namespace Reown.AppKit.Unity
 {
@@ -40,13 +41,10 @@ public async Task<GetIdentityResponse> GetIdentityAsync(string address)
 
             var path = $"identity/{address}?projectId={projectId}";
 
-            if (string.IsNullOrWhiteSpace(_clientIdQueryParam))
+            if (string.IsNullOrWhiteSpace(_clientIdQueryParam) && _signClient != null)
             {
-                if (_signClient != null)
-                {
-                    var rawClientId = await _signClient.CoreClient.Crypto.GetClientId();
-                    _clientIdQueryParam = $"&clientId={Uri.EscapeDataString(rawClientId)}";
-                }
+                var rawClientId = await _signClient.CoreClient.Crypto.GetClientId();
+                _clientIdQueryParam = $"&clientId={Uri.EscapeDataString(rawClientId)}";
             }
 
             if (!string.IsNullOrWhiteSpace(_clientIdQueryParam))
@@ -61,7 +59,9 @@ public async Task<GetBalanceResponse> GetBalanceAsync(string address)
                 throw new ArgumentNullException(nameof(address));
 
             var projectId = AppKit.Config.projectId;
-            return await _httpClient.GetAsync<GetBalanceResponse>($"account/{address}/balance?projectId={projectId}&currency=usd", headers: _getBalanceHeaders);
+            var chainId = AppKit.NetworkController.ActiveChain.ChainId;
+            var path = $"account/{address}/balance?projectId={projectId}&currency=usd&chainId={chainId}";
+            return await _httpClient.GetAsync<GetBalanceResponse>(path, headers: _getBalanceHeaders);
         }
     }
 }
\ No newline at end of file

From dc102678f556eb48ada62cff4cb46f10356d6cb8 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 10 Feb 2025 14:41:21 +0200
Subject: [PATCH 16/21] Count personal sign requests and disable unity console
 in the sample app

---
 sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs | 1 +
 sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs    | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
index 2c92707..ab4e324 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppInit.cs
@@ -26,6 +26,7 @@ private void Start()
         private void InitDebugConsole()
         {
 #if UNITY_STANDALONE || UNITY_ANDROID || UNITY_IOS
+            Debug.developerConsoleVisible = false; // disable Unity console
             DontDestroyOnLoad(gameObject);
             _debugConsole.SetActive(true);
 #endif
diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
index 703289d..706e297 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
@@ -16,6 +16,7 @@ namespace Sample
     public class Dapp : MonoBehaviour
     {
         [SerializeField] private UIDocument _uiDocument;
+        private int _messageCounter = 0;
 
         private ButtonStruct[] _buttons;
         private VisualElement _buttonsContainer;
@@ -215,7 +216,10 @@ public async void OnPersonalSignButton()
             {
                 var account = await AppKit.GetAccountAsync();
 
-                const string message = "Hello from Unity!";
+                _messageCounter++;
+                var message = $"Hello from Unity! (Request #{_messageCounter})";
+
+                Notification.ShowMessage($"Signing message: {message}");
 
                 // It's also possible to sign a message as a byte array
                 // var messageBytes = System.Text.Encoding.UTF8.GetBytes(message);
@@ -224,7 +228,7 @@ public async void OnPersonalSignButton()
                 var signature = await AppKit.Evm.SignMessageAsync(message);
                 var isValid = await AppKit.Evm.VerifyMessageSignatureAsync(account.Address, message, signature);
 
-                Notification.ShowMessage($"Signature valid: {isValid}");
+                Notification.ShowMessage($"Signature valid: {isValid} (Request #{_messageCounter})");
             }
             catch (RpcResponseException e)
             {

From bffa9168ff54fe4dee4ab98ff55a7ccf074dd050 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 10 Feb 2025 17:16:51 +0200
Subject: [PATCH 17/21] Change signature validation order

---
 .../Runtime/Evm/NethereumEvmService.cs              | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
index ab5b8b3..cfd63d2 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
@@ -159,6 +159,12 @@ protected override Task<string> SignMessageAsyncCore(byte[] rawMessage, string a
 
         protected override async Task<bool> VerifyMessageSignatureAsyncCore(string address, string message, string signature)
         {
+            // -- EIP-191
+            var recoveredAddress = _ethereumMessageSigner.EncodeUTF8AndEcRecover(message, signature);
+            if (recoveredAddress.IsTheSameAddress(address))
+            {
+                return true;
+            }
 
             // -- ERC-6492
             var erc6492Service = Web3.Eth.SignatureValidationPredeployContractERC6492;
@@ -167,13 +173,6 @@ protected override async Task<bool> VerifyMessageSignatureAsyncCore(string addre
                 return await erc6492Service.IsValidSignatureMessageAsync(address, message, signature.HexToByteArray());
             }
 
-            // -- EOA
-            var recoveredAddress = _ethereumMessageSigner.EncodeUTF8AndEcRecover(message, signature);
-            if (recoveredAddress.IsTheSameAddress(address))
-            {
-                return true;
-            }
-
             // -- ERC-1271
             var ethGetCode = await Web3.Eth.GetCode.SendRequestAsync(address);
             if (ethGetCode is { Length: > 2 })

From f1c6c268ad0d5080a992aef9e55fe4b980258d5c Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Mon, 10 Feb 2025 17:17:17 +0200
Subject: [PATCH 18/21] Improve sample app telemetry

---
 .../Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs   | 11 ++++++++++-
 sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs      |  8 ++++++--
 sample/Reown.AppKit.Unity/Packages/manifest.json      |  2 +-
 sample/Reown.AppKit.Unity/Packages/packages-lock.json |  4 ++--
 .../ProjectSettings/ProjectSettings.asset             |  4 ++--
 src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs      |  4 +---
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
index e62405d..ab5e363 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/AppKitInit.cs
@@ -8,6 +8,7 @@
 
 #if !UNITY_WEBGL
 using mixpanel;
+using Sentry;
 #endif
 
 namespace Sample
@@ -73,9 +74,17 @@ await AppKit.InitializeAsync(
             );
             
 #if !UNITY_WEBGL
-            // The Mixpanel is used by the sample project to collect telemetry
+            // The Mixpanel are Sentry are used by the sample project to collect telemetry
             var clientId = await AppKit.Instance.SignClient.CoreClient.Crypto.GetClientId();
             Mixpanel.Identify(clientId);
+
+            SentrySdk.ConfigureScope(scope =>
+            {
+                scope.User = new SentryUser
+                {
+                    Id = clientId
+                };
+            });
 #endif
 
             Debug.Log($"[AppKit Init] AppKit initialized. Loading menu scene...");
diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
index 706e297..ecf1ec0 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
@@ -7,6 +7,7 @@
 using Reown.AppKit.Unity;
 using Reown.AppKit.Unity.Profile;
 using Reown.Core;
+using Reown.Core.Common.Model.Errors;
 using UnityEngine;
 using UnityEngine.UIElements;
 using ButtonUtk = UnityEngine.UIElements.Button;
@@ -219,18 +220,21 @@ public async void OnPersonalSignButton()
                 _messageCounter++;
                 var message = $"Hello from Unity! (Request #{_messageCounter})";
 
-                Notification.ShowMessage($"Signing message: {message}");
+                Notification.ShowMessage($"Signing message:\n\n{message}");
+
+                await System.Threading.Tasks.Task.Delay(1_000);
 
                 // It's also possible to sign a message as a byte array
                 // var messageBytes = System.Text.Encoding.UTF8.GetBytes(message);
                 // var signature = await AppKit.Evm.SignMessageAsync(messageBytes);
 
                 var signature = await AppKit.Evm.SignMessageAsync(message);
+                Debug.Log($"Recieved signature: {signature}");
                 var isValid = await AppKit.Evm.VerifyMessageSignatureAsync(account.Address, message, signature);
 
                 Notification.ShowMessage($"Signature valid: {isValid} (Request #{_messageCounter})");
             }
-            catch (RpcResponseException e)
+            catch (ReownNetworkException e)
             {
                 Notification.ShowMessage($"{nameof(RpcResponseException)}:\n{e.Message}");
                 Debug.LogException(e, this);
diff --git a/sample/Reown.AppKit.Unity/Packages/manifest.json b/sample/Reown.AppKit.Unity/Packages/manifest.json
index 9eb200f..a2437fa 100644
--- a/sample/Reown.AppKit.Unity/Packages/manifest.json
+++ b/sample/Reown.AppKit.Unity/Packages/manifest.json
@@ -20,7 +20,7 @@
     "com.unity.test-framework": "1.4.5",
     "com.unity.ugui": "2.0.0",
     "com.yasirkula.ingamedebugconsole": "1.6.8",
-    "io.sentry.unity": "2.3.0",
+    "io.sentry.unity": "2.4.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
diff --git a/sample/Reown.AppKit.Unity/Packages/packages-lock.json b/sample/Reown.AppKit.Unity/Packages/packages-lock.json
index c8666d0..9b83c80 100644
--- a/sample/Reown.AppKit.Unity/Packages/packages-lock.json
+++ b/sample/Reown.AppKit.Unity/Packages/packages-lock.json
@@ -214,7 +214,7 @@
       "url": "https://package.openupm.com"
     },
     "io.sentry.unity": {
-      "version": "2.3.0",
+      "version": "2.4.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -367,4 +367,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset b/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
index ea61340..282659f 100644
--- a/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
+++ b/sample/Reown.AppKit.Unity/ProjectSettings/ProjectSettings.asset
@@ -169,10 +169,10 @@ PlayerSettings:
   buildNumber:
     Standalone: 0
     VisionOS: 0
-    iPhone: 2
+    iPhone: 3
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 2
+  AndroidBundleVersionCode: 3
   AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
index f1795a2..80d6948 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/EvmService.cs
@@ -32,9 +32,7 @@ public async Task<string> SignMessageAsync(string message, string address = null
                 throw new ArgumentNullException(nameof(message));
 
             address ??= (await AppKit.GetAccountAsync()).Address;
-
-            Debug.Log($"SignMessageAsync: {message}, {address}");
-
+            
             return await SignMessageAsyncCore(message, address);
         }
 

From 19acde3c2153f7141b1e27e2ad922054aece9655 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 12 Feb 2025 15:59:22 +0200
Subject: [PATCH 19/21] Update portfolio balance on open

---
 .../Reown/AppKit/Components/Balance/Balance.uxml  |  4 ++--
 .../Presenters/AccountPortfolioPresenter.cs       | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
index 0cab797..4d34530 100644
--- a/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
+++ b/src/Reown.AppKit.Unity/Resources/Reown/AppKit/Components/Balance/Balance.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="Balance.uss"/>
     <ui:Label name="balance__symbol" text="$"/>
-    <ui:Label name="balance__integer" text="420"/>
-    <ui:Label name="balance__decimal" text=".69"/>
+    <ui:Label name="balance__integer" text="0"/>
+    <ui:Label name="balance__decimal" text=".00"/>
 </ui:UXML>
\ No newline at end of file
diff --git a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
index 55555a7..88b7c83 100644
--- a/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Presenters/AccountPortfolioPresenter.cs
@@ -1,6 +1,8 @@
+using System;
 using System.ComponentModel;
 using Reown.AppKit.Unity.Components;
 using Reown.AppKit.Unity.Utils;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Reown.AppKit.Unity
@@ -26,6 +28,19 @@ private void AccountClickedHandler()
             Router.OpenView(ViewType.AccountSettings);
         }
 
+        protected override async void OnVisibleCore()
+        {
+            try
+            {
+                base.OnVisibleCore();
+                await AppKit.AccountController.UpdateBalance();
+            }
+            catch (Exception e)
+            {
+                Debug.LogException(e);
+            }
+        }
+
         private void AccountPropertyChangedHandler(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)

From 102bb4efd16cfad17b1e60b8c3720242998992c4 Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Wed, 12 Feb 2025 16:58:49 +0200
Subject: [PATCH 20/21] More logs for smart account debugging

---
 .../Connectors/Profile/ProfileConnector.cs      | 17 +++++++++++++++--
 .../Runtime/Evm/NethereumEvmService.cs          | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
index 1071597..6915450 100644
--- a/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Connectors/Profile/ProfileConnector.cs
@@ -15,7 +15,7 @@ public class ProfileConnector : WalletConnectConnector
 
         public Account[] EoaAccounts { get; private set; }
 
-        public AccountType PreferredAccountType { get; private set; }
+        public AccountType PreferredAccountType { get; private set; } = AccountType.None;
 
         public Account PreferredAccount { get; private set; }
 
@@ -38,16 +38,24 @@ protected override async void OnAccountConnected(AccountConnectedEventArgs e)
                     .Select(x => new Account(x))
                     .ToArray();
 
+                Debug.Log($"[ProfileConnector] Smart accounts: [{string.Join(", ", SmartAccounts.Select(x => x.AccountId))}]");
+
                 var allAccounts = await GetAccountsAsyncCore();
                 EoaAccounts = allAccounts
                     .Except(SmartAccounts)
                     .ToArray();
 
+                Debug.Log($"[ProfileConnector] EOA accounts: [{string.Join(", ", EoaAccounts.Select(x => x.AccountId))}]");
+
+
                 Email = sessionProperties["email"];
 
                 base.OnAccountConnected(e);
 
                 var preferredAccountTypeStr = PlayerPrefs.GetString(PreferredAccountTypeKey);
+
+                Debug.Log($"[ProfileConnector] Preferred account type: [{preferredAccountTypeStr}]");
+                
                 var preferredAccountType = Enum.TryParse<AccountType>(preferredAccountTypeStr, out var accountType)
                     ? accountType
                     : AccountType.SmartAccount;
@@ -61,7 +69,7 @@ protected override async void OnAccountConnected(AccountConnectedEventArgs e)
 
         public void SetPreferredAccount(AccountType accountType)
         {
-            Debug.Log($"SetPreferredAccount: {accountType}. Current: {PreferredAccountType}");
+            Debug.Log($"[ProfileConnector]SetPreferredAccount: {accountType}. Current: {PreferredAccountType}");
             if (PreferredAccountType == accountType)
                 return;
 
@@ -72,7 +80,10 @@ public void SetPreferredAccount(AccountType accountType)
         private void SetPreferredAccountCore(AccountType accountType)
         {
             if (PreferredAccountType == accountType)
+            {
+                Debug.Log($"[ProfileConnector] The PreferredAccountType is already set to {accountType}. Skipping.");
                 return;
+            }
 
             if (AppKit.NetworkController.ActiveChain == null)
                 return;
@@ -84,6 +95,8 @@ private void SetPreferredAccountCore(AccountType accountType)
                 ? SmartAccounts.First(a => a.ChainId == chainId)
                 : EoaAccounts.First(a => a.ChainId == chainId);
 
+            Debug.Log($"[ProfileConnector] New preferred account id: {PreferredAccount.AccountId}.");
+
             PreferredAccountType = accountType;
 
             // The preferred account type is saved so it can be recovered after the session is resumed
diff --git a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
index cfd63d2..1ec482e 100644
--- a/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
+++ b/src/Reown.AppKit.Unity/Runtime/Evm/NethereumEvmService.cs
@@ -159,21 +159,30 @@ protected override Task<string> SignMessageAsyncCore(byte[] rawMessage, string a
 
         protected override async Task<bool> VerifyMessageSignatureAsyncCore(string address, string message, string signature)
         {
+            Debug.Log($"[EVM] Verifying signature with EIP-191");
             // -- EIP-191
             var recoveredAddress = _ethereumMessageSigner.EncodeUTF8AndEcRecover(message, signature);
+            Debug.Log($"[EVM] EIP-191 signature valid: {recoveredAddress.IsTheSameAddress(address)}\nRecovered address: {recoveredAddress}\nCurrent address:{address}");
             if (recoveredAddress.IsTheSameAddress(address))
             {
                 return true;
             }
 
             // -- ERC-6492
+            Debug.Log($"[EVM] Verifying signature with ERC-6492");
             var erc6492Service = Web3.Eth.SignatureValidationPredeployContractERC6492;
             if (erc6492Service.IsERC6492Signature(signature))
             {
+                Debug.Log($"[EVM] Preparing ERC-6492 request....");
                 return await erc6492Service.IsValidSignatureMessageAsync(address, message, signature.HexToByteArray());
             }
+            else
+            {
+                Debug.Log($"[EVM] The signature is NOT ERC-6492");
+            }
 
             // -- ERC-1271
+            Debug.Log($"[EVM] Verifying signature with ERC-1271");
             var ethGetCode = await Web3.Eth.GetCode.SendRequestAsync(address);
             if (ethGetCode is { Length: > 2 })
             {
@@ -189,6 +198,7 @@ protected override async Task<bool> VerifyMessageSignatureAsyncCore(string addre
 
                 try
                 {
+                    Debug.Log($"[EVM] Preparing ERC-1271 request....");
                     var result = await handler.QueryAsync<byte[]>(address, isValidSignatureFunctionMessage);
 
                     // The magic value 0x1626ba7e
@@ -212,6 +222,10 @@ protected override async Task<bool> VerifyMessageSignatureAsyncCore(string addre
                     return false;
                 }
             }
+            else
+            {
+                Debug.Log($"[EVM] ERC-1271 verification failed because smart contract hasn't been found at {address}");
+            }
 
             return false;
         }

From 7f91d71b75d7734fd570744c1070f23e803a85dd Mon Sep 17 00:00:00 2001
From: skibitsky <gleb@skibitsky.com>
Date: Sun, 16 Feb 2025 13:06:46 +0200
Subject: [PATCH 21/21] Refactor SessionRequest redirects on native

---
 .../Reown.AppKit.Unity/Assets/Scripts/Dapp.cs |   8 +-
 .../Runtime/ReownSignUnityInterceptor.cs      |  38 +------
 src/Reown.Sign.Unity/Runtime/Linker.cs        |  89 ++++++----------
 .../Runtime/SignClientUnity.cs                |  19 ++--
 src/Reown.Sign/Runtime/Engine.cs              |  38 ++++---
 .../Runtime/Interfaces/IEngineAPI.cs          |   6 ++
 .../Engine/Events/SessionRequestEvent.cs      |  11 +-
 src/Reown.Sign/Runtime/SignClient.cs          |   2 +
 test/Reown.Sign.Test/SignTests.cs             | 100 ++++++++++++++++++
 9 files changed, 185 insertions(+), 126 deletions(-)

diff --git a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
index ecf1ec0..e3b5c1e 100644
--- a/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
+++ b/sample/Reown.AppKit.Unity/Assets/Scripts/Dapp.cs
@@ -213,12 +213,12 @@ public async void OnPersonalSignButton()
         {
             Debug.Log("[AppKit Sample] OnPersonalSignButton");
 
+            var messageCounter = ++_messageCounter;
             try
             {
                 var account = await AppKit.GetAccountAsync();
 
-                _messageCounter++;
-                var message = $"Hello from Unity! (Request #{_messageCounter})";
+                var message = $"Hello from Unity! (Request #{messageCounter})";
 
                 Notification.ShowMessage($"Signing message:\n\n{message}");
 
@@ -232,11 +232,11 @@ public async void OnPersonalSignButton()
                 Debug.Log($"Recieved signature: {signature}");
                 var isValid = await AppKit.Evm.VerifyMessageSignatureAsync(account.Address, message, signature);
 
-                Notification.ShowMessage($"Signature valid: {isValid} (Request #{_messageCounter})");
+                Notification.ShowMessage($"Signature valid: {isValid} (Request #{messageCounter})");
             }
             catch (ReownNetworkException e)
             {
-                Notification.ShowMessage($"{nameof(RpcResponseException)}:\n{e.Message}");
+                Notification.ShowMessage($"Error processing personal_sign request #{messageCounter}\n\n{nameof(RpcResponseException)}:\n{e.Message}");
                 Debug.LogException(e, this);
             }
         }
diff --git a/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs b/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
index 2111186..5b0fead 100644
--- a/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
+++ b/src/Reown.Sign.Nethereum.Unity/Runtime/ReownSignUnityInterceptor.cs
@@ -28,24 +28,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
             RpcRequest request,
             string route = null)
         {
-            var result = ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, request, route);
-
-// #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
-            try
-            {
-                if (ReownInterceptor.SignMethods.Contains(request.Method))
-                {
-                    var activeSessionTopic = SignClient.AddressProvider.DefaultSession.Topic;
-                    SignClient.Linker.OpenSessionRequestDeepLinkAfterMessageFromSession(activeSessionTopic);
-                }
-            }
-            catch (Exception e)
-            {
-                ReownLogger.LogError(e);
-            }
-// #endif
-
-            return result;
+            return ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, request, route);
         }
 
         public override Task<object> InterceptSendRequestAsync<T>(
@@ -54,24 +37,7 @@ public override Task<object> InterceptSendRequestAsync<T>(
             string route = null,
             params object[] paramList)
         {
-            var result = ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, method, route, paramList);
-
-// #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS)
-            try
-            {
-                if (ReownInterceptor.SignMethods.Contains(method))
-                {
-                    var activeSessionTopic = SignClient.AddressProvider.DefaultSession.Topic;
-                    SignClient.Linker.OpenSessionRequestDeepLinkAfterMessageFromSession(activeSessionTopic);
-                }
-            }
-            catch (Exception e)
-            {
-                ReownLogger.LogError(e);
-            }
-// #endif
-
-            return result;
+            return ReownInterceptor.InterceptSendRequestAsync(interceptedSendRequestAsync, method, route, paramList);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Reown.Sign.Unity/Runtime/Linker.cs b/src/Reown.Sign.Unity/Runtime/Linker.cs
index b5796c4..96dd386 100644
--- a/src/Reown.Sign.Unity/Runtime/Linker.cs
+++ b/src/Reown.Sign.Unity/Runtime/Linker.cs
@@ -4,6 +4,7 @@
 using Reown.Core.Models.Publisher;
 using Reown.Sign.Interfaces;
 using Reown.Sign.Models;
+using Reown.Sign.Models.Engine.Events;
 using Reown.Sign.Unity.Utils;
 using UnityEngine;
 
@@ -11,12 +12,11 @@ namespace Reown.Sign.Unity
 {
     public class Linker : IDisposable
     {
-        private readonly ISignClient _signClient;
-        private readonly Dictionary<string, uint> _sessionMessagesCounter = new();
+        private readonly SignClientUnity _signClient;
 
         protected bool disposed;
 
-        public Linker(ISignClient signClient)
+        public Linker(SignClientUnity signClient)
         {
             _signClient = signClient;
 
@@ -25,7 +25,7 @@ public Linker(ISignClient signClient)
 
         private void RegisterEventListeners()
         {
-            _signClient.CoreClient.Relayer.Publisher.OnPublishedMessage += OnPublisherPublishedMessage;
+            _signClient.SessionRequestSentUnity += SessionRequestSentHandler;
         }
 
         public static void OpenSessionProposalDeepLink(string uri, string nativeRedirect)
@@ -50,7 +50,13 @@ public static void OpenSessionProposalDeepLink(string uri, string nativeRedirect
 #endif
         }
 
-        public static void OpenSessionRequestDeepLink(Session session)
+        private void SessionRequestSentHandler(object _, SessionRequestEvent e)
+        {
+            var session = _signClient.Session.Get(e.Topic);
+            OpenSessionRequestDeepLink(session, e.Id);
+        }
+
+        public static void OpenSessionRequestDeepLink(Session session, long requestId)
         {
             if (session == null)
                 throw new ArgumentNullException(nameof(session));
@@ -59,30 +65,39 @@ public static void OpenSessionRequestDeepLink(Session session)
                 return;
 
             var redirectNative = session.Peer.Metadata.Redirect?.Native;
+            string deeplink;
 
             if (string.IsNullOrWhiteSpace(redirectNative))
             {
-                if (!TryGetRecentWalletDeepLink(out var deeplink))
+                if (!TryGetRecentWalletDeepLink(out deeplink))
                     return;
 
                 Debug.LogWarning(
                     $"[Linker] No redirect found for {session.Peer.Metadata.Name}. Using deep link from the Recent Wallet."
                 );
-
-                if (!deeplink.Contains("://"))
-                    deeplink = $"{deeplink}://";
-
-                Application.OpenURL(deeplink);
             }
             else
             {
-                ReownLogger.Log($"[Linker] Open native deep link: {redirectNative}");
-
-                if (!redirectNative.Contains("://"))
-                    redirectNative = $"{redirectNative}://";
+                deeplink = redirectNative;
+                ReownLogger.Log($"[Linker] Open native deep link: {deeplink}");
+            }
 
-                Application.OpenURL(redirectNative);
+            if (!deeplink.Contains("://"))
+            {
+                deeplink = deeplink.Replace("/", "").Replace(":", "");
+                deeplink = $"{deeplink}://";
             }
+
+            if (!deeplink.EndsWith('/'))
+                deeplink = $"{deeplink}/";
+
+            if (!deeplink.EndsWith("wc/"))
+                deeplink = $"{deeplink}wc/";
+
+            deeplink = $"{deeplink}?requestId={requestId}&sessionTopic={session.Topic}";
+
+            Debug.Log($"[Linker] Opening URL {deeplink}");
+            Application.OpenURL(deeplink);
         }
 
         public static string BuildConnectionDeepLink(string appLink, string wcUri)
@@ -108,46 +123,6 @@ public static string BuildConnectionDeepLink(string appLink, string wcUri)
             return $"{safeAppUrl}wc?uri={encodedWcUrl}";
         }
 
-        public void OpenSessionRequestDeepLink(string sessionTopic)
-        {
-            var session = _signClient.Session.Get(sessionTopic);
-            OpenSessionRequestDeepLink(session);
-        }
-
-        public virtual void OpenSessionRequestDeepLink()
-        {
-            var session = _signClient.AddressProvider.DefaultSession;
-            OpenSessionRequestDeepLink(session);
-        }
-
-        protected virtual void OnPublisherPublishedMessage(object sender, PublishParams publishParams)
-        {
-            UnitySyncContext.Context.Post(_ =>
-            {
-                if (string.IsNullOrWhiteSpace(publishParams.Topic))
-                    return;
-
-                if (_sessionMessagesCounter.TryGetValue(publishParams.Topic, out var messageCount))
-                {
-                    ReownLogger.Log($"[Linker] OnPublisherPublishedMessage. Message count: {messageCount}");
-                    if (messageCount != 0)
-                    {
-                        _sessionMessagesCounter[publishParams.Topic] = messageCount - 1;
-                        OpenSessionRequestDeepLink(publishParams.Topic);
-                    }
-                }
-            }, null);
-        }
-
-        public void OpenSessionRequestDeepLinkAfterMessageFromSession(string sessionTopic)
-        {
-            ReownLogger.Log($"[Linker] OpenSessionRequestDeepLinkAfterMessageFromSession. Topic: {sessionTopic}");
-            if (_sessionMessagesCounter.TryGetValue(sessionTopic, out var messageCount))
-                _sessionMessagesCounter[sessionTopic] = messageCount + 1;
-            else
-                _sessionMessagesCounter.Add(sessionTopic, 1);
-        }
-
         public static bool CanOpenURL(string url)
         {
             if (string.IsNullOrWhiteSpace(url))
@@ -201,7 +176,7 @@ protected virtual void Dispose(bool disposing)
             if (disposed) return;
 
             if (disposing)
-                _signClient.CoreClient.Relayer.Publisher.OnPublishedMessage -= OnPublisherPublishedMessage;
+                _signClient.SessionRequestSent -= SessionRequestSentHandler;
 
             disposed = true;
         }
diff --git a/src/Reown.Sign.Unity/Runtime/SignClientUnity.cs b/src/Reown.Sign.Unity/Runtime/SignClientUnity.cs
index 2884228..fd71175 100644
--- a/src/Reown.Sign.Unity/Runtime/SignClientUnity.cs
+++ b/src/Reown.Sign.Unity/Runtime/SignClientUnity.cs
@@ -25,14 +25,16 @@ public class SignClientUnity : SignClient
         public event EventHandler<Session> SessionConnectedUnity;
         public event EventHandler<Session> SessionUpdatedUnity;
         public event EventHandler SessionDisconnectedUnity;
+        public event EventHandler<SessionRequestEvent> SessionRequestSentUnity;
 
         private SignClientUnity(SignClientOptions options) : base(options)
         {
             Linker = new Linker(this);
 
-            SessionConnected += OnSessionConnected;
-            SessionUpdateRequest += OnSessionUpdated;
-            SessionDeleted += OnSessionDeleted;
+            SessionConnected += SessionConnectedHandler;
+            SessionUpdateRequest += SessionUpdatedHandler;
+            SessionDeleted += SessionDeletedHandler;
+            SessionRequestSent += SessionRequestSentHandler;
         }
 
         public static async Task<SignClientUnity> Create(SignClientOptions options)
@@ -110,22 +112,27 @@ public async Task<bool> TryResumeSessionAsync()
             return true;
         }
 
-        private void OnSessionConnected(object sender, Session session)
+        private void SessionConnectedHandler(object sender, Session session)
         {
             UnitySyncContext.Context.Post(_ => { SessionConnectedUnity?.Invoke(this, session); }, null);
         }
 
-        private void OnSessionUpdated(object sender, SessionEvent sessionEvent)
+        private void SessionUpdatedHandler(object sender, SessionEvent sessionEvent)
         {
             var sessionStruct = Session.Values.First(s => s.Topic == sessionEvent.Topic);
             UnitySyncContext.Context.Post(_ => { SessionUpdatedUnity?.Invoke(this, sessionStruct); }, null);
         }
 
-        private void OnSessionDeleted(object sender, SessionEvent _)
+        private void SessionDeletedHandler(object sender, SessionEvent _)
         {
             UnitySyncContext.Context.Post(_ => { SessionDisconnectedUnity?.Invoke(this, EventArgs.Empty); }, null);
         }
 
+        private void SessionRequestSentHandler(object sender, SessionRequestEvent e)
+        {
+            UnitySyncContext.Context.Post(_ => { SessionRequestSentUnity?.Invoke(this, e); }, null);
+        }
+
         protected override void Dispose(bool disposing)
         {
             if (_disposed)
diff --git a/src/Reown.Sign/Runtime/Engine.cs b/src/Reown.Sign/Runtime/Engine.cs
index 23c7c1c..a31e749 100644
--- a/src/Reown.Sign/Runtime/Engine.cs
+++ b/src/Reown.Sign/Runtime/Engine.cs
@@ -200,6 +200,12 @@ public bool HasSessionAuthenticateRequestSubscribers
         /// </summary>
         public event EventHandler<PairingEvent> PairingDeleted;
 
+        /// <summary>
+        ///     This event is invoked after session request has been sent
+        ///     Event Side: dApp
+        /// </summary>
+        public event EventHandler<SessionRequestEvent> SessionRequestSent;
+
         /// <summary>
         ///     Initialize the Engine. This loads any persistant state and connects to the WalletConnect
         ///     relay server
@@ -714,30 +720,35 @@ public async Task<TR> Request<T, TR>(string topic, T data, string chainId = null
 
             var method = RpcMethodAttribute.MethodForType<T>();
 
-            string defaultChainId;
+            string requestChainId;
             if (string.IsNullOrWhiteSpace(chainId))
             {
                 var sessionData = Client.Session.Get(topic);
                 var defaultNamespace = Client.AddressProvider.DefaultNamespace ??
                                        sessionData.Namespaces.Keys.FirstOrDefault();
-                defaultChainId = Client.AddressProvider.DefaultChainId ??
+                requestChainId = Client.AddressProvider.DefaultChainId ??
                                  sessionData.Namespaces[defaultNamespace].Chains[0];
             }
             else
             {
-                defaultChainId = chainId;
+                requestChainId = chainId;
             }
 
             var request = new JsonRpcRequest<T>(method, data);
 
             IsInitialized();
-            await PrivateThis.IsValidRequest(topic, request, defaultChainId);
-            var id = new long[1];
-
+            await PrivateThis.IsValidRequest(topic, request, requestChainId);
             var taskSource = new TaskCompletionSource<TR>();
 
+            var id = await MessageHandler.SendRequest<SessionRequest<T>, TR>(topic,
+                new SessionRequest<T>
+                {
+                    ChainId = requestChainId,
+                    Request = request
+                });
+
             SessionRequestEvents<T, TR>()
-                .FilterResponses(e => e.Topic == topic && e.Response.Id == id[0])
+                .FilterResponses(e => e.Topic == topic && e.Response.Id == id)
                 .OnResponse += args =>
             {
                 if (args.Response.IsError)
@@ -748,13 +759,12 @@ public async Task<TR> Request<T, TR>(string topic, T data, string chainId = null
                 return Task.CompletedTask;
             };
 
-            id[0] = await MessageHandler.SendRequest<SessionRequest<T>, TR>(topic,
-                new SessionRequest<T>
-                {
-                    ChainId = defaultChainId,
-                    Request = request
-                });
-
+            SessionRequestSent?.Invoke(this, new SessionRequestEvent
+            {
+                Topic = topic,
+                Id = id,
+                ChainId = requestChainId
+            });
 
             return await taskSource.Task;
         }
diff --git a/src/Reown.Sign/Runtime/Interfaces/IEngineAPI.cs b/src/Reown.Sign/Runtime/Interfaces/IEngineAPI.cs
index 19eaa58..9cad62d 100644
--- a/src/Reown.Sign/Runtime/Interfaces/IEngineAPI.cs
+++ b/src/Reown.Sign/Runtime/Interfaces/IEngineAPI.cs
@@ -130,6 +130,12 @@ public interface IEngineAPI
         /// </summary>
         event EventHandler<PairingEvent> PairingDeleted;
 
+        /// <summary>
+        ///     This event is invoked after session request has been sent
+        ///     Event Side: dApp
+        /// </summary>
+        event EventHandler<SessionRequestEvent> SessionRequestSent;
+
         /// <summary>
         ///     Subscribes to a specific session event (wc_sessionEvent). The event is identified by its name and handled by the provided event handler.
         /// </summary>
diff --git a/src/Reown.Sign/Runtime/Models/Engine/Events/SessionRequestEvent.cs b/src/Reown.Sign/Runtime/Models/Engine/Events/SessionRequestEvent.cs
index 2d97e9f..d5a987d 100644
--- a/src/Reown.Sign/Runtime/Models/Engine/Events/SessionRequestEvent.cs
+++ b/src/Reown.Sign/Runtime/Models/Engine/Events/SessionRequestEvent.cs
@@ -1,24 +1,17 @@
 using Newtonsoft.Json;
-using Reown.Core.Network;
 
 namespace Reown.Sign.Models.Engine.Events
 {
     /// <summary>
-    ///     An event that is emitted when a session request is received of type T.
+    ///     An event that is emitted when a session request has been sent
     /// </summary>
     /// <typeparam name="T">The type of request data</typeparam>
-    public class SessionRequestEvent<T> : SessionEvent
+    public class SessionRequestEvent : SessionEvent
     {
         /// <summary>
         ///     The chainId this request should be performed in
         /// </summary>
         [JsonProperty("chainId")]
         public string ChainId;
-
-        /// <summary>
-        ///     The request arguments of this session request
-        /// </summary>
-        [JsonProperty("request")]
-        public IRequestArguments<T> Request;
     }
 }
\ No newline at end of file
diff --git a/src/Reown.Sign/Runtime/SignClient.cs b/src/Reown.Sign/Runtime/SignClient.cs
index d9c8d97..1ccacc6 100644
--- a/src/Reown.Sign/Runtime/SignClient.cs
+++ b/src/Reown.Sign/Runtime/SignClient.cs
@@ -190,6 +190,7 @@ public bool HasSessionAuthenticateRequestSubscribers
         public event EventHandler<Session> SessionApproved;
         public event EventHandler<PairingEvent> PairingPinged;
         public event EventHandler<PairingEvent> PairingDeleted;
+        public event EventHandler<SessionRequestEvent> SessionRequestSent; 
 
         /// <summary>
         ///     Create a new <see cref="SignClient" /> instance with the given <see cref="SignClientOptions" />
@@ -527,6 +528,7 @@ private void WrapEngineEvents()
             Engine.SessionUpdated += (sender, @event) => SessionUpdated?.Invoke(sender, @event);
             Engine.PairingDeleted += (sender, @event) => PairingDeleted?.Invoke(sender, @event);
             Engine.PairingPinged += (sender, @event) => PairingPinged?.Invoke(sender, @event);
+            Engine.SessionRequestSent += (sender, @event) => SessionRequestSent?.Invoke(sender, @event);
         }
 
         protected async Task Initialize()
diff --git a/test/Reown.Sign.Test/SignTests.cs b/test/Reown.Sign.Test/SignTests.cs
index bf8925d..f124a09 100644
--- a/test/Reown.Sign.Test/SignTests.cs
+++ b/test/Reown.Sign.Test/SignTests.cs
@@ -437,6 +437,8 @@ public async Task TestSessionRequestResponse()
     
             return Task.CompletedTask;
         };
+
+        _dapp.Engine.SessionRequestSent += (sender, @event) => Assert.Equal(@event.Topic, sessionData.Topic);
     
         // 2. Send the request from the dapp client
         var responseReturned = await _dapp.Engine.Request<TestRequest, TestResponse>(sessionData.Topic, testData);
@@ -1097,4 +1099,102 @@ public async Task TestAddressProviderDisconnect()
     
         Assert.False(_dapp.AddressProvider.HasDefaultSession);
     }
+
+    [Fact]
+    [Trait("Category", "integration")]
+    public async Task TestSessionRequestError()
+    {
+        const string testAddress = "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045";
+        const string testMethod = "test_method";
+
+        var dappConnectOptions = new ConnectOptions()
+        {
+            RequiredNamespaces = new RequiredNamespaces()
+            {
+                {
+                    "eip155", new ProposedNamespace()
+                    {
+                        Methods = new[]
+                        {
+                            testMethod
+                        },
+                        Chains = new[]
+                        {
+                            "eip155:1",
+                            "eip155:10"
+                        },
+                        Events = new[]
+                        {
+                            "chainChanged",
+                            "accountsChanged"
+                        }
+                    }
+                }
+            }
+        };
+
+        var connectData = await _dapp.Connect(dappConnectOptions);
+
+        var tcs = new TaskCompletionSource();
+        _wallet.SessionProposed += async (sender, @event) =>
+        {
+            var id = @event.Id;
+
+            var approvedNamespaces = new Namespaces(@event.Proposal.RequiredNamespaces);
+            approvedNamespaces["eip155"]
+                .WithAccount($"eip155:1:{testAddress}")
+                .WithAccount($"eip155:10:{testAddress}");
+
+            var approveParams = new ApproveParams
+            {
+                Id = id,
+                Namespaces = approvedNamespaces
+            };
+
+            var approveData = await _wallet.Approve(approveParams);
+            await approveData.Acknowledged();
+
+            tcs.SetResult();
+        };
+
+        _ = await _wallet.Pair(connectData.Uri);
+
+        await tcs.Task;
+
+        var sessionData = await connectData.Approval;
+
+        var testData = new TestRequest()
+        {
+            a = -1, // Invalid input that should trigger an error
+            b = -1
+        };
+
+        // The wallet client will respond with an error for invalid input
+        _wallet.Engine.SessionRequestEvents<TestRequest, TestResponse>()
+            .OnRequest += (requestData) =>
+        {
+            var request = requestData.Request;
+            var data = request.Params;
+
+            if (data.a < 0 || data.b < 0)
+            {
+                requestData.Error = Error.FromErrorType(ErrorType.GENERIC, "Negative numbers are not allowed");
+                return Task.CompletedTask;
+            }
+
+            requestData.Response = new TestResponse()
+            {
+                result = data.a * data.b
+            };
+
+            return Task.CompletedTask;
+        };
+
+        // Verify that the request throws an exception with the expected error
+        var exception = await Assert.ThrowsAsync<ReownNetworkException>(
+            () => _dapp.Engine.Request<TestRequest, TestResponse>(sessionData.Topic, testData)
+        );
+
+        Assert.Equal(ErrorType.GENERIC, exception.CodeType);
+    }
 }
\ No newline at end of file