Skip to content

[pull] main from MetaMask:main #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 20 commits into from
May 21, 2026
Merged

[pull] main from MetaMask:main #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
afde4b1
chore: delete ci-js-deps artifact after all consumers finish (#30307)
tommasini May 21, 2026
9a2d990
fix: attach AB testing params to whats happening events (#30498)
joaosantos15 May 21, 2026
de8a354
fix: predict claim back dismissal cleanup (#30474)
pedronfigueiredo May 21, 2026
29fe5ed
refactor(analytics): PR E2 rename addTraitsToUser to identify in NFT …
NicolasMassart May 21, 2026
54ee16c
feat(onboarding): add Telegram OAuth login for seedless onboarding (#…
tylerc-consensys May 21, 2026
255c7b9
fix: reject `predictDepositAndOrder` before opening Add Funds flow (#…
OGPoyraz May 21, 2026
2aae66f
chore(predict): Block prediction orders on post-active markets (#30403)
caieu May 21, 2026
b232e73
chore(rewards): VIP view rework (#30479)
sophieqgu May 21, 2026
2114fc0
test: adapt FixureHelper to run with appium and local runs (#29796)
christopherferreira9 May 21, 2026
942b65b
feat: pass getUseAssetsControllerForRates to bridge controller (#30308)
bergarces May 21, 2026
0ab7272
chore: rename follow trade notification clicked event (#30449)
zone-live May 21, 2026
a0f1af8
fix: show fallback token icons in confirmation rows cp-7.78.0 (#30502)
dan437 May 21, 2026
0888744
feat(rewards): add VIP badge and discounted fee display to Bridge and…
michalconsensys May 21, 2026
aec07ab
feat(predict): add world cup section as empty state (#30427)
PatrykLucka May 21, 2026
386f887
feat(predict): improve crypto updown positions and add claim flow (#3…
ghgoodreau May 21, 2026
00b3769
refactor(analytics): PR E4 migrate TradeTabBarItem from useMetrics to…
NicolasMassart May 21, 2026
4416837
test: convert ramps e2e to cv (#30417)
cortisiko May 21, 2026
92435a2
feat: add predictions pagination and view more in explore (#30445)
juanmigdr May 21, 2026
8c73d92
refactor(perps): migrate perps modal routes to native stack (#30486)
weitingsun May 21, 2026
49ec292
feat(money): MUSD-827 Money Home design-review polishes (#30437)
Kureev May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/scripts/known-feature-flag-constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const FILE_SOURCES: Array<{ key: string; file: string; exportName: string }> = [
{ key: 'OTA_UPDATES_FLAG_NAME', file: sel('otaUpdates'), exportName: 'OTA_UPDATES_FLAG_NAME' },
{ key: 'FULL_PAGE_ACCOUNT_LIST_FLAG_NAME', file: sel('fullPageAccountList'), exportName: 'FULL_PAGE_ACCOUNT_LIST_FLAG_NAME' },
{ key: 'IMPORT_SRP_WORD_SUGGESTION_FLAG_NAME', file: sel('importSrpWordSuggestion'), exportName: 'IMPORT_SRP_WORD_SUGGESTION_FLAG_NAME' },
{ key: 'TELEGRAM_LOGIN_ENABLED_FLAG_NAME', file: sel('seedlessTelegramLogin'), exportName: 'TELEGRAM_LOGIN_ENABLED_FLAG_NAME' },
{ key: 'ASSETS_UNIFY_STATE_FLAG', file: sel('assetsUnifyState'), exportName: 'ASSETS_UNIFY_STATE_FLAG' },
{ key: 'BRAZE_BANNER_HOME_FLAG_KEY', file: sel('brazeBannerHome'), exportName: 'BRAZE_BANNER_HOME_FLAG_KEY' },
{ key: 'TOKEN_DETAILS_OHLCV_WS_INTEGRATION_FLAG_KEY', file: sel('tokenDetailsOhlcvWsIntegration'), exportName: 'TOKEN_DETAILS_OHLCV_WS_INTEGRATION_FLAG_KEY' },
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,44 @@ jobs:
fi
fi

# TEMP: delete the ci-js-deps artifact once all consumers have finished so it
# does not sit in GitHub artifact storage for the full retention-days: 1
# window. Every push re-creates this artifact from scratch, so there is never
# a reason to keep it after the run's consumers are done.
# Remove this job together with the upload/download steps once Namespace
# becomes the default runner.
cleanup-ci-js-deps:
name: Delete CI JS deps artifact
runs-on: ubuntu-latest
if: ${{ always() && inputs.runner_provider != 'namespace' }}
needs:
- unit-tests
- component-view-tests
- merge-unit-and-component-view-tests
permissions:
actions: write
steps:
- name: Delete CI JS deps artifact
uses: actions/github-script@v7
with:
script: |
const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: context.runId,
});
const target = artifacts.data.artifacts.find(a => a.name === 'ci-js-deps');
if (target) {
await github.rest.actions.deleteArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: target.id,
});
core.info(`Deleted artifact ci-js-deps (id=${target.id})`);
} else {
core.info('Artifact ci-js-deps not found (already deleted or never created)');
}

check-all-jobs-pass:
name: Check all jobs pass
# Run the aggregate gate even when optional dependencies are skipped.
Expand Down
8 changes: 3 additions & 5 deletions app/component-library/components/Navigation/TradeTabBarItem/TradeTabBarItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ import Text, { TextColor, TextVariant } from '../../Texts/Text';
import { useTailwind } from '@metamask/design-system-twrnc-preset';
import { useNavigation } from '@react-navigation/native';
import Routes from '../../../../constants/navigation/Routes';
import {
MetaMetricsEvents,
useMetrics,
} from '../../../../components/hooks/useMetrics';
import { MetaMetricsEvents } from '../../../../core/Analytics';
import { useAnalytics } from '../../../../components/hooks/useAnalytics/useAnalytics';
import { useSelector } from 'react-redux';
import { selectChainId } from '../../../../selectors/networkController';
import { getDecimalChainId } from '../../../../util/networks';
Expand All @@ -39,7 +37,7 @@ function TradeTabBarItem({ label, ...props }: TradeTabBarItemProps) {
const [buttonLayout, setButtonLayout] = useState<LayoutRectangle>();
const fontScale = useWindowDimensions().fontScale;

const { trackEvent, createEventBuilder } = useMetrics();
const { trackEvent, createEventBuilder } = useAnalytics();

const chainId = useSelector(selectChainId);

Expand Down
112 changes: 77 additions & 35 deletions app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,9 @@ exports[`SnapUIRenderer adds a footer if required 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -208,11 +206,9 @@ exports[`SnapUIRenderer adds a footer if required 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -233,7 +229,17 @@ exports[`SnapUIRenderer adds a footer if required 1`] = `
testID="default-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -1535,11 +1541,9 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -1568,11 +1572,9 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -1593,7 +1595,17 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -1656,11 +1668,9 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -1688,11 +1698,9 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -1714,7 +1722,17 @@ exports[`SnapUIRenderer renders complex nested components 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<View
style={
Expand Down Expand Up @@ -1970,11 +1988,9 @@ exports[`SnapUIRenderer renders footers 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -2003,11 +2019,9 @@ exports[`SnapUIRenderer renders footers 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -2028,7 +2042,17 @@ exports[`SnapUIRenderer renders footers 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -2091,11 +2115,9 @@ exports[`SnapUIRenderer renders footers 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -2123,11 +2145,9 @@ exports[`SnapUIRenderer renders footers 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -2149,7 +2169,17 @@ exports[`SnapUIRenderer renders footers 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<View
style={
Expand Down Expand Up @@ -2952,11 +2982,9 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -2985,11 +3013,9 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
"borderColor": "transparent",
"borderRadius": 12,
"borderWidth": 1,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -3010,7 +3036,17 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<Text
accessibilityRole="text"
Expand Down Expand Up @@ -3073,11 +3109,9 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand Down Expand Up @@ -3105,11 +3139,9 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
"alignSelf": "flex-start",
"backgroundColor": "#131416",
"borderRadius": 12,
"columnGap": 8,
"flexDirection": "row",
"height": 48,
"justifyContent": "center",
"minWidth": 80,
"opacity": 1,
"overflow": "hidden",
"paddingLeft": 16,
Expand All @@ -3131,7 +3163,17 @@ exports[`SnapUIRenderer supports the onCancel prop 1`] = `
testID="undefined-snap-footer-button"
>
<View
style={{}}
style={
[
{
"alignItems": "center",
"display": "flex",
"flexDirection": "row",
"gap": 0,
},
undefined,
]
}
>
<View
style={
Expand Down
Loading
Loading