chore: resolve cherry-pick conflict and added a new migration 29

[sethkfman]

Description

This PR merges 7.16.0 into 7.17.0 the major conflict that occurred was in the migration files. The PR creates a migration file 29 that applies the changes which were in main.

• Migration 28 address bug fix: Fix/1539 patch root file with controller data #8578
• Migration 29 represent the work done here feat: chain id to hexadecimal format #7999

Related issues

Fixes:

Manual testing steps

1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

• I’ve followed MetaMask Coding Standards.
• I've clearly explained what problem this PR is solving and how it is solved.
• I've linked related issues
• I've included manual testing steps
• I've included screenshots/recordings if applicable
• 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 properly set the pull request status:
  • In case it's not yet "ready for review", I've set it to "draft".
  • In case it's "ready for review", I've changed it from "draft" to "non-draft".

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.

[github-actions]

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.

[github-actions]

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/047431f1-6882-4d1e-a174-268e3cead343
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

[codecov-commenter]

Codecov Report

Attention: 52 lines in your changes are missing coverage. Please review.

Comparison is base (162d169) 41.05% compared to head (4130e6e) 41.10%.

Files	Patch %	Lines
app/store/migrations/029.ts	72.50%	9 Missing and 35 partials ⚠️
app/store/migrations/028.ts	72.00%	4 Missing and 3 partials ⚠️
app/util/general/index.js	93.33%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8614      +/-   ##
==========================================
+ Coverage   41.05%   41.10%   +0.05%     
==========================================
  Files        1247     1248       +1     
  Lines       30371    30417      +46     
  Branches     2965     2969       +4     
==========================================
+ Hits        12468    12504      +36     
- Misses      17158    17165       +7     
- Partials      745      748       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[Cal-L]

LGTM

[sonarcloud]

Quality Gate passed

Issues
4 New issues

Measures
0 Security Hotspots
84.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud