chore: Resolve conflicts v12.7.0 with latest master #28468

hjetpoluru · 2024-11-14T19:30:44Z

Description

Resolve conflicts in v12.7.0

I've followed MetaMask Contributor Docs and MetaMask Extension Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

## **Description** Add gas limit fix to changelog. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28410?quickstart=1) ## **Related issues** ## **Manual testing steps** ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

Version v12.6.1 RC

…12.7.0-master

github-actions · 2024-11-14T19:30:56Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

metamaskbot · 2024-11-14T20:32:10Z

Builds ready [a428b7d]

Page Load Metrics (1826 ± 69 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1594	2089	1821	134	64
		domContentLoaded	1584	2040	1792	124	60
		load	1596	2094	1826	143	69
		domInteractive	16	87	50	20	10
		backgroundConnect	9	118	29	28	13
		firstReactRender	46	281	99	48	23
		getState	5	68	22	24	11
		initialActions	0	1	0	0	0
		loadScripts	1137	1536	1318	114	55
		setupStore	11	94	32	25	12
		uiStartup	1798	2453	2048	174	84

Bundle size diffs [🚨 Warning! Bundle size has increased!]

metamaskbot and others added 6 commits November 11, 2024 12:56

Version v12.6.1

91a4ec4

fix (cherry-pick): gas limit estimation (#28327) (#28405)

f2865d1

Merge pull request #28404 from MetaMask/Version-v12.6.1

aa32744

Version v12.6.1 RC

Merge remote-tracking branch 'origin/master' into resolve-conflicts-v…

495eb87

…12.7.0-master

Fixed lint

a428b7d

hjetpoluru added extension-delivery INVALID-PR-TEMPLATE PR's body doesn't match template labels Nov 14, 2024

hjetpoluru self-assigned this Nov 14, 2024

hjetpoluru requested a review from a team as a code owner November 14, 2024 19:30

github-actions bot added the team-extension-platform label Nov 14, 2024

danjm approved these changes Nov 15, 2024

View reviewed changes

danjm merged commit 2ab2215 into Version-v12.7.0 Nov 15, 2024
75 checks passed

danjm deleted the resolve-conflicts-v12.7.0-master branch November 15, 2024 00:52

github-actions bot locked and limited conversation to collaborators Nov 15, 2024