Skip to content

Commit e946bec

Browse files
authored
Merge branch 'main' into n3ps/sandbox8
2 parents 352687b + 54fd624 commit e946bec

File tree

505 files changed

+6224
-3623
lines changed

Some content is hidden

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

505 files changed

+6224
-3623
lines changed

.depcheckrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ignores:
88
- '@lavamoat/webpack'
99
- '@lavamoat/allow-scripts'
1010
- '@babel/runtime'
11+
- 'react-compiler-runtime'
1112
- '@fortawesome/fontawesome-free'
1213
- 'punycode'
1314
# injected via build system
@@ -83,6 +84,7 @@ ignores:
8384
- 'core-js-pure' # polyfills
8485
# babel
8586
- '@babel/plugin-transform-logical-assignment-operators'
87+
- 'babel-plugin-react-compiler'
8688
# used in image optimization script
8789
- 'sharp'
8890
# trezor

.eslintrc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,9 @@ module.exports = {
320320
jsx: true,
321321
},
322322
},
323-
plugins: ['react'],
323+
plugins: ['react', 'react-compiler'],
324324
rules: {
325+
'react-compiler/react-compiler': 'error',
325326
'react/no-unused-prop-types': 'error',
326327
'react/no-unused-state': 'error',
327328
'react/jsx-boolean-value': 'error',
@@ -362,8 +363,9 @@ module.exports = {
362363
jsx: true,
363364
},
364365
},
365-
plugins: ['react'],
366+
plugins: ['react', 'react-compiler'],
366367
rules: {
368+
'react-compiler/react-compiler': 'error',
367369
'react/no-unused-prop-types': 'warn',
368370
'react/no-unused-state': 'warn',
369371
'react/jsx-boolean-value': 'off',

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,12 @@ jobs:
587587
588588
# Check E2E jobs only if they should have run
589589
if [[ "${{ needs.needs-e2e.outputs.needs-e2e }}" == "true" ]]; then
590-
if [[ "${{ needs.e2e-chrome.result }}" == "failure" ]]; then
591-
echo "E2E Chrome tests failed"
590+
if [[ "${{ needs.e2e-chrome.result }}" != "success" ]]; then
591+
echo "E2E Chrome tests did not succeed (result: ${{ needs.e2e-chrome.result }})"
592592
exit 1
593593
fi
594-
if [[ "${{ needs.e2e-firefox.result }}" == "failure" ]]; then
595-
echo "E2E Firefox tests failed"
594+
if [[ "${{ needs.e2e-firefox.result }}" != "success" ]]; then
595+
echo "E2E Firefox tests did not succeed (result: ${{ needs.e2e-firefox.result }})"
596596
exit 1
597597
fi
598598
fi

CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [13.10.4]
11+
12+
### Fixed
13+
14+
- Signed deep links with empty `sig_params` with extra params as valid (#38142)
15+
- Adds mon as currency to fetch prices (#38261)
16+
- Removes sidepanel from chrome manifest files (#38242)
17+
1018
## [13.10.3]
1119

1220
### Fixed
@@ -1239,7 +1247,8 @@ authorized by the user.` error until the user fully revoked dapp
12391247
- This changelog was split off with 12.22.0
12401248
- All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
12411249

1242-
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...HEAD
1250+
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.10.4...HEAD
1251+
[13.10.4]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...v13.10.4
12431252
[13.10.3]: https://github.com/MetaMask/metamask-extension/compare/v13.10.2...v13.10.3
12441253
[13.10.2]: https://github.com/MetaMask/metamask-extension/compare/v13.10.1...v13.10.2
12451254
[13.10.1]: https://github.com/MetaMask/metamask-extension/compare/v13.10.0...v13.10.1

app/_locales/de/messages.json

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/el/messages.json

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/en/messages.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/en_GB/messages.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/es/messages.json

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/fr/messages.json

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)