[pull] main from MetaMask:main

android/gradle.properties.github

@@ -1,9 +1,11 @@
 # GitHub Actions-specific Gradle settings
 # Optimized for E2E builds on GitHub Actions runners
 
-# JVM configuration - balanced settings to avoid OOM while maintaining performance
+# JVM configuration
 # Using 16GB heap to leave room for parallel workers and native memory
-org.gradle.jvmargs=-Xmx16g -XX:MaxMetaspaceSize=1g -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication -XX:+OptimizeStringConcat
+# ExitOnOutOfMemoryError: fail-fast on JVM heap exhaustion (does not catch OS OOM killer)
+# file.encoding=UTF-8: ensure consistent charset across different runner configurations
+org.gradle.jvmargs=-Xmx16g -XX:MaxMetaspaceSize=1g -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication -XX:+OptimizeStringConcat -XX:+ExitOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # Enable performance optimizations but limit parallelism to prevent OOM
 org.gradle.parallel=true
@@ -54,4 +56,4 @@ hermesEnabled=true
 android.disableResourceValidation=true
 
 # Use legacy packaging to compress native libraries in the resulting APK.
-expo.useLegacyPackaging=false 
+expo.useLegacyPackaging=false

app/components/UI/Card/components/Onboarding/KYCWebview.tsx

@@ -23,7 +23,7 @@ const KYCWebview: React.FC = () => {
       )
     ) {
       navigation.dispatch(
-        StackActions.replace(Routes.CARD.ONBOARDING.PERSONAL_DETAILS),
+        StackActions.replace(Routes.CARD.ONBOARDING.VERIFYING_VERIFF_KYC),
       );
     }
   };

app/components/UI/Card/components/Onboarding/PhysicalAddress.test.tsx

@@ -731,7 +731,7 @@ describe('PhysicalAddress Component', () => {
   });
 
   describe('Navigation', () => {
-    it('navigates to VALIDATING_KYC when registration is complete', async () => {
+    it('navigates to VERIFYING_REGISTRATION when registration is complete', async () => {
       const mockGetOnboardingConsentSetByOnboardingId = jest
         .fn()
         .mockResolvedValue(null);
@@ -823,7 +823,7 @@ describe('PhysicalAddress Component', () => {
         () => {
           expect(mockReset).toHaveBeenCalledWith({
             index: 0,
-            routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
+            routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
           });
         },
         { timeout: 3000 },
@@ -1104,7 +1104,7 @@ describe('PhysicalAddress Component', () => {
         () => {
           expect(mockReset).toHaveBeenCalledWith({
             index: 0,
-            routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
+            routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
           });
         },
         { timeout: 3000 },

app/components/UI/Card/components/Onboarding/PhysicalAddress.tsx

@@ -480,7 +480,7 @@ const PhysicalAddress = () => {
         // Reset the navigation stack to the verifying registration screen
         navigation.reset({
           index: 0,
-          routes: [{ name: Routes.CARD.ONBOARDING.VALIDATING_KYC }],
+          routes: [{ name: Routes.CARD.VERIFYING_REGISTRATION }],
         });
         return;
       }