From 0fb62474f9ba2883925c4bc1cf577f8206399e6e Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Mon, 22 Jun 2026 09:33:08 +0800
Subject: [PATCH 1/7] Add dApp load failure and retry states

---
 OneGateApp/Pages/LaunchDAppPage.xaml       | 26 ++++++++-
 OneGateApp/Pages/LaunchDAppPage.xaml.cs    | 62 +++++++++++++++++++++-
 OneGateApp/Properties/Strings.Designer.cs  | 31 ++++++++++-
 OneGateApp/Properties/Strings.de.resx      |  9 ++++
 OneGateApp/Properties/Strings.es.resx      |  9 ++++
 OneGateApp/Properties/Strings.fr.resx      |  9 ++++
 OneGateApp/Properties/Strings.id.resx      |  9 ++++
 OneGateApp/Properties/Strings.it.resx      |  9 ++++
 OneGateApp/Properties/Strings.ja.resx      |  9 ++++
 OneGateApp/Properties/Strings.ko.resx      |  9 ++++
 OneGateApp/Properties/Strings.nl.resx      |  9 ++++
 OneGateApp/Properties/Strings.pt-BR.resx   |  9 ++++
 OneGateApp/Properties/Strings.resx         |  9 ++++
 OneGateApp/Properties/Strings.ru.resx      |  9 ++++
 OneGateApp/Properties/Strings.tr.resx      |  9 ++++
 OneGateApp/Properties/Strings.vi.resx      |  9 ++++
 OneGateApp/Properties/Strings.zh-Hans.resx |  9 ++++
 OneGateApp/Properties/Strings.zh-Hant.resx | 11 +++-
 18 files changed, 250 insertions(+), 6 deletions(-)

diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml b/OneGateApp/Pages/LaunchDAppPage.xaml
index 1a8e8e1..edb8fe4 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml
@@ -24,5 +24,27 @@
         <ToolbarItem Order="Primary" IconImageSource="{FontImageSource &#xe68b;, FontFamily=Icons, Color={toolkit:AppThemeResource Primary}}" IsEnabled="{Binding DApp.IsActive}" Command="{x:Static og:Commands.Share}" CommandParameter="{Binding DApp}" />
         <ToolbarItem x:Name="developerToolsButton" Order="Primary" IconImageSource="{FontImageSource &#xe716;, FontFamily=Icons, Color={toolkit:AppThemeResource Primary}}" Clicked="OnDeveloperToolsClicked" />
     </ContentPage.ToolbarItems>
-    <og:BridgeWebView x:Name="webView" Source="{Binding Url}" Navigating="OnNavigating" InvokedFromJavaScript="OnInvokedFromJavaScript" />
-</ContentPage>
\ No newline at end of file
+    <Grid>
+        <og:BridgeWebView x:Name="webView" Source="{Binding Url}" Navigating="OnNavigating" Navigated="OnNavigated" InvokedFromJavaScript="OnInvokedFromJavaScript" />
+        <Grid BackgroundColor="{toolkit:AppThemeResource PageBackground}" IsVisible="{Binding IsDAppLoading}">
+            <VerticalStackLayout Spacing="12" HorizontalOptions="Center" VerticalOptions="Center">
+                <ActivityIndicator IsRunning="{Binding IsDAppLoading}" WidthRequest="32" HeightRequest="32" />
+                <Label FontAttributes="Bold" HorizontalOptions="Center">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="{x:Static og:Strings.Loading}" />
+                            <Span Text="…" />
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+            </VerticalStackLayout>
+        </Grid>
+        <Grid BackgroundColor="{toolkit:AppThemeResource PageBackground}" IsVisible="{Binding HasDAppLoadError}" Padding="32">
+            <VerticalStackLayout Spacing="16" HorizontalOptions="Center" VerticalOptions="Center" MaximumWidthRequest="420">
+                <Label Text="{Binding DAppLoadErrorTitle}" FontAttributes="Bold" FontSize="22" HorizontalTextAlignment="Center" />
+                <Label StyleClass="Secondary" Text="{Binding DAppLoadErrorMessage}" HorizontalTextAlignment="Center" />
+                <Button Text="{Binding RetryText}" Padding="36,14" Clicked="OnRetryDAppClicked" />
+            </VerticalStackLayout>
+        </Grid>
+    </Grid>
+</ContentPage>
diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml.cs b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
index 8109e97..86157c2 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml.cs
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
@@ -26,11 +26,28 @@ public partial class LaunchDAppPage : ContentPage, IQueryAttributable
     readonly HttpClient httpClient;
     readonly RpcServer rpcServer;
     readonly RpcClient rpcClient;
+    string? url;
 
     public required DApp DApp { get; set { field = value; OnPropertyChanged(); } }
-    public required string Url { get; set { field = value; OnPropertyChanged(); } }
+    public string? Url
+    {
+        get => url;
+        set
+        {
+            if (url == value) return;
+            url = value;
+            if (!string.IsNullOrWhiteSpace(url))
+                BeginDAppLoad();
+            OnPropertyChanged();
+        }
+    }
     public bool IsFavorite { get; set { field = value; OnPropertyChanged(); } }
     public bool IsDeveloperToolsEnabled { get; set { field = value; OnPropertyChanged(); } }
+    public bool IsDAppLoading { get; set { field = value; OnPropertyChanged(); } }
+    public bool HasDAppLoadError { get; set { field = value; OnPropertyChanged(); } }
+    public string DAppLoadErrorTitle { get; set { field = value; OnPropertyChanged(); } } = "";
+    public string DAppLoadErrorMessage { get; set { field = value; OnPropertyChanged(); } } = "";
+    public string RetryText => Strings.Retry;
 
     public LaunchDAppPage(IServiceProvider serviceProvider, ProtocolSettings protocolSettings, IWalletProvider walletProvider, WalletAuthorizationService walletAuthorizationService, ApplicationDbContext dbContext, HttpClient httpClient, RpcClient rpcClient, IHomeShortcutService homeShortcutService)
     {
@@ -130,7 +147,50 @@ async void OnNavigating(object sender, WebNavigatingEventArgs e)
         {
             e.Cancel = true;
             await Toast.Show(Strings.RedirectionBlockedText);
+            IsDAppLoading = false;
+            HasDAppLoadError = false;
+            return;
+        }
+        BeginDAppLoad();
+    }
+
+    void OnNavigated(object sender, WebNavigatedEventArgs e)
+    {
+        IsDAppLoading = false;
+        if (e.Result == WebNavigationResult.Success || e.Result == WebNavigationResult.Cancel)
+        {
+            HasDAppLoadError = false;
+            return;
         }
+        ShowDAppLoadError(e.Url, e.Result);
+    }
+
+    void OnRetryDAppClicked(object sender, EventArgs e)
+    {
+        if (string.IsNullOrWhiteSpace(Url)) return;
+        BeginDAppLoad();
+        webView.Reload();
+    }
+
+    void BeginDAppLoad()
+    {
+        IsDAppLoading = true;
+        HasDAppLoadError = false;
+    }
+
+    void ShowDAppLoadError(string failedUrl, WebNavigationResult result)
+    {
+        string appName = DApp?.NameLocalizer.Localize() ?? GetHostOrUrl(failedUrl);
+        DAppLoadErrorTitle = Strings.DAppLoadFailed;
+        DAppLoadErrorMessage = string.Format(Strings.DAppLoadFailedText, appName, result);
+        HasDAppLoadError = true;
+    }
+
+    static string GetHostOrUrl(string url)
+    {
+        return Uri.TryCreate(url, UriKind.Absolute, out Uri? uri) && !string.IsNullOrWhiteSpace(uri.Host)
+            ? uri.Host
+            : url;
     }
 
     string CreateDocumentStartScript()
diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index 9b455dd..485d4fc 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -584,7 +584,25 @@ internal static string DAppAuthorizationText {
                 return ResourceManager.GetString("DAppAuthorizationText", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   查找类似 DApp did not load 的本地化字符串。
+        /// </summary>
+        internal static string DAppLoadFailed {
+            get {
+                return ResourceManager.GetString("DAppLoadFailed", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 {0} could not be loaded. Check your connection and try again. Status: {1} 的本地化字符串。
+        /// </summary>
+        internal static string DAppLoadFailedText {
+            get {
+                return ResourceManager.GetString("DAppLoadFailedText", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   查找类似 DApp Testing 的本地化字符串。
         /// </summary>
@@ -1820,7 +1838,16 @@ internal static string RedirectionBlockedText {
                 return ResourceManager.GetString("RedirectionBlockedText", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   查找类似 Retry 的本地化字符串。
+        /// </summary>
+        internal static string Retry {
+            get {
+                return ResourceManager.GetString("Retry", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   查找类似 Re-enter password 的本地化字符串。
         /// </summary>
diff --git a/OneGateApp/Properties/Strings.de.resx b/OneGateApp/Properties/Strings.de.resx
index 9501220..b0a58e6 100644
--- a/OneGateApp/Properties/Strings.de.resx
+++ b/OneGateApp/Properties/Strings.de.resx
@@ -695,6 +695,15 @@ Möchten Sie fortfahren?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Rückkehr zur DApp fehlgeschlagen</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Teilen</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.es.resx b/OneGateApp/Properties/Strings.es.resx
index 9192f36..f88eef1 100644
--- a/OneGateApp/Properties/Strings.es.resx
+++ b/OneGateApp/Properties/Strings.es.resx
@@ -695,6 +695,15 @@ Después de desactivarla, deberá introducir manualmente la contraseña de la bi
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>No se pudo volver a la DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Compartir</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.fr.resx b/OneGateApp/Properties/Strings.fr.resx
index 36505fb..7f3782e 100644
--- a/OneGateApp/Properties/Strings.fr.resx
+++ b/OneGateApp/Properties/Strings.fr.resx
@@ -695,6 +695,15 @@ Voulez-vous continuer ?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Impossible de revenir à la DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Partager</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.id.resx b/OneGateApp/Properties/Strings.id.resx
index 8cf03e3..98eeabc 100644
--- a/OneGateApp/Properties/Strings.id.resx
+++ b/OneGateApp/Properties/Strings.id.resx
@@ -695,6 +695,15 @@ Apakah Anda ingin melanjutkan?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Tidak dapat kembali ke DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Bagikan</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.it.resx b/OneGateApp/Properties/Strings.it.resx
index 90f59ca..781c2cd 100644
--- a/OneGateApp/Properties/Strings.it.resx
+++ b/OneGateApp/Properties/Strings.it.resx
@@ -695,6 +695,15 @@ Vuoi continuare?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Impossibile tornare alla DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Condividi</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ja.resx b/OneGateApp/Properties/Strings.ja.resx
index b9eab0d..20c4d78 100644
--- a/OneGateApp/Properties/Strings.ja.resx
+++ b/OneGateApp/Properties/Strings.ja.resx
@@ -695,6 +695,15 @@
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>DAppに戻れませんでした</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>共有</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ko.resx b/OneGateApp/Properties/Strings.ko.resx
index d71a57b..f0979d9 100644
--- a/OneGateApp/Properties/Strings.ko.resx
+++ b/OneGateApp/Properties/Strings.ko.resx
@@ -695,6 +695,15 @@
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>DApp으로 돌아갈 수 없습니다</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>공유</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.nl.resx b/OneGateApp/Properties/Strings.nl.resx
index 7a9105c..c6a50c1 100644
--- a/OneGateApp/Properties/Strings.nl.resx
+++ b/OneGateApp/Properties/Strings.nl.resx
@@ -695,6 +695,15 @@ Wilt u doorgaan?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Kan niet terugkeren naar de DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Delen</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.pt-BR.resx b/OneGateApp/Properties/Strings.pt-BR.resx
index 352f2a7..94c909e 100644
--- a/OneGateApp/Properties/Strings.pt-BR.resx
+++ b/OneGateApp/Properties/Strings.pt-BR.resx
@@ -695,6 +695,15 @@ Deseja continuar?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Não foi possível voltar para a DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Compartilhar</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index e0fbfd0..cf3b637 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -695,6 +695,15 @@ Do you want to continue?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Unable to return to the DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Share</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ru.resx b/OneGateApp/Properties/Strings.ru.resx
index 4149470..81255cb 100644
--- a/OneGateApp/Properties/Strings.ru.resx
+++ b/OneGateApp/Properties/Strings.ru.resx
@@ -695,6 +695,15 @@
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Не удалось вернуться в DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Поделиться</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.tr.resx b/OneGateApp/Properties/Strings.tr.resx
index 7c3145c..b921f10 100644
--- a/OneGateApp/Properties/Strings.tr.resx
+++ b/OneGateApp/Properties/Strings.tr.resx
@@ -695,6 +695,15 @@ Devam etmek istiyor musunuz?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>DApp'e geri dönülemedi</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Paylaş</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.vi.resx b/OneGateApp/Properties/Strings.vi.resx
index e101e22..875a252 100644
--- a/OneGateApp/Properties/Strings.vi.resx
+++ b/OneGateApp/Properties/Strings.vi.resx
@@ -695,6 +695,15 @@ Bạn có muốn tiếp tục không?</value>
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>Không thể quay lại DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp did not load</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>Retry</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>Chia sẻ</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index 068ed29..bc989ca 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -695,6 +695,15 @@
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>无法返回 DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp 未能加载</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} 暂时无法加载。请检查网络连接后重试。状态：{1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>重试</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>分享</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.zh-Hant.resx b/OneGateApp/Properties/Strings.zh-Hant.resx
index e985d08..9054e4b 100644
--- a/OneGateApp/Properties/Strings.zh-Hant.resx
+++ b/OneGateApp/Properties/Strings.zh-Hant.resx
@@ -671,6 +671,15 @@
   <data name="OpenDAppFailedText" xml:space="preserve">
     <value>無法返回 DApp</value>
   </data>
+  <data name="DAppLoadFailed" xml:space="preserve">
+    <value>DApp 未能載入</value>
+  </data>
+  <data name="DAppLoadFailedText" xml:space="preserve">
+    <value>{0} 暫時無法載入。請檢查網路連線後重試。狀態：{1}</value>
+  </data>
+  <data name="Retry" xml:space="preserve">
+    <value>重試</value>
+  </data>
   <data name="Share" xml:space="preserve">
     <value>分享</value>
   </data>
@@ -989,4 +998,4 @@
   <data name="Unavailable" xml:space="preserve">
     <value>不可用</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 9c489874f8854de9f69ae5650794cb87fff9d5ee Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Mon, 22 Jun 2026 12:05:26 +0800
Subject: [PATCH 2/7] Address dApp load review feedback

---
 OneGateApp/Pages/LaunchDAppPage.xaml.cs  | 2 +-
 OneGateApp/Properties/Strings.de.resx    | 8 ++++----
 OneGateApp/Properties/Strings.es.resx    | 8 ++++----
 OneGateApp/Properties/Strings.fr.resx    | 8 ++++----
 OneGateApp/Properties/Strings.id.resx    | 8 ++++----
 OneGateApp/Properties/Strings.it.resx    | 8 ++++----
 OneGateApp/Properties/Strings.ja.resx    | 8 ++++----
 OneGateApp/Properties/Strings.ko.resx    | 8 ++++----
 OneGateApp/Properties/Strings.nl.resx    | 8 ++++----
 OneGateApp/Properties/Strings.pt-BR.resx | 8 ++++----
 OneGateApp/Properties/Strings.ru.resx    | 8 ++++----
 OneGateApp/Properties/Strings.tr.resx    | 8 ++++----
 OneGateApp/Properties/Strings.vi.resx    | 8 ++++----
 13 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml.cs b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
index 86157c2..65a31a5 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml.cs
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
@@ -182,7 +182,7 @@ void ShowDAppLoadError(string failedUrl, WebNavigationResult result)
     {
         string appName = DApp?.NameLocalizer.Localize() ?? GetHostOrUrl(failedUrl);
         DAppLoadErrorTitle = Strings.DAppLoadFailed;
-        DAppLoadErrorMessage = string.Format(Strings.DAppLoadFailedText, appName, result);
+        DAppLoadErrorMessage = string.Format(Strings.DAppLoadFailedText, appName, (int)result);
         HasDAppLoadError = true;
     }
 
diff --git a/OneGateApp/Properties/Strings.de.resx b/OneGateApp/Properties/Strings.de.resx
index b0a58e6..85853c5 100644
--- a/OneGateApp/Properties/Strings.de.resx
+++ b/OneGateApp/Properties/Strings.de.resx
@@ -696,13 +696,13 @@ Möchten Sie fortfahren?</value>
     <value>Rückkehr zur DApp fehlgeschlagen</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp wurde nicht geladen</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} konnte nicht geladen werden. Prüfen Sie Ihre Verbindung und versuchen Sie es erneut. Status: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Erneut versuchen</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Teilen</value>
@@ -998,4 +998,4 @@ Es wird empfohlen, den NEP-2-Schlüssel und das Passwort getrennt aufzubewahren
   <data name="Unavailable" xml:space="preserve">
     <value>Nicht verfügbar</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.es.resx b/OneGateApp/Properties/Strings.es.resx
index f88eef1..4772241 100644
--- a/OneGateApp/Properties/Strings.es.resx
+++ b/OneGateApp/Properties/Strings.es.resx
@@ -696,13 +696,13 @@ Después de desactivarla, deberá introducir manualmente la contraseña de la bi
     <value>No se pudo volver a la DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>La DApp no se cargó</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>No se pudo cargar {0}. Revisa tu conexión e inténtalo de nuevo. Estado: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Reintentar</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Compartir</value>
@@ -998,4 +998,4 @@ Se recomienda almacenar la clave NEP-2 y la contraseña por separado y realizar
   <data name="Unavailable" xml:space="preserve">
     <value>No disponible</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.fr.resx b/OneGateApp/Properties/Strings.fr.resx
index 7f3782e..200444c 100644
--- a/OneGateApp/Properties/Strings.fr.resx
+++ b/OneGateApp/Properties/Strings.fr.resx
@@ -696,13 +696,13 @@ Voulez-vous continuer ?</value>
     <value>Impossible de revenir à la DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>La DApp n’a pas été chargée</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} n’a pas pu être chargée. Vérifiez votre connexion et réessayez. État : {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Réessayer</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Partager</value>
@@ -998,4 +998,4 @@ Il est recommandé de conserver séparément la clé NEP-2 et le mot de passe, e
   <data name="Unavailable" xml:space="preserve">
     <value>Indisponible</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.id.resx b/OneGateApp/Properties/Strings.id.resx
index 98eeabc..ff86b59 100644
--- a/OneGateApp/Properties/Strings.id.resx
+++ b/OneGateApp/Properties/Strings.id.resx
@@ -696,13 +696,13 @@ Apakah Anda ingin melanjutkan?</value>
     <value>Tidak dapat kembali ke DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp tidak dimuat</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} tidak dapat dimuat. Periksa koneksi Anda dan coba lagi. Status: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Coba lagi</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Bagikan</value>
@@ -998,4 +998,4 @@ Disarankan untuk menyimpan kunci NEP-2 dan kata sandinya secara terpisah serta m
   <data name="Unavailable" xml:space="preserve">
     <value>Tidak tersedia</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.it.resx b/OneGateApp/Properties/Strings.it.resx
index 781c2cd..fddffb6 100644
--- a/OneGateApp/Properties/Strings.it.resx
+++ b/OneGateApp/Properties/Strings.it.resx
@@ -696,13 +696,13 @@ Vuoi continuare?</value>
     <value>Impossibile tornare alla DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>La DApp non è stata caricata</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>Impossibile caricare {0}. Controlla la connessione e riprova. Stato: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Riprova</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Condividi</value>
@@ -998,4 +998,4 @@ Si consiglia di conservare separatamente la chiave NEP-2 e la password e di eseg
   <data name="Unavailable" xml:space="preserve">
     <value>Non disponibile</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.ja.resx b/OneGateApp/Properties/Strings.ja.resx
index 20c4d78..a578662 100644
--- a/OneGateApp/Properties/Strings.ja.resx
+++ b/OneGateApp/Properties/Strings.ja.resx
@@ -696,13 +696,13 @@
     <value>DAppに戻れませんでした</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp を読み込めませんでした</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} を読み込めませんでした。接続を確認してからもう一度お試しください。ステータス: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>再試行</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>共有</value>
@@ -998,4 +998,4 @@ NEP-2 とパスワードは別々に保管し、それぞれを安全にバッ
   <data name="Unavailable" xml:space="preserve">
     <value>利用不可</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.ko.resx b/OneGateApp/Properties/Strings.ko.resx
index f0979d9..d9164e7 100644
--- a/OneGateApp/Properties/Strings.ko.resx
+++ b/OneGateApp/Properties/Strings.ko.resx
@@ -696,13 +696,13 @@
     <value>DApp으로 돌아갈 수 없습니다</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp을 불러오지 못했습니다</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0}을(를) 불러올 수 없습니다. 연결을 확인한 후 다시 시도하세요. 상태: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>다시 시도</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>공유</value>
@@ -998,4 +998,4 @@ NEP-2와 비밀번호는 별도로 보관하고 각각 안전하게 백업하는
   <data name="Unavailable" xml:space="preserve">
     <value>사용할 수 없음</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.nl.resx b/OneGateApp/Properties/Strings.nl.resx
index c6a50c1..6242921 100644
--- a/OneGateApp/Properties/Strings.nl.resx
+++ b/OneGateApp/Properties/Strings.nl.resx
@@ -696,13 +696,13 @@ Wilt u doorgaan?</value>
     <value>Kan niet terugkeren naar de DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp is niet geladen</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} kan niet worden geladen. Controleer je verbinding en probeer het opnieuw. Status: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Opnieuw proberen</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Delen</value>
@@ -998,4 +998,4 @@ Het wordt aanbevolen om de NEP-2-sleutel en het wachtwoord apart op te slaan en
   <data name="Unavailable" xml:space="preserve">
     <value>Niet beschikbaar</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.pt-BR.resx b/OneGateApp/Properties/Strings.pt-BR.resx
index 94c909e..e45bb6a 100644
--- a/OneGateApp/Properties/Strings.pt-BR.resx
+++ b/OneGateApp/Properties/Strings.pt-BR.resx
@@ -696,13 +696,13 @@ Deseja continuar?</value>
     <value>Não foi possível voltar para a DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>A DApp não foi carregada</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>Não foi possível carregar {0}. Verifique sua conexão e tente novamente. Status: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Tentar novamente</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Compartilhar</value>
@@ -998,4 +998,4 @@ Recomenda-se armazenar a chave NEP-2 e a senha separadamente e fazer backups seg
   <data name="Unavailable" xml:space="preserve">
     <value>Indisponível</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.ru.resx b/OneGateApp/Properties/Strings.ru.resx
index 81255cb..57e8da1 100644
--- a/OneGateApp/Properties/Strings.ru.resx
+++ b/OneGateApp/Properties/Strings.ru.resx
@@ -696,13 +696,13 @@
     <value>Не удалось вернуться в DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp не загрузилась</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>Не удалось загрузить {0}. Проверьте подключение и повторите попытку. Статус: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Повторить</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Поделиться</value>
@@ -998,4 +998,4 @@
   <data name="Unavailable" xml:space="preserve">
     <value>Недоступно</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.tr.resx b/OneGateApp/Properties/Strings.tr.resx
index b921f10..d116981 100644
--- a/OneGateApp/Properties/Strings.tr.resx
+++ b/OneGateApp/Properties/Strings.tr.resx
@@ -696,13 +696,13 @@ Devam etmek istiyor musunuz?</value>
     <value>DApp'e geri dönülemedi</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp yüklenmedi</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>{0} yüklenemedi. Bağlantınızı kontrol edip tekrar deneyin. Durum: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Tekrar dene</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Paylaş</value>
@@ -998,4 +998,4 @@ NEP-2 anahtarı ile şifreyi ayrı ayrı saklamanız ve güvenli şekilde yedekl
   <data name="Unavailable" xml:space="preserve">
     <value>Kullanılamıyor</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/OneGateApp/Properties/Strings.vi.resx b/OneGateApp/Properties/Strings.vi.resx
index 875a252..ac355d5 100644
--- a/OneGateApp/Properties/Strings.vi.resx
+++ b/OneGateApp/Properties/Strings.vi.resx
@@ -696,13 +696,13 @@ Bạn có muốn tiếp tục không?</value>
     <value>Không thể quay lại DApp</value>
   </data>
   <data name="DAppLoadFailed" xml:space="preserve">
-    <value>DApp did not load</value>
+    <value>DApp chưa được tải</value>
   </data>
   <data name="DAppLoadFailedText" xml:space="preserve">
-    <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
+    <value>Không thể tải {0}. Hãy kiểm tra kết nối rồi thử lại. Trạng thái: {1}</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Retry</value>
+    <value>Thử lại</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Chia sẻ</value>
@@ -998,4 +998,4 @@ Nên lưu trữ riêng khóa NEP-2 và mật khẩu, đồng thời sao lưu ch
   <data name="Unavailable" xml:space="preserve">
     <value>Không khả dụng</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 7326d43b6985875add1415bcc112175c0af3f477 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Tue, 23 Jun 2026 13:10:28 +0800
Subject: [PATCH 3/7] Improve dApp game launch loading

---
 OneGateApp/Pages/Commands.cs               | 16 +++++--
 OneGateApp/Pages/LaunchDAppPage.xaml       | 11 +++++
 OneGateApp/Pages/LaunchDAppPage.xaml.cs    | 50 ++++++++++++++++++++++
 OneGateApp/Properties/Strings.Designer.cs  | 18 ++++++++
 OneGateApp/Properties/Strings.de.resx      |  6 +++
 OneGateApp/Properties/Strings.es.resx      |  6 +++
 OneGateApp/Properties/Strings.fr.resx      |  6 +++
 OneGateApp/Properties/Strings.id.resx      |  6 +++
 OneGateApp/Properties/Strings.it.resx      |  6 +++
 OneGateApp/Properties/Strings.ja.resx      |  6 +++
 OneGateApp/Properties/Strings.ko.resx      |  6 +++
 OneGateApp/Properties/Strings.nl.resx      |  6 +++
 OneGateApp/Properties/Strings.pt-BR.resx   |  6 +++
 OneGateApp/Properties/Strings.resx         |  6 +++
 OneGateApp/Properties/Strings.ru.resx      |  6 +++
 OneGateApp/Properties/Strings.tr.resx      |  6 +++
 OneGateApp/Properties/Strings.vi.resx      |  6 +++
 OneGateApp/Properties/Strings.zh-Hans.resx |  6 +++
 OneGateApp/Properties/Strings.zh-Hant.resx |  6 +++
 19 files changed, 182 insertions(+), 3 deletions(-)

diff --git a/OneGateApp/Pages/Commands.cs b/OneGateApp/Pages/Commands.cs
index 0943a86..0e3536d 100644
--- a/OneGateApp/Pages/Commands.cs
+++ b/OneGateApp/Pages/Commands.cs
@@ -72,7 +72,19 @@ await Microsoft.Maui.ApplicationModel.DataTransfer.Share.RequestAsync(new ShareT
         Uri? uri = parameter as Uri;
         if (dapp is null && uri is null) throw new ArgumentException("Invalid parameter type.");
         uri ??= new($"https://{SharedOptions.OneGateDomain}/app/{dapp!.Id}");
+        Dictionary<string, object> GetLaunchParameters()
+        {
+            Dictionary<string, object> parameters = new();
+            if (dapp != null) parameters["dapp"] = dapp;
+            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
+            return parameters;
+        }
 #if ANDROID
+        if (Application.Current?.Windows.FirstOrDefault(window => window.Page is NeoOrder.OneGate.AppShell)?.Page is Shell shell)
+        {
+            await shell.GoToAsync("launch", GetLaunchParameters());
+            return;
+        }
         var activity = Platform.CurrentActivity!;
         var intent = new Android.Content.Intent(activity, typeof(Platforms.Android.DocumentLinkActivity));
         intent.SetAction(Android.Content.Intent.ActionView);
@@ -87,9 +99,7 @@ await Microsoft.Maui.ApplicationModel.DataTransfer.Share.RequestAsync(new ShareT
 #endif
         if (!supportOpenWithDeepLink || !await Launcher.TryOpenAsync(uri))
         {
-            Dictionary<string, object> parameters = new();
-            if (dapp != null) parameters["dapp"] = dapp;
-            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
+            Dictionary<string, object> parameters = GetLaunchParameters();
 #if IOS
             bool supportMultiWindow = DeviceInfo.Idiom == DeviceIdiom.Desktop || DeviceInfo.Idiom == DeviceIdiom.Tablet;
 #else
diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml b/OneGateApp/Pages/LaunchDAppPage.xaml
index edb8fe4..cb7f872 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml
@@ -39,6 +39,17 @@
                 </Label>
             </VerticalStackLayout>
         </Grid>
+        <Grid Padding="16" InputTransparent="True" IsVisible="{Binding IsDAppPreparing}" VerticalOptions="Start">
+            <Border StyleClass="Card" HorizontalOptions="Center" MaximumWidthRequest="420">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12">
+                    <Border BackgroundColor="{toolkit:AppThemeResource Brand}" StrokeThickness="0" StrokeShape="Ellipse" WidthRequest="10" HeightRequest="10" VerticalOptions="Center" />
+                    <VerticalStackLayout Grid.Column="1" Spacing="2">
+                        <Label Text="{x:Static og:Strings.DAppPreparing}" FontAttributes="Bold" LineBreakMode="TailTruncation" MaxLines="1" />
+                        <Label StyleClass="Secondary" Text="{x:Static og:Strings.DAppPreparingText}" FontSize="12" LineBreakMode="TailTruncation" MaxLines="2" />
+                    </VerticalStackLayout>
+                </Grid>
+            </Border>
+        </Grid>
         <Grid BackgroundColor="{toolkit:AppThemeResource PageBackground}" IsVisible="{Binding HasDAppLoadError}" Padding="32">
             <VerticalStackLayout Spacing="16" HorizontalOptions="Center" VerticalOptions="Center" MaximumWidthRequest="420">
                 <Label Text="{Binding DAppLoadErrorTitle}" FontAttributes="Bold" FontSize="22" HorizontalTextAlignment="Center" />
diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml.cs b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
index 65a31a5..12af31f 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml.cs
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
@@ -17,6 +17,7 @@ namespace NeoOrder.OneGate.Pages;
 public partial class LaunchDAppPage : ContentPage, IQueryAttributable
 {
     const string DeveloperModeKey = "preference/developer_mode_enabled";
+    const int DAppPreparationDurationMs = 12000;
 
     readonly IServiceProvider serviceProvider;
     readonly ProtocolSettings protocolSettings;
@@ -26,6 +27,7 @@ public partial class LaunchDAppPage : ContentPage, IQueryAttributable
     readonly HttpClient httpClient;
     readonly RpcServer rpcServer;
     readonly RpcClient rpcClient;
+    CancellationTokenSource? dappPreparationCancellation;
     string? url;
 
     public required DApp DApp { get; set { field = value; OnPropertyChanged(); } }
@@ -44,6 +46,7 @@ public string? Url
     public bool IsFavorite { get; set { field = value; OnPropertyChanged(); } }
     public bool IsDeveloperToolsEnabled { get; set { field = value; OnPropertyChanged(); } }
     public bool IsDAppLoading { get; set { field = value; OnPropertyChanged(); } }
+    public bool IsDAppPreparing { get; set { field = value; OnPropertyChanged(); } }
     public bool HasDAppLoadError { get; set { field = value; OnPropertyChanged(); } }
     public string DAppLoadErrorTitle { get; set { field = value; OnPropertyChanged(); } } = "";
     public string DAppLoadErrorMessage { get; set { field = value; OnPropertyChanged(); } } = "";
@@ -68,6 +71,12 @@ public LaunchDAppPage(IServiceProvider serviceProvider, ProtocolSettings protoco
             ToolbarItems.Remove(developerToolsButton);
     }
 
+    protected override void OnDisappearing()
+    {
+        base.OnDisappearing();
+        CancelDAppPreparation();
+    }
+
     public async void ApplyQueryAttributes(IDictionary<string, object> query)
     {
         if (query.TryGetValue("dapp", out var value))
@@ -148,6 +157,7 @@ async void OnNavigating(object sender, WebNavigatingEventArgs e)
             e.Cancel = true;
             await Toast.Show(Strings.RedirectionBlockedText);
             IsDAppLoading = false;
+            IsDAppPreparing = false;
             HasDAppLoadError = false;
             return;
         }
@@ -160,6 +170,10 @@ void OnNavigated(object sender, WebNavigatedEventArgs e)
         if (e.Result == WebNavigationResult.Success || e.Result == WebNavigationResult.Cancel)
         {
             HasDAppLoadError = false;
+            if (e.Result == WebNavigationResult.Success)
+                BeginDAppPreparation();
+            else
+                IsDAppPreparing = false;
             return;
         }
         ShowDAppLoadError(e.Url, e.Result);
@@ -174,18 +188,54 @@ void OnRetryDAppClicked(object sender, EventArgs e)
 
     void BeginDAppLoad()
     {
+        CancelDAppPreparation();
         IsDAppLoading = true;
+        IsDAppPreparing = false;
         HasDAppLoadError = false;
     }
 
     void ShowDAppLoadError(string failedUrl, WebNavigationResult result)
     {
+        CancelDAppPreparation();
         string appName = DApp?.NameLocalizer.Localize() ?? GetHostOrUrl(failedUrl);
         DAppLoadErrorTitle = Strings.DAppLoadFailed;
         DAppLoadErrorMessage = string.Format(Strings.DAppLoadFailedText, appName, (int)result);
         HasDAppLoadError = true;
     }
 
+    void BeginDAppPreparation()
+    {
+        CancelDAppPreparation();
+        dappPreparationCancellation = new();
+        IsDAppPreparing = true;
+        _ = WatchDAppPreparationAsync(dappPreparationCancellation.Token);
+    }
+
+    void CancelDAppPreparation()
+    {
+        dappPreparationCancellation?.Cancel();
+        dappPreparationCancellation?.Dispose();
+        dappPreparationCancellation = null;
+        IsDAppPreparing = false;
+    }
+
+    async Task WatchDAppPreparationAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            await Task.Delay(DAppPreparationDurationMs, cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            return;
+        }
+        finally
+        {
+            if (!cancellationToken.IsCancellationRequested)
+                MainThread.BeginInvokeOnMainThread(() => IsDAppPreparing = false);
+        }
+    }
+
     static string GetHostOrUrl(string url)
     {
         return Uri.TryCreate(url, UriKind.Absolute, out Uri? uri) && !string.IsNullOrWhiteSpace(uri.Host)
diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index 485d4fc..f02cfb0 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -603,6 +603,24 @@ internal static string DAppLoadFailedText {
             }
         }
 
+        /// <summary>
+        ///   查找类似 Preparing DApp 的本地化字符串。
+        /// </summary>
+        internal static string DAppPreparing {
+            get {
+                return ResourceManager.GetString("DAppPreparing", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 Games with large assets may take a moment. 的本地化字符串。
+        /// </summary>
+        internal static string DAppPreparingText {
+            get {
+                return ResourceManager.GetString("DAppPreparingText", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   查找类似 DApp Testing 的本地化字符串。
         /// </summary>
diff --git a/OneGateApp/Properties/Strings.de.resx b/OneGateApp/Properties/Strings.de.resx
index 85853c5..805bb42 100644
--- a/OneGateApp/Properties/Strings.de.resx
+++ b/OneGateApp/Properties/Strings.de.resx
@@ -701,6 +701,12 @@ Möchten Sie fortfahren?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} konnte nicht geladen werden. Prüfen Sie Ihre Verbindung und versuchen Sie es erneut. Status: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>DApp wird vorbereitet</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Spiele mit großen Ressourcen können einen Moment dauern.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Erneut versuchen</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.es.resx b/OneGateApp/Properties/Strings.es.resx
index 4772241..857a3cd 100644
--- a/OneGateApp/Properties/Strings.es.resx
+++ b/OneGateApp/Properties/Strings.es.resx
@@ -701,6 +701,12 @@ Después de desactivarla, deberá introducir manualmente la contraseña de la bi
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>No se pudo cargar {0}. Revisa tu conexión e inténtalo de nuevo. Estado: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Preparando la DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Los juegos con recursos grandes pueden tardar un momento.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Reintentar</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.fr.resx b/OneGateApp/Properties/Strings.fr.resx
index 200444c..979a858 100644
--- a/OneGateApp/Properties/Strings.fr.resx
+++ b/OneGateApp/Properties/Strings.fr.resx
@@ -701,6 +701,12 @@ Voulez-vous continuer ?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} n’a pas pu être chargée. Vérifiez votre connexion et réessayez. État : {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Préparation de la DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Les jeux avec des ressources volumineuses peuvent prendre un moment.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Réessayer</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.id.resx b/OneGateApp/Properties/Strings.id.resx
index ff86b59..1fb9dae 100644
--- a/OneGateApp/Properties/Strings.id.resx
+++ b/OneGateApp/Properties/Strings.id.resx
@@ -701,6 +701,12 @@ Apakah Anda ingin melanjutkan?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} tidak dapat dimuat. Periksa koneksi Anda dan coba lagi. Status: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Menyiapkan DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Game dengan aset besar mungkin perlu waktu sebentar.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Coba lagi</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.it.resx b/OneGateApp/Properties/Strings.it.resx
index fddffb6..8e015f7 100644
--- a/OneGateApp/Properties/Strings.it.resx
+++ b/OneGateApp/Properties/Strings.it.resx
@@ -701,6 +701,12 @@ Vuoi continuare?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>Impossibile caricare {0}. Controlla la connessione e riprova. Stato: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Preparazione della DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>I giochi con risorse grandi possono richiedere qualche istante.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Riprova</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ja.resx b/OneGateApp/Properties/Strings.ja.resx
index a578662..9d40f64 100644
--- a/OneGateApp/Properties/Strings.ja.resx
+++ b/OneGateApp/Properties/Strings.ja.resx
@@ -701,6 +701,12 @@
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} を読み込めませんでした。接続を確認してからもう一度お試しください。ステータス: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>DApp を準備中</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>大きなアセットを含むゲームは少し時間がかかる場合があります。</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>再試行</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ko.resx b/OneGateApp/Properties/Strings.ko.resx
index d9164e7..f2bc1da 100644
--- a/OneGateApp/Properties/Strings.ko.resx
+++ b/OneGateApp/Properties/Strings.ko.resx
@@ -701,6 +701,12 @@
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0}을(를) 불러올 수 없습니다. 연결을 확인한 후 다시 시도하세요. 상태: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>DApp 준비 중</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>용량이 큰 게임은 시간이 조금 걸릴 수 있습니다.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>다시 시도</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.nl.resx b/OneGateApp/Properties/Strings.nl.resx
index 6242921..fdf2a8b 100644
--- a/OneGateApp/Properties/Strings.nl.resx
+++ b/OneGateApp/Properties/Strings.nl.resx
@@ -701,6 +701,12 @@ Wilt u doorgaan?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} kan niet worden geladen. Controleer je verbinding en probeer het opnieuw. Status: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>DApp voorbereiden</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Games met grote assets kunnen even duren.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Opnieuw proberen</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.pt-BR.resx b/OneGateApp/Properties/Strings.pt-BR.resx
index e45bb6a..1bfc67f 100644
--- a/OneGateApp/Properties/Strings.pt-BR.resx
+++ b/OneGateApp/Properties/Strings.pt-BR.resx
@@ -701,6 +701,12 @@ Deseja continuar?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>Não foi possível carregar {0}. Verifique sua conexão e tente novamente. Status: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Preparando a DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Jogos com recursos grandes podem levar alguns instantes.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Tentar novamente</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index cf3b637..d26a11d 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -701,6 +701,12 @@ Do you want to continue?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} could not be loaded. Check your connection and try again. Status: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Preparing DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Games with large assets may take a moment.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Retry</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.ru.resx b/OneGateApp/Properties/Strings.ru.resx
index 57e8da1..bb23e38 100644
--- a/OneGateApp/Properties/Strings.ru.resx
+++ b/OneGateApp/Properties/Strings.ru.resx
@@ -701,6 +701,12 @@
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>Не удалось загрузить {0}. Проверьте подключение и повторите попытку. Статус: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Подготовка DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Игры с крупными ресурсами могут загружаться немного дольше.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Повторить</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.tr.resx b/OneGateApp/Properties/Strings.tr.resx
index d116981..52d6397 100644
--- a/OneGateApp/Properties/Strings.tr.resx
+++ b/OneGateApp/Properties/Strings.tr.resx
@@ -701,6 +701,12 @@ Devam etmek istiyor musunuz?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} yüklenemedi. Bağlantınızı kontrol edip tekrar deneyin. Durum: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>DApp hazırlanıyor</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Büyük kaynaklara sahip oyunlar biraz zaman alabilir.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Tekrar dene</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.vi.resx b/OneGateApp/Properties/Strings.vi.resx
index ac355d5..361326d 100644
--- a/OneGateApp/Properties/Strings.vi.resx
+++ b/OneGateApp/Properties/Strings.vi.resx
@@ -701,6 +701,12 @@ Bạn có muốn tiếp tục không?</value>
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>Không thể tải {0}. Hãy kiểm tra kết nối rồi thử lại. Trạng thái: {1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>Đang chuẩn bị DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>Trò chơi có tài nguyên lớn có thể mất thêm một chút thời gian.</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>Thử lại</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index bc989ca..6f177f8 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -701,6 +701,12 @@
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} 暂时无法加载。请检查网络连接后重试。状态：{1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>正在准备 DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>大型游戏资源较多，可能还需要一点时间。</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>重试</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.zh-Hant.resx b/OneGateApp/Properties/Strings.zh-Hant.resx
index 9054e4b..de8b317 100644
--- a/OneGateApp/Properties/Strings.zh-Hant.resx
+++ b/OneGateApp/Properties/Strings.zh-Hant.resx
@@ -677,6 +677,12 @@
   <data name="DAppLoadFailedText" xml:space="preserve">
     <value>{0} 暫時無法載入。請檢查網路連線後重試。狀態：{1}</value>
   </data>
+  <data name="DAppPreparing" xml:space="preserve">
+    <value>正在準備 DApp</value>
+  </data>
+  <data name="DAppPreparingText" xml:space="preserve">
+    <value>大型遊戲資源較多，可能還需要一點時間。</value>
+  </data>
   <data name="Retry" xml:space="preserve">
     <value>重試</value>
   </data>

From 28d3bb769db9c63de7abbb59567b28184db94011 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Sat, 4 Jul 2026 23:20:04 +0800
Subject: [PATCH 4/7] Launch Android dApps through app links

---
 OneGateApp/Pages/Commands.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/OneGateApp/Pages/Commands.cs b/OneGateApp/Pages/Commands.cs
index be098a3..175710e 100644
--- a/OneGateApp/Pages/Commands.cs
+++ b/OneGateApp/Pages/Commands.cs
@@ -72,19 +72,7 @@ await Microsoft.Maui.ApplicationModel.DataTransfer.Share.RequestAsync(new ShareT
         Uri? uri = parameter as Uri;
         if (dapp is null && uri is null) throw new ArgumentException("Invalid parameter type.");
         uri ??= new($"https://{SharedOptions.OneGateDomain}/app/{dapp!.Id}");
-        Dictionary<string, object> GetLaunchParameters()
-        {
-            Dictionary<string, object> parameters = new();
-            if (dapp != null) parameters["dapp"] = dapp;
-            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
-            return parameters;
-        }
 #if ANDROID
-        if (Application.Current?.Windows.FirstOrDefault(window => window.Page is NeoOrder.OneGate.AppShell)?.Page is Shell shell)
-        {
-            await shell.GoToAsync("launch", GetLaunchParameters());
-            return;
-        }
         var activity = Platform.CurrentActivity!;
         var intent = new Android.Content.Intent(activity, typeof(Platforms.Android.DocumentLinkActivity));
         intent.SetAction(Android.Content.Intent.ActionView);
@@ -92,6 +80,13 @@ Dictionary<string, object> GetLaunchParameters()
         intent.AddFlags(Android.Content.ActivityFlags.NewDocument);
         activity.StartActivity(intent);
 #else
+        Dictionary<string, object> GetLaunchParameters()
+        {
+            Dictionary<string, object> parameters = new();
+            if (dapp != null) parameters["dapp"] = dapp;
+            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
+            return parameters;
+        }
 #if IOS || MACCATALYST
         bool supportOpenWithDeepLink = false;
 #else

From 58047bc9c238bdb06e0b68288e0473321f93fa78 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Sun, 5 Jul 2026 15:37:12 +0800
Subject: [PATCH 5/7] Revert launch parameter extraction

---
 OneGateApp/Pages/Commands.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/OneGateApp/Pages/Commands.cs b/OneGateApp/Pages/Commands.cs
index 175710e..2b71c44 100644
--- a/OneGateApp/Pages/Commands.cs
+++ b/OneGateApp/Pages/Commands.cs
@@ -80,13 +80,6 @@ await Microsoft.Maui.ApplicationModel.DataTransfer.Share.RequestAsync(new ShareT
         intent.AddFlags(Android.Content.ActivityFlags.NewDocument);
         activity.StartActivity(intent);
 #else
-        Dictionary<string, object> GetLaunchParameters()
-        {
-            Dictionary<string, object> parameters = new();
-            if (dapp != null) parameters["dapp"] = dapp;
-            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
-            return parameters;
-        }
 #if IOS || MACCATALYST
         bool supportOpenWithDeepLink = false;
 #else
@@ -94,7 +87,9 @@ Dictionary<string, object> GetLaunchParameters()
 #endif
         if (!supportOpenWithDeepLink || !await Launcher.TryOpenAsync(uri))
         {
-            Dictionary<string, object> parameters = GetLaunchParameters();
+            Dictionary<string, object> parameters = new();
+            if (dapp != null) parameters["dapp"] = dapp;
+            parameters["uri"] = System.Net.WebUtility.UrlEncode(uri.ToString());
 #if IOS
             bool supportMultiWindow = DeviceInfo.Idiom == DeviceIdiom.Desktop || DeviceInfo.Idiom == DeviceIdiom.Tablet;
 #else

From 94becf38e23b81ce05d935b865979f1f0ba1b9ef Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Tue, 14 Jul 2026 00:44:02 +0800
Subject: [PATCH 6/7] Handle dApp launch failures and timeouts

---
 OneGateApp/Pages/LaunchDAppPage.xaml.cs | 107 +++++++++++++++++++++---
 1 file changed, 94 insertions(+), 13 deletions(-)

diff --git a/OneGateApp/Pages/LaunchDAppPage.xaml.cs b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
index c72f591..b1945da 100644
--- a/OneGateApp/Pages/LaunchDAppPage.xaml.cs
+++ b/OneGateApp/Pages/LaunchDAppPage.xaml.cs
@@ -12,6 +12,7 @@
 using NeoOrder.OneGate.Services.RPC;
 using System.Net;
 using System.Net.Http.Json;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace NeoOrder.OneGate.Pages;
@@ -19,6 +20,7 @@ namespace NeoOrder.OneGate.Pages;
 public partial class LaunchDAppPage : ContentPage, IQueryAttributable
 {
     const string DeveloperModeKey = "preference/developer_mode_enabled";
+    const int DAppLoadTimeoutMs = 30000;
     const int DAppPreparationDurationMs = 12000;
 
     readonly IServiceProvider serviceProvider;
@@ -29,7 +31,9 @@ public partial class LaunchDAppPage : ContentPage, IQueryAttributable
     readonly HttpClient httpClient;
     readonly RpcServer rpcServer;
     readonly RpcClient rpcClient;
+    CancellationTokenSource? dappLoadCancellation;
     CancellationTokenSource? dappPreparationCancellation;
+    Uri? pendingAppLinkUri;
     string? url;
 
     public required DApp DApp { get; set { field = value; OnPropertyChanged(); } }
@@ -76,6 +80,7 @@ public LaunchDAppPage(IServiceProvider serviceProvider, ProtocolSettings protoco
     protected override void OnDisappearing()
     {
         base.OnDisappearing();
+        CancelDAppLoadTimeout();
         CancelDAppPreparation();
     }
 
@@ -92,18 +97,9 @@ public async void ApplyQueryAttributes(IDictionary<string, object> query)
             Uri uri = query["uri"] as Uri ?? new(WebUtility.UrlDecode((string)query["uri"]));
             if (LaunchDAppAction.TryCreate(uri) is LaunchDAppAction action)
             {
-                var response = await httpClient.GetAsync($"/api/dapp/{action.AppId}");
-                if (!response.IsSuccessStatusCode)
-                {
-                    await this.GoBackOrCloseAsync();
-                    return;
-                }
-                DApp = (await response.Content.ReadFromJsonAsync<DApp>())!;
-                if (string.IsNullOrEmpty(uri.Query))
-                    Url = DApp.Url;
-                else
-                    Url = DApp.Url + uri.Query;
-                UpdateReportButton();
+                pendingAppLinkUri = uri;
+                if (!await TryLoadAppLinkAsync(action, uri)) return;
+                pendingAppLinkUri = null;
             }
             else
             {
@@ -119,6 +115,11 @@ public async void ApplyQueryAttributes(IDictionary<string, object> query)
                 UpdateReportButton();
             }
         }
+        await RecordDAppOpenAsync();
+    }
+
+    async Task RecordDAppOpenAsync()
+    {
         if (DApp.Id > 0)
         {
             List<int>? favorites = await dbContext.Settings.GetAsync<List<int>>("dapps/favorite");
@@ -180,6 +181,8 @@ async void OnNavigating(object sender, WebNavigatingEventArgs e)
 
     void OnNavigated(object sender, WebNavigatedEventArgs e)
     {
+        if (e.Url == "about:blank") return;
+        CancelDAppLoadTimeout();
         IsDAppLoading = false;
         if (e.Result == WebNavigationResult.Success || e.Result == WebNavigationResult.Cancel)
         {
@@ -193,24 +196,80 @@ void OnNavigated(object sender, WebNavigatedEventArgs e)
         ShowDAppLoadError(e.Url, e.Result);
     }
 
-    void OnRetryDAppClicked(object sender, EventArgs e)
+    async void OnRetryDAppClicked(object sender, EventArgs e)
     {
+        if (pendingAppLinkUri is Uri uri && LaunchDAppAction.TryCreate(uri) is LaunchDAppAction action)
+        {
+            if (await TryLoadAppLinkAsync(action, uri))
+            {
+                pendingAppLinkUri = null;
+                await RecordDAppOpenAsync();
+            }
+            return;
+        }
         if (string.IsNullOrWhiteSpace(Url)) return;
         BeginDAppLoad();
         webView.Reload();
     }
 
+    async Task<bool> TryLoadAppLinkAsync(LaunchDAppAction action, Uri uri)
+    {
+        CancelDAppLoadTimeout();
+        CancelDAppPreparation();
+        IsDAppLoading = true;
+        HasDAppLoadError = false;
+        try
+        {
+            using HttpResponseMessage response = await httpClient.GetAsync($"/api/dapp/{action.AppId}");
+            if (!response.IsSuccessStatusCode)
+            {
+                await this.GoBackOrCloseAsync();
+                return false;
+            }
+            DApp? dapp = await response.Content.ReadFromJsonAsync<DApp>();
+            if (dapp is null)
+            {
+                ShowDAppLoadError(uri.AbsoluteUri, WebNavigationResult.Failure);
+                return false;
+            }
+            DApp = dapp;
+            Url = string.IsNullOrEmpty(uri.Query) ? DApp.Url : DApp.Url + uri.Query;
+            UpdateReportButton();
+            return true;
+        }
+        catch (HttpRequestException)
+        {
+            ShowDAppLoadError(uri.AbsoluteUri, WebNavigationResult.Failure);
+            return false;
+        }
+        catch (TaskCanceledException)
+        {
+            ShowDAppLoadError(uri.AbsoluteUri, WebNavigationResult.Timeout);
+            return false;
+        }
+        catch (JsonException)
+        {
+            ShowDAppLoadError(uri.AbsoluteUri, WebNavigationResult.Failure);
+            return false;
+        }
+    }
+
     void BeginDAppLoad()
     {
+        CancelDAppLoadTimeout();
         CancelDAppPreparation();
         IsDAppLoading = true;
         IsDAppPreparing = false;
         HasDAppLoadError = false;
+        dappLoadCancellation = new();
+        _ = WatchDAppLoadAsync(Url ?? DApp?.Url ?? string.Empty, dappLoadCancellation.Token);
     }
 
     void ShowDAppLoadError(string failedUrl, WebNavigationResult result)
     {
+        CancelDAppLoadTimeout();
         CancelDAppPreparation();
+        IsDAppLoading = false;
         string appName = DApp?.NameLocalizer.Localize() ?? GetHostOrUrl(failedUrl);
         DAppLoadErrorTitle = Strings.DAppLoadFailed;
         DAppLoadErrorMessage = string.Format(Strings.DAppLoadFailedText, appName, (int)result);
@@ -219,12 +278,34 @@ void ShowDAppLoadError(string failedUrl, WebNavigationResult result)
 
     void BeginDAppPreparation()
     {
+        CancelDAppLoadTimeout();
         CancelDAppPreparation();
         dappPreparationCancellation = new();
         IsDAppPreparing = true;
         _ = WatchDAppPreparationAsync(dappPreparationCancellation.Token);
     }
 
+    void CancelDAppLoadTimeout()
+    {
+        dappLoadCancellation?.Cancel();
+        dappLoadCancellation?.Dispose();
+        dappLoadCancellation = null;
+    }
+
+    async Task WatchDAppLoadAsync(string failedUrl, CancellationToken cancellationToken)
+    {
+        try
+        {
+            await Task.Delay(DAppLoadTimeoutMs, cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            return;
+        }
+        if (!cancellationToken.IsCancellationRequested)
+            MainThread.BeginInvokeOnMainThread(() => ShowDAppLoadError(failedUrl, WebNavigationResult.Timeout));
+    }
+
     void CancelDAppPreparation()
     {
         dappPreparationCancellation?.Cancel();

From 5147f8547425e560cb632aa088858866fa1198b0 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Mon, 20 Jul 2026 16:29:16 +0800
Subject: [PATCH 7/7] Generalize slow dApp loading copy

---
 OneGateApp/Properties/Strings.Designer.cs  | 2 +-
 OneGateApp/Properties/Strings.de.resx      | 2 +-
 OneGateApp/Properties/Strings.es.resx      | 2 +-
 OneGateApp/Properties/Strings.fr.resx      | 2 +-
 OneGateApp/Properties/Strings.id.resx      | 2 +-
 OneGateApp/Properties/Strings.it.resx      | 2 +-
 OneGateApp/Properties/Strings.ja.resx      | 2 +-
 OneGateApp/Properties/Strings.ko.resx      | 2 +-
 OneGateApp/Properties/Strings.nl.resx      | 2 +-
 OneGateApp/Properties/Strings.pt-BR.resx   | 2 +-
 OneGateApp/Properties/Strings.resx         | 2 +-
 OneGateApp/Properties/Strings.ru.resx      | 2 +-
 OneGateApp/Properties/Strings.tr.resx      | 2 +-
 OneGateApp/Properties/Strings.vi.resx      | 2 +-
 OneGateApp/Properties/Strings.zh-Hans.resx | 2 +-
 OneGateApp/Properties/Strings.zh-Hant.resx | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index 21b9d26..9c824f4 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -793,7 +793,7 @@ internal static string DAppPreparing {
         }
 
         /// <summary>
-        ///   查找类似 Games with large assets may take a moment. 的本地化字符串。
+        ///   查找类似 This dApp may need more time to finish loading. 的本地化字符串。
         /// </summary>
         internal static string DAppPreparingText {
             get {
diff --git a/OneGateApp/Properties/Strings.de.resx b/OneGateApp/Properties/Strings.de.resx
index b632035..5c21b3a 100644
--- a/OneGateApp/Properties/Strings.de.resx
+++ b/OneGateApp/Properties/Strings.de.resx
@@ -759,7 +759,7 @@ Möchten Sie fortfahren?</value>
     <value>DApp wird vorbereitet</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Spiele mit großen Ressourcen können einen Moment dauern.</value>
+    <value>Diese dApp benötigt möglicherweise etwas mehr Zeit zum Laden.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Teilen</value>
diff --git a/OneGateApp/Properties/Strings.es.resx b/OneGateApp/Properties/Strings.es.resx
index 70349fe..7e86df5 100644
--- a/OneGateApp/Properties/Strings.es.resx
+++ b/OneGateApp/Properties/Strings.es.resx
@@ -759,7 +759,7 @@ Después de desactivarla, deberá introducir manualmente la contraseña de la bi
     <value>Preparando la DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Los juegos con recursos grandes pueden tardar un momento.</value>
+    <value>Esta dApp puede necesitar más tiempo para terminar de cargar.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Compartir</value>
diff --git a/OneGateApp/Properties/Strings.fr.resx b/OneGateApp/Properties/Strings.fr.resx
index 74c424c..52e0d46 100644
--- a/OneGateApp/Properties/Strings.fr.resx
+++ b/OneGateApp/Properties/Strings.fr.resx
@@ -759,7 +759,7 @@ Voulez-vous continuer ?</value>
     <value>Préparation de la DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Les jeux avec des ressources volumineuses peuvent prendre un moment.</value>
+    <value>Cette dApp peut avoir besoin de plus de temps pour terminer son chargement.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Partager</value>
diff --git a/OneGateApp/Properties/Strings.id.resx b/OneGateApp/Properties/Strings.id.resx
index a4f81a0..b869d6b 100644
--- a/OneGateApp/Properties/Strings.id.resx
+++ b/OneGateApp/Properties/Strings.id.resx
@@ -759,7 +759,7 @@ Apakah Anda ingin melanjutkan?</value>
     <value>Menyiapkan DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Game dengan aset besar mungkin perlu waktu sebentar.</value>
+    <value>dApp ini mungkin memerlukan lebih banyak waktu untuk selesai dimuat.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Bagikan</value>
diff --git a/OneGateApp/Properties/Strings.it.resx b/OneGateApp/Properties/Strings.it.resx
index f2fafdf..b617ec7 100644
--- a/OneGateApp/Properties/Strings.it.resx
+++ b/OneGateApp/Properties/Strings.it.resx
@@ -759,7 +759,7 @@ Vuoi continuare?</value>
     <value>Preparazione della DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>I giochi con risorse grandi possono richiedere qualche istante.</value>
+    <value>Questa dApp potrebbe richiedere più tempo per completare il caricamento.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Condividi</value>
diff --git a/OneGateApp/Properties/Strings.ja.resx b/OneGateApp/Properties/Strings.ja.resx
index 0001272..6f5caf0 100644
--- a/OneGateApp/Properties/Strings.ja.resx
+++ b/OneGateApp/Properties/Strings.ja.resx
@@ -759,7 +759,7 @@
     <value>DApp を準備中</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>大きなアセットを含むゲームは少し時間がかかる場合があります。</value>
+    <value>このdAppは読み込みが完了するまでに時間がかかる場合があります。</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>共有</value>
diff --git a/OneGateApp/Properties/Strings.ko.resx b/OneGateApp/Properties/Strings.ko.resx
index 9294e15..9a8e0dc 100644
--- a/OneGateApp/Properties/Strings.ko.resx
+++ b/OneGateApp/Properties/Strings.ko.resx
@@ -759,7 +759,7 @@
     <value>DApp 준비 중</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>용량이 큰 게임은 시간이 조금 걸릴 수 있습니다.</value>
+    <value>이 dApp은 로딩이 완료되는 데 시간이 더 걸릴 수 있습니다.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>공유</value>
diff --git a/OneGateApp/Properties/Strings.nl.resx b/OneGateApp/Properties/Strings.nl.resx
index 4f6b2f0..81f8f19 100644
--- a/OneGateApp/Properties/Strings.nl.resx
+++ b/OneGateApp/Properties/Strings.nl.resx
@@ -759,7 +759,7 @@ Wilt u doorgaan?</value>
     <value>DApp voorbereiden</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Games met grote assets kunnen even duren.</value>
+    <value>Deze dApp heeft mogelijk meer tijd nodig om te laden.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Delen</value>
diff --git a/OneGateApp/Properties/Strings.pt-BR.resx b/OneGateApp/Properties/Strings.pt-BR.resx
index f67cb05..c297b88 100644
--- a/OneGateApp/Properties/Strings.pt-BR.resx
+++ b/OneGateApp/Properties/Strings.pt-BR.resx
@@ -759,7 +759,7 @@ Deseja continuar?</value>
     <value>Preparando a DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Jogos com recursos grandes podem levar alguns instantes.</value>
+    <value>Este dApp pode precisar de mais tempo para concluir o carregamento.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Compartilhar</value>
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index 1e421d7..cedd931 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -759,7 +759,7 @@ Do you want to continue?</value>
     <value>Preparing DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Games with large assets may take a moment.</value>
+    <value>This dApp may need more time to finish loading.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Share</value>
diff --git a/OneGateApp/Properties/Strings.ru.resx b/OneGateApp/Properties/Strings.ru.resx
index 9037865..51b266a 100644
--- a/OneGateApp/Properties/Strings.ru.resx
+++ b/OneGateApp/Properties/Strings.ru.resx
@@ -759,7 +759,7 @@
     <value>Подготовка DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Игры с крупными ресурсами могут загружаться немного дольше.</value>
+    <value>Этому dApp может потребоваться больше времени для завершения загрузки.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Поделиться</value>
diff --git a/OneGateApp/Properties/Strings.tr.resx b/OneGateApp/Properties/Strings.tr.resx
index 5cc2674..44cda97 100644
--- a/OneGateApp/Properties/Strings.tr.resx
+++ b/OneGateApp/Properties/Strings.tr.resx
@@ -759,7 +759,7 @@ Devam etmek istiyor musunuz?</value>
     <value>DApp hazırlanıyor</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Büyük kaynaklara sahip oyunlar biraz zaman alabilir.</value>
+    <value>Bu dApp'in yüklenmesinin tamamlanması daha uzun sürebilir.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Paylaş</value>
diff --git a/OneGateApp/Properties/Strings.vi.resx b/OneGateApp/Properties/Strings.vi.resx
index 89d6fc4..15ef022 100644
--- a/OneGateApp/Properties/Strings.vi.resx
+++ b/OneGateApp/Properties/Strings.vi.resx
@@ -759,7 +759,7 @@ Bạn có muốn tiếp tục không?</value>
     <value>Đang chuẩn bị DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>Trò chơi có tài nguyên lớn có thể mất thêm một chút thời gian.</value>
+    <value>dApp này có thể cần thêm thời gian để tải xong.</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>Chia sẻ</value>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index 8a21ffc..88304a4 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -759,7 +759,7 @@
     <value>正在准备 DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>大型游戏资源较多，可能还需要一点时间。</value>
+    <value>此 dApp 可能需要更多时间才能完成加载。</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>分享</value>
diff --git a/OneGateApp/Properties/Strings.zh-Hant.resx b/OneGateApp/Properties/Strings.zh-Hant.resx
index aac3895..e93295e 100644
--- a/OneGateApp/Properties/Strings.zh-Hant.resx
+++ b/OneGateApp/Properties/Strings.zh-Hant.resx
@@ -735,7 +735,7 @@
     <value>正在準備 DApp</value>
   </data>
   <data name="DAppPreparingText" xml:space="preserve">
-    <value>大型遊戲資源較多，可能還需要一點時間。</value>
+    <value>此 dApp 可能需要更多時間才能完成載入。</value>
   </data>
   <data name="Share" xml:space="preserve">
     <value>分享</value>