Skip to content

Commit 666c4df

Browse files
authored
Merge branch 'main' into chore/add-tracing-for-hide-token
2 parents 366035f + f167e26 commit 666c4df

File tree

479 files changed

+4798
-3339
lines changed

Some content is hidden

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

479 files changed

+4798
-3339
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

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: 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_GB/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/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.

app/_locales/ga/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)