Bundle update: use native skip-GPG capability and commit-hash matching (#10523)

Author: huhuanming

.claude/skills/1k-feature-guides/references/rules/page-and-route.md

@@ -371,6 +371,67 @@ navigation.navigate(ERootRoutes.Main, {
 
 ---
 
+## Native Tab View Navigation Safety
+
+### ⚠️ CRITICAL: Overlay Dismissal with Native UITabBarController
+
+When the app uses native `UITabBarController` (`@onekeyfe/react-native-tab-view`), **non-selected tabs' views are removed from the iOS window hierarchy**. This means any `RNSScreenStack` inside an inactive tab has `window=NIL` and cannot process navigation updates.
+
+**Problem**: Calling `goBack()` to pop overlay routes (Modal, FullScreenPush) triggers React Navigation to reconcile nested stacks inside those routes. If a nested stack is inside a tab that has lost its window, the native `setPushViewControllers` is SKIPPED and retries 50 times (~5 seconds) before giving up. The navigation appears frozen until the user touches the screen.
+
+**Rule**: When navigating from an overlay route to a tab page, **never use sequential `goBack()` calls**. Use `navigateFromOverlayToTab()` or `resetAboveMainRoute()` instead.
+
+```typescript
+// ❌ WRONG: Sequential goBack() causes window-nil race condition
+await popScanModalPages();
+await popActionCenterPages();  // Stack inside detached tab = window NIL = FAIL
+navigation.switchTab(ETabRoutes.Home);
+navigation.push(targetPage);
+
+// ✅ CORRECT: Use navigateFromOverlayToTab utility
+await popScanModalPages();           // Dismiss modal with animation
+await waitForScanModalClosed();
+await navigateFromOverlayToTab({     // Atomically reset + switch tab
+  targetTab: ETabRoutes.Home,
+  switchTab: (tab) => navigation.switchTab(tab),
+});
+navigation.push(targetPage);         // Safe to push now
+
+// ✅ ALSO CORRECT: Use resetAboveMainRoute directly
+await popScanModalPages();
+await waitForScanModalClosed();
+resetAboveMainRoute();               // Atomically remove all overlay routes
+navigation.switchTab(ETabRoutes.Home);
+await timerUtils.wait(100);          // Wait for navigator to settle
+navigation.push(targetPage);
+```
+
+**Key utilities** (exported from `@onekeyhq/components`):
+- `navigateFromOverlayToTab()` — Safe overlay-to-tab navigation with atomic reset
+- `resetAboveMainRoute()` — Atomically remove all routes above Main via `CommonActions.reset`
+
+### Why `switchTab()` alone cannot activate the target tab
+
+When overlay routes (FullScreenPush, Modal) are stacked above Main, calling `switchTab()` only changes `UITabBarController.selectedIndex` internally. The target tab's view is **NOT** added to the window hierarchy because the overlay route's view is still the topmost visible layer. The `UITabBarController` only manages views within its own container — if that container is obscured by an overlay, the tab view stays detached.
+
+```
+Root State: [Main, FullScreenPush, Modal]
+                    ↑ overlay is topmost visible view
+                    UITabBarController's tab views are underneath, not in window
+
+switchTab(Home) → selectedIndex changes, but Home tab's view still has window=NIL
+goBack() to pop FullScreenPush → nested stack update fails (window=NIL)
+```
+
+Therefore, **you must use `resetAboveMainRoute()` to atomically remove all overlays first**, making Main the topmost route. Only then will `switchTab()` cause the target tab's view to enter the window hierarchy.
+
+**When to watch out**:
+- Any code that calls `goBack()` on root navigator while a FullScreenPush or Modal is active
+- Any flow that dismisses overlay pages and then navigates to a different tab
+- Cross-tab navigation after closing settings/action center pages
+
+---
+
 ## Files Reference
 
 | Purpose | Location |

.github/workflows/release-desktop-bundle.yml

@@ -7,17 +7,10 @@ on:
     types:
       - completed
   workflow_dispatch:
-    inputs:
-      ONEKEY_ALLOW_SKIP_GPG_VERIFICATION:
-        description: "Allow skipping GPG verification for bundle updates (default: false)"
-        required: false
-        type: boolean
-        default: false
 
 env:
   NODE_ENV: production
   YARN_ENABLE_GLOBAL_CACHE: true
-  ONEKEY_ALLOW_SKIP_GPG_VERIFICATION: ${{ github.event.inputs.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION || 'false' }}
 
 jobs:
   release-desktop-bundle:
@@ -52,11 +45,6 @@ jobs:
           sentry_dsn_winms: ${{ secrets.SENTRY_DSN_WINMS }}
           sentry_dsn_ext: ${{ secrets.SENTRY_DSN_EXT }}
 
-      - name: Warn if GPG verification is skipped
-        if: ${{ env.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION == 'true' }}
-        run: |
-          echo "::warning::GPG verification is SKIPPED for this build. This should only be used in CI/dev builds."
-
       - name: 'Setup ENV'
         run: |
           eval "$(node -e 'const v=require("./apps/desktop/package.json").version; console.log("pkg_version="+v)')"

.github/workflows/release-native-bundle.yml

@@ -7,17 +7,10 @@ on:
     types:
       - completed
   workflow_dispatch:
-    inputs:
-      ONEKEY_ALLOW_SKIP_GPG_VERIFICATION:
-        description: "Allow skipping GPG verification for bundle updates (default: false)"
-        required: false
-        type: boolean
-        default: false
 
 env:
   NODE_ENV: production
   YARN_ENABLE_GLOBAL_CACHE: true
-  ONEKEY_ALLOW_SKIP_GPG_VERIFICATION: ${{ github.event.inputs.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION || 'false' }}
 
 jobs:
   release-native-bundle:
@@ -52,11 +45,6 @@ jobs:
           sentry_dsn_winms: ${{ secrets.SENTRY_DSN_WINMS }}
           sentry_dsn_ext: ${{ secrets.SENTRY_DSN_EXT }}
 
-      - name: Warn if GPG verification is skipped
-        if: ${{ env.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION == 'true' }}
-        run: |
-          echo "::warning::GPG verification is SKIPPED for this build. This should only be used in CI/dev builds."
-
       - name: 'Setup ENV'
         run: |
           eval "$(node -e 'const v=require("./apps/desktop/package.json").version; console.log("pkg_version="+v)')"

apps/mobile/android/app/src/main/java/so/onekey/app/wallet/CustomReactNativeHost.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 import android.content.Context;
 import com.facebook.react.defaults.DefaultReactNativeHost;
+import com.margelo.nitro.nativelogger.OneKeyLog;
 import com.margelo.nitro.reactnativebundleupdate.BundleUpdateStoreAndroid;
 import java.io.File;
 
@@ -26,11 +27,17 @@ public String getJSBundleFile() {
         if (bundlePath != null) {
             File bundleFile = new File(bundlePath);
             if (bundleFile.exists()) {
+                OneKeyLog.info("BundleUpdate", "getJSBundleFile: using OTA bundle path=" + bundlePath);
                 return bundlePath;
             }
+            OneKeyLog.warn("BundleUpdate", "getJSBundleFile: OTA path not found, path=" + bundlePath);
+        } else {
+            OneKeyLog.info("BundleUpdate", "getJSBundleFile: OTA path is null");
         }
 
         // Fallback to default bundle
-        return super.getJSBundleFile();
+        String fallbackPath = super.getJSBundleFile();
+        OneKeyLog.info("BundleUpdate", "getJSBundleFile: fallback bundle path=" + fallbackPath);
+        return fallbackPath;
     }
 }

apps/mobile/android/build.gradle

@@ -84,6 +84,11 @@ allprojects {
         mavenCentral()
         maven { url 'https://www.jitpack.io' }
     }
+    // Pin app.notifee:core to the version bundled in node_modules to avoid
+    // querying remote repos (jitpack.io) which can time out on EAS builds.
+    configurations.all {
+        resolutionStrategy.force 'app.notifee:core:202108261754'
+    }
 }
 
 apply plugin: "expo-root-project"

apps/mobile/ios/AppDelegate.swift

@@ -118,13 +118,32 @@ class ReactNativeDelegate: ExpoReactNativeFactoryDelegate {
 
   override func bundleURL() -> URL? {
 #if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")
+    let metroURL = RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")
+    NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(DEBUG): metroURL=\(metroURL?.absoluteString ?? "nil")")
+    return metroURL
 #else
     // Check for updated bundle via dynamic bridge (avoids Nitro module import)
-    if let bundlePath = NitroModuleBridge.currentBundleMainJSBundle() {
-      return URL(string: bundlePath)
+    if let bundlePath = NitroModuleBridge.currentBundleMainJSBundle(), !bundlePath.isEmpty {
+      let isFileURL = bundlePath.hasPrefix("file://")
+      let bundleFilePath = isFileURL ? (URL(string: bundlePath)?.path ?? bundlePath) : bundlePath
+      let exists = FileManager.default.fileExists(atPath: bundleFilePath)
+      NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(RELEASE): otaPath=\(bundlePath), exists=\(exists)")
+
+      if exists {
+        if isFileURL, let fileURL = URL(string: bundlePath) {
+          NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(RELEASE): using OTA file URL=\(fileURL.absoluteString)")
+          return fileURL
+        }
+        let fileURL = URL(fileURLWithPath: bundlePath)
+        NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(RELEASE): using OTA file path=\(fileURL.absoluteString)")
+        return fileURL
+      }
+
+      NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(RELEASE): OTA path not found, will fallback")
     }
-    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+    let fallbackURL = Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+    NitroModuleBridge.logInfo("BundleUpdate", "bundleURL(RELEASE): fallback main.jsbundle=\(fallbackURL?.absoluteString ?? "nil")")
+    return fallbackURL
 #endif
   }
 }

apps/mobile/ios/Podfile.lock

@@ -4218,9 +4218,9 @@ PODS:
   - RNZipArchive/Core (7.0.2):
     - React-Core
     - SSZipArchive (~> 2.5.5)
-  - SDWebImage (5.21.5):
-    - SDWebImage/Core (= 5.21.5)
-  - SDWebImage/Core (5.21.5)
+  - SDWebImage (5.21.7):
+    - SDWebImage/Core (= 5.21.7)
+  - SDWebImage/Core (5.21.7)
   - SDWebImageSVGCoder (1.7.0):
     - SDWebImage/Core (~> 5.6)
   - SDWebImageWebPCoder (0.14.6):
@@ -5026,7 +5026,7 @@ SPEC CHECKSUMS:
   RNSVG: d260beec1775108e1bd065a0ed666ff2c5565158
   RNWorklets: 8068c8af4b241eb2c19221310729e4c440bee023
   RNZipArchive: 4304f5100eab004eeb7349adc51997b3a28deb76
-  SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
+  SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: b53951377b78e21a734f5dc8318e333dbfc682d7

development/babelTools.js

@@ -118,10 +118,6 @@ function normalizeConfig({ platform, config }) {
         'platformEnv.isNative': isNative,
         'platformEnv.isExtChrome': isExtChrome,
         'platformEnv.isExtFirefox': isExtFirefox,
-        'process.env.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION': process.env
-          .ONEKEY_ALLOW_SKIP_GPG_VERIFICATION
-          ? process.env.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION === 'true'
-          : process.env.NODE_ENV !== 'production',
       },
     ],
     /*

development/webpack/webpack.base.config.js

@@ -110,10 +110,6 @@ const basePlugins = [
         PERF_FUNCTION_WARN_MS: JSON.stringify(
           process.env.PERF_FUNCTION_WARN_MS || '',
         ),
-        ONEKEY_ALLOW_SKIP_GPG_VERIFICATION: process.env
-          .ONEKEY_ALLOW_SKIP_GPG_VERIFICATION
-          ? process.env.ONEKEY_ALLOW_SKIP_GPG_VERIFICATION === 'true'
-          : process.env.NODE_ENV !== 'production',
       },
     },
   }),

packages/components/src/layouts/Navigation/Navigator/NavigationContainer.tsx

@@ -9,6 +9,7 @@ import {
 } from 'react';
 
 import {
+  CommonActions,
   DarkTheme,
   DefaultTheme,
   NavigationContainer as RNNavigationContainer,
@@ -304,6 +305,62 @@ export const popActionCenterPages = async (maxRetryTimes = 99) => {
   await popActionCenterPages(maxRetryTimes - 1);
 };
 
+/**
+ * Atomically remove all routes above the Main route (Modal, FullScreenPush, etc.)
+ * using CommonActions.reset. No transition animation, but avoids the native
+ * UITabBarController window-nil race condition where RNSScreenStack retries
+ * exhaust when goBack() is called on a stack inside a detached tab view.
+ *
+ * Prefer this over sequential goBack() calls when you need to dismiss multiple
+ * overlay routes and the intermediate animation is not important.
+ */
+export const resetAboveMainRoute = () => {
+  const state = rootNavigationRef.current?.getRootState();
+  if (!state) {
+    return;
+  }
+  const mainRoutes = state.routes.filter(
+    (route) => route.name === ERootRoutes.Main,
+  );
+  if (mainRoutes.length === 0 || mainRoutes.length === state.routes.length) {
+    return;
+  }
+  rootNavigationRef.current?.dispatch(
+    CommonActions.reset({
+      ...state,
+      routes: mainRoutes,
+      index: mainRoutes.length - 1,
+    }),
+  );
+};
+
+/**
+ * Safely navigate from an overlay route (Modal/FullScreenPush) to a tab page.
+ *
+ * When using native UITabBarController, calling goBack() on overlay routes
+ * can trigger RNSScreenStack updates on stacks inside detached tab views,
+ * where window=NIL causes the update to fail after 50 retries (~5 seconds).
+ *
+ * This utility atomically removes all overlay routes via reset, switches
+ * to the target tab, and waits for the navigator to settle before returning.
+ *
+ * Usage:
+ *   await navigateFromOverlayToTab({
+ *     targetTab: ETabRoutes.Home,
+ *     switchTab: (tab) => navigation.switchTab(tab),
+ *   });
+ *   // Now safe to push/navigate within the target tab
+ */
+export const navigateFromOverlayToTab = async (options: {
+  targetTab: ETabRoutes;
+  switchTab: (tab: ETabRoutes) => void;
+}) => {
+  resetAboveMainRoute();
+  options.switchTab(options.targetTab);
+  // Wait for navigator to fully reconcile after reset + tab switch
+  await timerUtils.wait(100);
+};
+
 export const popToTabRootScreen = async () => {
   const rootState = rootNavigationRef.current?.getRootState();
   const tabRoute = rootState?.routes?.[rootState.index];