chore: resolve conflicts for ws audit

sethkfman commented 3 months ago

Description

Cherry-pick

Fixes:

[ ] I’ve followed MetaMask Contributor Docs and MetaMask Mobile 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.

github-actions[bot] commented 3 months ago

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.

socket-security[bot] commented 3 months ago

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/socket.io-client@4.7.5	Transitive: filesystem, network, shell	`+6`	2.95 MB	darrachequesne
npm/ws@7.5.10	network	`+1`	867 kB	lpinca

🚮 Removed packages: npm/@metamask/metamask-eth-abis@3.0.0, npm/socket.io-client@4.6.1, npm/ws@7.4.6

metamaskbot commented 3 months ago

No release label on PR. Adding release label release-7.24.4 on PR, as PR was added to branch 7.24.4 when release was cut.