Skip to content

Commit

Permalink
Merge branch 'develop' into transfer-tokens-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
pnarayanaswamy authored Oct 3, 2024
2 parents 771102a + e76a149 commit 75ab876
Show file tree
Hide file tree
Showing 255 changed files with 4,851 additions and 2,277 deletions.
1 change: 1 addition & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- opened
- reopened
- synchronize
merge_group:

jobs:
test-unit:
Expand Down
2 changes: 1 addition & 1 deletion .storybook/test-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ const state = {
welcomeScreenSeen: false,
currentLocale: 'en',
preferences: {
useNativeCurrencyAsPrimaryCurrency: true,
showNativeTokenAsMainBalance: true,
},
incomingTransactionsPreferences: {
[CHAIN_IDS.MAINNET]: true,
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [12.3.1]
### Fixed
- Fix duplicate network validation ([#27463](https://github.com/MetaMask/metamask-extension/pull/27463))
- Fix notification metrics ([#27435](https://github.com/MetaMask/metamask-extension/pull/27435))
- Fix transaction metrics ([#27457](https://github.com/MetaMask/metamask-extension/pull/27457))

## [12.3.0]
### Added
- Added the ability to name accounts during the snap account creation flow ([#25191](https://github.com/MetaMask/metamask-extension/pull/25191))
Expand Down Expand Up @@ -5106,7 +5112,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c
- Added the ability to restore accounts from seed words.


[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.3.1...HEAD
[12.3.1]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...v12.3.1
[12.3.0]: https://github.com/MetaMask/metamask-extension/compare/v12.2.4...v12.3.0
[12.2.4]: https://github.com/MetaMask/metamask-extension/compare/v12.2.3...v12.2.4
[12.2.3]: https://github.com/MetaMask/metamask-extension/compare/v12.2.2...v12.2.3
Expand Down
13 changes: 0 additions & 13 deletions app/_locales/am/messages.json

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

9 changes: 0 additions & 9 deletions app/_locales/ar/messages.json

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

9 changes: 0 additions & 9 deletions app/_locales/bg/messages.json

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

13 changes: 0 additions & 13 deletions app/_locales/bn/messages.json

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

9 changes: 0 additions & 9 deletions app/_locales/ca/messages.json

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

4 changes: 0 additions & 4 deletions app/_locales/cs/messages.json

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

9 changes: 0 additions & 9 deletions app/_locales/da/messages.json

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

16 changes: 0 additions & 16 deletions app/_locales/de/messages.json

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

16 changes: 0 additions & 16 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 75ab876

Please sign in to comment.