Skip to content

Commit 9269693

Browse files
Merge branch 'main' of github.com:MetaMask/metamask-mobile into ASSETS-1260/notification-account-settings-bip-44-components
2 parents b8f76b4 + 342c321 commit 9269693

File tree

325 files changed

+16816
-6762
lines changed

Some content is hidden

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

325 files changed

+16816
-6762
lines changed

.detoxrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ module.exports = {
2525
},
2626
jest: {
2727
setupTimeout: 220000,
28+
teardownTimeout: 60000, // Increase teardown timeout from default 30s to 60s
2829
},
2930
retries: 1,
3031
},

.github/actionlint.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ self-hosted-runner:
44
- "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl"
55
- "gha-mmsdk-scale-set-ubuntu-22.04-amd64-large"
66
- "gha-mm-scale-set-ubuntu-22.04-amd64-large"
7+
- "gha-mm-scale-set-ubuntu-22.04-amd64-small"
8+
- "gha-mm-scale-set-ubuntu-22.04-amd64-med"
79
- "macos-15"
810
- "ghcr.io/cirruslabs/macos-runner:sequoia"
911
- "ghcr.io/cirruslabs/macos-runner:sequoia-xl"

.github/guidelines/LABELING_GUIDELINES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The check can be bypassed when necessary, either by setting the changelog entry
1717

1818
## Optional labels (manual addition)
1919

20-
Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
20+
Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
2121

2222
### Run iOS E2E tests
2323

0 commit comments

Comments
 (0)