Skip to content

Commit 2455a12

Browse files
authored
Merge branch 'main' into jongsun/build/251103-enable-react-compiler
2 parents dda7ecb + 54b2394 commit 2455a12

File tree

249 files changed

+16361
-6320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+16361
-6320
lines changed

.github/workflows/check-pr-max-lines.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ permissions:
1717

1818
jobs:
1919
check-pr-max-lines:
20-
uses: metamask/github-tools/.github/workflows/pr-line-check.yml@main
21-
with:
22-
max_lines: 1000
23-
ignore_patterns: '(\.lock|\.snap|lavamoat\/.*policy\.json)$'
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Check PR lines changed
23+
uses: MetaMask/github-tools/.github/actions/pr-line-check@v1
24+
with:
25+
max-lines: '1000'
26+
ignore-patterns: '(\.lock|\.snap|lavamoat\/.*policy\.json)$'

.github/workflows/flaky-test-report.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@ on:
44
schedule:
55
# Once every day from Monday-Friday at 08:00 UTC
66
- cron: 0 8 * * 1-5
7+
workflow_dispatch:
78

89
permissions:
910
contents: read
1011
actions: read
1112

1213
jobs:
1314
flaky-test-report:
14-
uses: MetaMask/github-tools/.github/workflows/flaky-test-report.yml@main
15-
with:
16-
repository: ${{ github.event.repository.name }}
17-
workflow_id: main.yml
18-
secrets:
19-
github-token: ${{ secrets.GITHUB_TOKEN }}
20-
slack-webhook-flaky-tests: ${{ secrets.SLACK_WEBHOOK_FLAKY_TESTS }}
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Generate flaky test report
18+
uses: MetaMask/github-tools/.github/actions/flaky-test-report@v1
19+
with:
20+
repository: ${{ github.event.repository.name }}
21+
workflow-id: main.yml
22+
github-token: ${{ secrets.GITHUB_TOKEN }}
23+
slack-webhook-flaky-tests: ${{ secrets.SLACK_WEBHOOK_FLAKY_TESTS }}

.github/workflows/post-merge-validation.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ name: Post Merge Validation
33
on:
44
schedule:
55
- cron: '0 7 * * *'
6+
workflow_dispatch:
67

78
jobs:
89
post-merge-validation-tracker:
9-
uses: MetaMask/github-tools/.github/workflows/post-merge-validation.yml@main
10-
with:
11-
repo: ${{ github.repository }}
12-
start_hour_utc: 7
13-
secrets:
14-
github-token: ${{ secrets.GITHUB_TOKEN }}
15-
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Run post-merge validation
13+
uses: MetaMask/github-tools/.github/actions/post-merge-validation@v1
14+
with:
15+
repo: ${{ github.repository }}
16+
start-hour-utc: '7'
17+
github-token: ${{ secrets.GITHUB_TOKEN }}
18+
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/dist/token-prices-service/codefi-v2.cjs b/dist/token-prices-service/codefi-v2.cjs
2+
index 34f7bcf4dea1b8d6a1ea45051be09059d9d35353..6aa82360e63727852cda1719f5e893508b764e75 100644
3+
--- a/dist/token-prices-service/codefi-v2.cjs
4+
+++ b/dist/token-prices-service/codefi-v2.cjs
5+
@@ -98,6 +98,8 @@ exports.SUPPORTED_CURRENCIES = [
6+
'mxn',
7+
// Malaysian Ringgit
8+
'myr',
9+
+ // Monad
10+
+ 'mon',
11+
// Nigerian Naira
12+
'ngn',
13+
// Norwegian Krone

.yarnrc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ npmAuditIgnoreAdvisories:
3131
# URL: https://github.com/advisories/GHSA-5j98-mcp5-4vw2
3232
- 1109809
3333

34+
# Issue: `body-parser` denial of service vulnerability
35+
# Seemingly only impacts v2.2.0, but we're on v1. The advisory range is overly wide.
36+
# The attack vector also does not apply to how we use the package.
37+
# URL: https://github.com/advisories/GHSA-wqch-xfxh-vrr4
38+
- 1110857
39+
3440
### Package Deprecations:
3541

3642
# React-tippy brings in popper.js and react-tippy has not been updated in

CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [13.10.3]
11+
12+
### Fixed
13+
14+
- Feature flags sidepanel context menu (#38220)
15+
16+
## [13.10.2]
17+
18+
### Fixed
19+
20+
- Fixes entry modal closed error (#38188)
21+
22+
## [13.10.1]
23+
24+
### Fixed
25+
26+
- Prevents token list from fetching balances for all accounts (#38065)
27+
- Fixes dapp-swap comparison fiat rate fetching for native tokens (#37980)
28+
- Fixes dapp-swap fix conversion rate for pol native token (#38102)
29+
- Removes unnecessary extension permission (#38075)
30+
- Fixes missing native token balances in wallet balance (#38126)
31+
1032
## [13.10.0]
1133

1234
### Added
@@ -1217,7 +1239,10 @@ authorized by the user.` error until the user fully revoked dapp
12171239
- This changelog was split off with 12.22.0
12181240
- All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
12191241

1220-
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.0...HEAD
1242+
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...HEAD
1243+
[13.10.3]: https://github.com/MetaMask/metamask-extension/compare/v13.10.2...v13.10.3
1244+
[13.10.2]: https://github.com/MetaMask/metamask-extension/compare/v13.10.1...v13.10.2
1245+
[13.10.1]: https://github.com/MetaMask/metamask-extension/compare/v13.10.0...v13.10.1
12211246
[13.10.0]: https://github.com/MetaMask/metamask-extension/compare/v13.9.0...v13.10.0
12221247
[13.9.0]: https://github.com/MetaMask/metamask-extension/compare/v13.8.0...v13.9.0
12231248
[13.8.0]: https://github.com/MetaMask/metamask-extension/compare/v13.7.0...v13.8.0

0 commit comments

Comments
 (0)