Skip to content

Commit

Permalink
Merge branch 'develop' into feat/improve-notifications-stories
Browse files Browse the repository at this point in the history
  • Loading branch information
matteoscurati authored Oct 16, 2024
2 parents 59d7b22 + 3f69851 commit cf66689
Show file tree
Hide file tree
Showing 155 changed files with 1,522 additions and 7,911 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ module.exports = {
'app/scripts/controllers/metametrics.test.js',
'app/scripts/controllers/permissions/**/*.test.js',
'app/scripts/controllers/preferences-controller.test.ts',
'app/scripts/controllers/account-tracker-controller.test.ts',
'app/scripts/lib/**/*.test.js',
'app/scripts/metamask-controller.test.js',
'app/scripts/migrations/*.test.js',
Expand Down
12 changes: 3 additions & 9 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,9 @@ npmAuditIgnoreAdvisories:
# upon old versions of ethereumjs-utils.
- 'ethereum-cryptography (deprecation)'

# Currently only dependent on deprecated @metamask/types as it is brought in
# by @metamask/keyring-api. Updating the dependency in keyring-api will
# remove this.
- '@metamask/types (deprecation)'

# @metamask/keyring-api also depends on @metamask/snaps-ui which is
# deprecated. Replacing that dependency with @metamask/snaps-sdk will remove
# this.
- '@metamask/snaps-ui (deprecation)'
# Currently in use for the network list drag and drop functionality.
# Maintenance has stopped and the project will be archived in 2025.
- 'react-beautiful-dnd (deprecation)'

npmRegistries:
'https://npm.pkg.github.com':
Expand Down
68 changes: 0 additions & 68 deletions app/_locales/de/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 0 additions & 68 deletions app/_locales/el/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cf66689

Please sign in to comment.