merge: resolve conflicts with main

Co-authored-by: wachunei <1024246+wachunei@users.noreply.github.com>

Author: Copilot

.github/workflows/build-android-e2e.yml

@@ -34,7 +34,7 @@ on:
 jobs:
   build-android-apks:
     name: Build Android E2E APKs
-    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-android-build' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' }} # Optimized for lg runner (48GB) with conservative memory settings
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-android-build' || (startsWith(github.base_ref, 'release/') && fromJSON('["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg"]') || fromJSON('["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg", "low-priority"]')) }} # Optimized for lg runner (48GB) with conservative memory settings
     timeout-minutes: 40
     env:
       GRADLE_USER_HOME: ${{ inputs.runner_provider == 'namespace' && '/home/runner/_work/.gradle' || '/home/admin/_work/.gradle' }}

.github/workflows/build-ios-e2e.yml

@@ -30,7 +30,7 @@ permissions:
 jobs:
   build-ios-apps:
     name: Build iOS E2E Apps
-    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || (startsWith(github.base_ref, 'release/') && fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe-xl"]') || fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe-xl", "low-priority"]')) }}
     outputs:
       artifacts-url: ${{ steps.set-artifacts-url.outputs.artifacts-url }}
       app-uploaded: ${{ steps.upload-app.outcome == 'success' }}

.github/workflows/build.yml

@@ -190,6 +190,9 @@ jobs:
     # Android: Cirrus lg (large) runner for 8GB Gradle heap; iOS: Cirrus macOS Tahoe (has Xcode 26.x)
     runs-on: ${{ inputs.runner_provider == 'namespace' && (matrix.platform == 'ios' && 'namespace-profile-metamask-ios-build' || 'namespace-profile-metamask-android-build') || (matrix.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg') }}
     environment: ${{ needs.prepare.outputs.github_environment }}
+    env:
+      GRADLE_USER_HOME: /home/admin/_work/.gradle
+      CACHE_GENERATION: v1
     steps:
       - name: Validate version-bump commit
         if: ${{ !inputs.skip_version_bump }}
@@ -375,6 +378,29 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Apply release Gradle config (Android)
+        if: matrix.platform == 'android'
+        run: cp android/gradle.properties.release android/gradle.properties
+
+      - name: Restore Gradle dependencies from branch cache (Android)
+        if: matrix.platform == 'android'
+        id: gradle-cache-restore
+        uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
+        with:
+          path: |
+            ~/_work/.gradle/caches
+            ~/_work/.gradle/wrapper
+          key: gradle-release-${{ github.ref_name }}-${{ env.CACHE_GENERATION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Restore Gradle dependencies from main cache (Android)
+        if: matrix.platform == 'android' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main'
+        uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
+        with:
+          path: |
+            ~/_work/.gradle/caches
+            ~/_work/.gradle/wrapper
+          key: gradle-release-main-${{ env.CACHE_GENERATION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
       # iOS: Clean up any existing keychains from previous runs
       - name: Clean up existing keychains
         if: matrix.platform == 'ios' && needs.prepare.outputs.signing_aws_role != ''

.github/workflows/run-e2e-workflow.yml

@@ -63,7 +63,7 @@ on:
 jobs:
   test-e2e-mobile:
     name: ${{ inputs.test-suite-name }}
-    runs-on: ${{ inputs.runner_provider == 'namespace' && (inputs.platform == 'ios' && 'namespace-profile-metamask-ios-e2e' || 'namespace-profile-metamask-android-build') || (inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg') }}
+    runs-on: ${{ inputs.runner_provider == 'namespace' && (inputs.platform == 'ios' && 'namespace-profile-metamask-ios-e2e' || 'namespace-profile-metamask-android-build') || (startsWith(github.base_ref, 'release/') && fromJSON(format('["{0}"]', inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg')) || fromJSON(format('["{0}", "low-priority"]', inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:tahoe' || 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg'))) }}
     outputs:
       apk-target-path: ${{ steps.determine-target-paths.outputs.apk-target-path }}
       test-apk-target-path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}

.github/workflows/update-e2e-fixtures.yml

@@ -180,7 +180,7 @@ jobs:
   update-fixtures:
     name: Export & update fixtures
     needs: [prepare]
-    runs-on: ghcr.io/cirruslabs/macos-runner:tahoe
+    runs-on: ${{ startsWith(github.base_ref, 'release/') && fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe"]') || fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe", "low-priority"]') }}
     timeout-minutes: 30
 
     env:

android/gradle.properties.release

@@ -0,0 +1,43 @@
+# Gradle settings for GitHub Actions release/production builds (LG runner, 48GB RAM)
+
+# JVM: 8GB heap to leave room for Metro workers + Kotlin daemon
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:G1HeapRegionSize=8m -XX:+UseStringDeduplication -XX:+OptimizeStringConcat -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.caching=true
+# Daemon disabled: ephemeral CI runners are destroyed after each job, so the daemon
+# provides zero warm-start benefit and unnecessarily locks JVM memory.
+org.gradle.daemon=false
+# 4 workers to reduce concurrent memory pressure on 48GB runner
+org.gradle.workers.max=4
+org.gradle.vfs.watch=false
+
+kotlin.incremental=true
+kotlin.incremental.android=true
+kotlin.caching.enabled=true
+# Kotlin daemon: 2GB cap to prevent memory contention
+kotlin.daemon.jvmargs=-Xmx2g -XX:+UseG1GC -XX:+ExitOnOutOfMemoryError
+
+# File system optimizations
+org.gradle.vfs.verbose=false
+org.gradle.welcome=NEVER
+
+# AndroidX
+android.useAndroidX=true
+android.enableJetifier=true
+
+# Enable AAPT2 PNG crunching
+android.enablePngCrunchInReleaseBuilds=true
+
+# ALL architectures for Play Store distribution (differs from E2E which uses x86_64 only)
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# New Architecture + Hermes
+newArchEnabled=true
+hermesEnabled=true
+
+android.disableResourceValidation=true
+
+# Use legacy packaging to compress native libraries in the resulting APK.
+expo.useLegacyPackaging=false

app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.test.tsx

@@ -41,6 +41,7 @@ jest.mock('./OndoCampaignStatsSummary', () => {
 });
 
 const IDS = CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS;
+const CrownIcon = 'CrownIcon' as unknown as React.ComponentType;
 
 const baseEntry = {
   rank: 7,
@@ -68,6 +69,31 @@ describe('CampaignLeaderboardEntryRow', () => {
     expect(isPositivePrimaryMetric).toHaveBeenCalledWith(baseEntry);
   });
 
+  it('shows crown based only on showCrown', () => {
+    const { UNSAFE_queryAllByType } = render(
+      <CampaignLeaderboardEntryRow
+        entry={baseEntry}
+        showCrown
+        formatPrimaryMetric={() => '+12.5%'}
+        isPositivePrimaryMetric={() => true}
+      />,
+    );
+
+    expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(1);
+  });
+
+  it('hides crown when showCrown is false', () => {
+    const { UNSAFE_queryAllByType } = render(
+      <CampaignLeaderboardEntryRow
+        entry={{ ...baseEntry, rank: 1 }}
+        formatPrimaryMetric={() => '+12.5%'}
+        isPositivePrimaryMetric={() => true}
+      />,
+    );
+
+    expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(0);
+  });
+
   it('sets row testID from shared ENTRY_ROW and rank', () => {
     const { getByTestId } = render(
       <CampaignLeaderboardEntryRow

app/components/UI/Rewards/components/Campaigns/CampaignLeaderboard.tsx

@@ -92,9 +92,7 @@ export function CampaignLeaderboardEntryRow<
           >
             {entry.referralCode}
           </Text>
-          {showCrown && entry.rank <= 5 && (
-            <CrownIcon name="crown" width={14} height={14} />
-          )}
+          {showCrown && <CrownIcon name="crown" width={14} height={14} />}
         </Box>
         {showPendingTag && (
           <PendingTag

app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.test.tsx

@@ -4,6 +4,7 @@ import OndoLeaderboard, {
   CAMPAIGN_LEADERBOARD_TEST_IDS,
 } from './OndoLeaderboard';
 import type { CampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
+import { ONDO_GM_TIER_MAX_WINNERS } from '../../utils/ondoCampaignConstants';
 import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
 import {
   createMockUseAnalyticsHook,
@@ -32,6 +33,8 @@ jest.mock('@metamask/design-system-twrnc-preset', () => {
   return { useTailwind: () => tw };
 });
 
+jest.mock('../../../../../images/rewards/crown.svg', () => 'CrownIcon');
+
 jest.mock('../RewardsErrorBanner', () => {
   const ReactActual = jest.requireActual('react');
   const { View, Text, Pressable } = jest.requireActual('react-native');
@@ -89,6 +92,8 @@ jest.mock('../../../../../../locales/i18n', () => ({
   },
 }));
 
+const CrownIcon = 'CrownIcon' as unknown as React.ComponentType;
+
 const createMockEntry = (
   overrides: Partial<CampaignLeaderboardEntry> = {},
 ): CampaignLeaderboardEntry => ({
@@ -337,6 +342,40 @@ describe('OndoLeaderboard', () => {
 
       expect(getByText('No entries in this tier')).toBeDefined();
     });
+
+    it('shows crown in full view for Ondo winner ranks only', () => {
+      const entries = [
+        createMockEntry({
+          rank: ONDO_GM_TIER_MAX_WINNERS,
+          referralCode: 'WINNER',
+        }),
+        createMockEntry({
+          rank: ONDO_GM_TIER_MAX_WINNERS + 1,
+          referralCode: 'NEXT',
+        }),
+      ];
+      const { UNSAFE_queryAllByType } = render(
+        <OndoLeaderboard {...defaultProps} entries={entries} />,
+      );
+
+      expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(1);
+    });
+
+    it('hides crown in preview mode for Ondo winner ranks', () => {
+      const entries = [
+        createMockEntry({ rank: 1, referralCode: 'AAA111' }),
+        createMockEntry({ rank: 2, referralCode: 'BBB222' }),
+      ];
+      const { UNSAFE_queryAllByType } = render(
+        <OndoLeaderboard
+          {...defaultProps}
+          entries={entries}
+          maxEntries={entries.length}
+        />,
+      );
+
+      expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(0);
+    });
   });
 
   describe('currentUserReferralCode highlighting', () => {

app/components/UI/Rewards/components/Campaigns/OndoLeaderboard.tsx

@@ -27,6 +27,7 @@ import {
   formatRateOfReturn,
   formatTierDisplayName,
 } from './OndoLeaderboard.utils';
+import { ONDO_GM_TIER_MAX_WINNERS } from '../../utils/ondoCampaignConstants';
 
 export const CAMPAIGN_LEADERBOARD_TEST_IDS = {
   CONTAINER: 'campaign-leaderboard-container',
@@ -275,7 +276,7 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
               key={`${entry.rank}-${entry.referralCode}`}
               entry={entry}
               isCurrentUser={isCurrentUser(entry)}
-              showCrown={!isPreview}
+              showCrown={!isPreview && entry.rank <= ONDO_GM_TIER_MAX_WINNERS}
               isCampaignComplete={isCampaignComplete}
               formatPrimaryMetric={(e) => formatRateOfReturn(e.rateOfReturn)}
               isPositivePrimaryMetric={(e) => e.rateOfReturn >= 0}
@@ -289,7 +290,9 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
                   key={`neighbor-${entry.rank}-${entry.referralCode}`}
                   entry={entry}
                   isCurrentUser={isCurrentUser(entry)}
-                  showCrown={!isPreview}
+                  showCrown={
+                    !isPreview && entry.rank <= ONDO_GM_TIER_MAX_WINNERS
+                  }
                   isCampaignComplete={isCampaignComplete}
                   formatPrimaryMetric={(e) =>
                     formatRateOfReturn(e.rateOfReturn)