Skip to content

Commit f88fd7e

Browse files
juanmigdrjuanmigdr
authored
Merge branch 'main' into chore/udate-assets-controllers-tokensList
2 parents cd3888e + 8008f70 commit f88fd7e

25 files changed

Lines changed: 667 additions & 117 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
jobs:
3535
build-android-apks:
3636
name: Build Android E2E APKs
37-
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
37+
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
3838
timeout-minutes: 40
3939
env:
4040
GRADLE_USER_HOME: ${{ inputs.runner_provider == 'namespace' && '/home/runner/_work/.gradle' || '/home/admin/_work/.gradle' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions:
3030
jobs:
3131
build-ios-apps:
3232
name: Build iOS E2E Apps
33-
runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ios-build' || 'ghcr.io/cirruslabs/macos-runner:tahoe-xl' }}
33+
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"]')) }}
3434
outputs:
3535
artifacts-url: ${{ steps.set-artifacts-url.outputs.artifacts-url }}
3636
app-uploaded: ${{ steps.upload-app.outcome == 'success' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ on:
6363
jobs:
6464
test-e2e-mobile:
6565
name: ${{ inputs.test-suite-name }}
66-
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') }}
66+
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'))) }}
6767
outputs:
6868
apk-target-path: ${{ steps.determine-target-paths.outputs.apk-target-path }}
6969
test-apk-target-path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
update-fixtures:
181181
name: Export & update fixtures
182182
needs: [prepare]
183-
runs-on: ghcr.io/cirruslabs/macos-runner:tahoe
183+
runs-on: ${{ startsWith(github.base_ref, 'release/') && fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe"]') || fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe", "low-priority"]') }}
184184
timeout-minutes: 30
185185

186186
env:

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jest.mock('./OndoCampaignStatsSummary', () => {
4141
});
4242

4343
const IDS = CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS;
44+
const CrownIcon = 'CrownIcon' as unknown as React.ComponentType;
4445

4546
const baseEntry = {
4647
rank: 7,
@@ -68,6 +69,31 @@ describe('CampaignLeaderboardEntryRow', () => {
6869
expect(isPositivePrimaryMetric).toHaveBeenCalledWith(baseEntry);
6970
});
7071

72+
it('shows crown based only on showCrown', () => {
73+
const { UNSAFE_queryAllByType } = render(
74+
<CampaignLeaderboardEntryRow
75+
entry={baseEntry}
76+
showCrown
77+
formatPrimaryMetric={() => '+12.5%'}
78+
isPositivePrimaryMetric={() => true}
79+
/>,
80+
);
81+
82+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(1);
83+
});
84+
85+
it('hides crown when showCrown is false', () => {
86+
const { UNSAFE_queryAllByType } = render(
87+
<CampaignLeaderboardEntryRow
88+
entry={{ ...baseEntry, rank: 1 }}
89+
formatPrimaryMetric={() => '+12.5%'}
90+
isPositivePrimaryMetric={() => true}
91+
/>,
92+
);
93+
94+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(0);
95+
});
96+
7197
it('sets row testID from shared ENTRY_ROW and rank', () => {
7298
const { getByTestId } = render(
7399
<CampaignLeaderboardEntryRow

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ export function CampaignLeaderboardEntryRow<
9292
>
9393
{entry.referralCode}
9494
</Text>
95-
{showCrown && entry.rank <= 5 && (
96-
<CrownIcon name="crown" width={14} height={14} />
97-
)}
95+
{showCrown && <CrownIcon name="crown" width={14} height={14} />}
9896
</Box>
9997
{showPendingTag && (
10098
<PendingTag

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import OndoLeaderboard, {
44
CAMPAIGN_LEADERBOARD_TEST_IDS,
55
} from './OndoLeaderboard';
66
import type { CampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
7+
import { ONDO_GM_TIER_MAX_WINNERS } from '../../utils/ondoCampaignConstants';
78
import { useAnalytics } from '../../../../hooks/useAnalytics/useAnalytics';
89
import {
910
createMockUseAnalyticsHook,
@@ -32,6 +33,8 @@ jest.mock('@metamask/design-system-twrnc-preset', () => {
3233
return { useTailwind: () => tw };
3334
});
3435

36+
jest.mock('../../../../../images/rewards/crown.svg', () => 'CrownIcon');
37+
3538
jest.mock('../RewardsErrorBanner', () => {
3639
const ReactActual = jest.requireActual('react');
3740
const { View, Text, Pressable } = jest.requireActual('react-native');
@@ -89,6 +92,8 @@ jest.mock('../../../../../../locales/i18n', () => ({
8992
},
9093
}));
9194

95+
const CrownIcon = 'CrownIcon' as unknown as React.ComponentType;
96+
9297
const createMockEntry = (
9398
overrides: Partial<CampaignLeaderboardEntry> = {},
9499
): CampaignLeaderboardEntry => ({
@@ -337,6 +342,40 @@ describe('OndoLeaderboard', () => {
337342

338343
expect(getByText('No entries in this tier')).toBeDefined();
339344
});
345+
346+
it('shows crown in full view for Ondo winner ranks only', () => {
347+
const entries = [
348+
createMockEntry({
349+
rank: ONDO_GM_TIER_MAX_WINNERS,
350+
referralCode: 'WINNER',
351+
}),
352+
createMockEntry({
353+
rank: ONDO_GM_TIER_MAX_WINNERS + 1,
354+
referralCode: 'NEXT',
355+
}),
356+
];
357+
const { UNSAFE_queryAllByType } = render(
358+
<OndoLeaderboard {...defaultProps} entries={entries} />,
359+
);
360+
361+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(1);
362+
});
363+
364+
it('hides crown in preview mode for Ondo winner ranks', () => {
365+
const entries = [
366+
createMockEntry({ rank: 1, referralCode: 'AAA111' }),
367+
createMockEntry({ rank: 2, referralCode: 'BBB222' }),
368+
];
369+
const { UNSAFE_queryAllByType } = render(
370+
<OndoLeaderboard
371+
{...defaultProps}
372+
entries={entries}
373+
maxEntries={entries.length}
374+
/>,
375+
);
376+
377+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(0);
378+
});
340379
});
341380

342381
describe('currentUserReferralCode highlighting', () => {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
formatRateOfReturn,
2828
formatTierDisplayName,
2929
} from './OndoLeaderboard.utils';
30+
import { ONDO_GM_TIER_MAX_WINNERS } from '../../utils/ondoCampaignConstants';
3031

3132
export const CAMPAIGN_LEADERBOARD_TEST_IDS = {
3233
CONTAINER: 'campaign-leaderboard-container',
@@ -275,7 +276,7 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
275276
key={`${entry.rank}-${entry.referralCode}`}
276277
entry={entry}
277278
isCurrentUser={isCurrentUser(entry)}
278-
showCrown={!isPreview}
279+
showCrown={!isPreview && entry.rank <= ONDO_GM_TIER_MAX_WINNERS}
279280
isCampaignComplete={isCampaignComplete}
280281
formatPrimaryMetric={(e) => formatRateOfReturn(e.rateOfReturn)}
281282
isPositivePrimaryMetric={(e) => e.rateOfReturn >= 0}
@@ -289,7 +290,9 @@ const OndoLeaderboard: React.FC<CampaignLeaderboardProps> = ({
289290
key={`neighbor-${entry.rank}-${entry.referralCode}`}
290291
entry={entry}
291292
isCurrentUser={isCurrentUser(entry)}
292-
showCrown={!isPreview}
293+
showCrown={
294+
!isPreview && entry.rank <= ONDO_GM_TIER_MAX_WINNERS
295+
}
293296
isCampaignComplete={isCampaignComplete}
294297
formatPrimaryMetric={(e) =>
295298
formatRateOfReturn(e.rateOfReturn)

‎app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.test.tsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import PerpsTradingCampaignLeaderboard, {
44
PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS,
55
} from './PerpsTradingCampaignLeaderboard';
66
import type { PerpsTradingCampaignLeaderboardEntry } from '../../../../../core/Engine/controllers/rewards-controller/types';
7+
import { PERPS_TRADING_MAX_WINNERS } from '../../utils/perpsCampaignConstants';
78

89
jest.mock('@metamask/design-system-react-native', () => {
910
const actual = jest.requireActual('@metamask/design-system-react-native');
@@ -50,6 +51,7 @@ jest.mock('../../../../../constants/navigation/Routes', () => ({
5051
}));
5152

5253
const TEST_IDS = PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS;
54+
const CrownIcon = 'CrownIcon' as unknown as React.ComponentType;
5355

5456
const createPerpsEntry = (
5557
overrides: Partial<PerpsTradingCampaignLeaderboardEntry> = {},
@@ -107,6 +109,40 @@ describe('PerpsTradingCampaignLeaderboard', () => {
107109
);
108110
});
109111

112+
it('shows crown in full view for perps winner ranks only', () => {
113+
const entries = [
114+
createPerpsEntry({
115+
rank: PERPS_TRADING_MAX_WINNERS,
116+
referralCode: 'WINNER',
117+
}),
118+
createPerpsEntry({
119+
rank: PERPS_TRADING_MAX_WINNERS + 1,
120+
referralCode: 'NEXT',
121+
}),
122+
];
123+
const { UNSAFE_queryAllByType } = render(
124+
<PerpsTradingCampaignLeaderboard {...defaultProps} entries={entries} />,
125+
);
126+
127+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(1);
128+
});
129+
130+
it('hides crown in preview mode for perps winner ranks', () => {
131+
const entries = [
132+
createPerpsEntry({ rank: 1, referralCode: 'AAA111' }),
133+
createPerpsEntry({ rank: 2, referralCode: 'BBB222' }),
134+
];
135+
const { UNSAFE_queryAllByType } = render(
136+
<PerpsTradingCampaignLeaderboard
137+
{...defaultProps}
138+
entries={entries}
139+
maxEntries={entries.length}
140+
/>,
141+
);
142+
143+
expect(UNSAFE_queryAllByType(CrownIcon)).toHaveLength(0);
144+
});
145+
110146
describe('split view top count (preview vs full, ranks 21–22 vs other)', () => {
111147
const tenEntries = Array.from({ length: 10 }, (_, i) =>
112148
createPerpsEntry({

‎app/components/UI/Rewards/components/Campaigns/PerpsTradingCampaignLeaderboard.tsx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ import {
1717
CAMPAIGN_LEADERBOARD_SHARED_TEST_IDS,
1818
} from './CampaignLeaderboard';
1919
import Routes from '../../../../../constants/navigation/Routes';
20-
import { HYPERTRACKER_ATTRIBUTION_URL } from '../../utils/perpsCampaignConstants';
20+
import {
21+
HYPERTRACKER_ATTRIBUTION_URL,
22+
PERPS_TRADING_MAX_WINNERS,
23+
} from '../../utils/perpsCampaignConstants';
2124

2225
export const PERPS_CAMPAIGN_LEADERBOARD_TEST_IDS = {
2326
CONTAINER: 'perps-campaign-leaderboard-container',
@@ -191,7 +194,7 @@ const PerpsTradingCampaignLeaderboard: React.FC<
191194
key={`${entry.rank}-${entry.referralCode}`}
192195
entry={entry}
193196
isCurrentUser={isCurrentUser(entry)}
194-
showCrown={!isPreview}
197+
showCrown={!isPreview && entry.rank <= PERPS_TRADING_MAX_WINNERS}
195198
isCampaignComplete={isCampaignComplete}
196199
formatPrimaryMetric={(e) => formatSignedUsd(e.pnl)}
197200
isPositivePrimaryMetric={(e) => e.pnl >= 0}
@@ -205,7 +208,9 @@ const PerpsTradingCampaignLeaderboard: React.FC<
205208
key={`neighbor-${entry.rank}-${entry.referralCode}`}
206209
entry={entry}
207210
isCurrentUser={isCurrentUser(entry)}
208-
showCrown={!isPreview}
211+
showCrown={
212+
!isPreview && entry.rank <= PERPS_TRADING_MAX_WINNERS
213+
}
209214
isCampaignComplete={isCampaignComplete}
210215
formatPrimaryMetric={(e) => formatSignedUsd(e.pnl)}
211216
isPositivePrimaryMetric={(e) => e.pnl >= 0}

0 commit comments

Comments
 (0)