chore: Cherry pick #7540

[sethkfman]

Description

Release cherry-pick #7540

[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.

[codecov-commenter]

Codecov Report

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

Comparison is base (60a3af2) 34.72% compared to head (55c7a6a) 34.69%.

Additional details and impacted files

@@                Coverage Diff                 @@
##           release/7.10.0    #7580      +/-   ##
==================================================
- Coverage           34.72%   34.69%   -0.04%     
==================================================
  Files                1022     1020       -2     
  Lines               27279    27249      -30     
  Branches             2232     2228       -4     
==================================================
- Hits                 9472     9453      -19     
+ Misses              17309    17301       -8     
+ Partials              498      495       -3     

Files	Coverage Δ
app/constants/error.ts	100.00% <100.00%> (ø)
app/core/RPCMethods/index.js	100.00% <ø> (ø)
app/core/RPCMethods/RPCMethodMiddleware.ts	46.06% <0.00%> (ø)
app/core/RPCMethods/wallet_watchAsset.ts	82.60% <82.60%> (ø)
app/components/UI/AddCustomToken/index.js	30.90% <22.22%> (ø)

... and 12 files with indirect coverage changes

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

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

60.7% Coverage
0.0% Duplication

[chrisleewilcox]

LGTM