Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Only aggregate PortfolioBalance if on Popular Network #12961

Merged
merged 5 commits into from
Jan 14, 2025

Conversation

gambinish
Copy link
Contributor

@gambinish gambinish commented Jan 13, 2025

Description

Similar to extension, we only want to show the cross chain aggregated balance if the selected network is a popular network, and the "Popular networks" filter is enabled.

If we are on a custom network, we only want to show the aggregated balance for that chain, similar to how we handle testnets.

Related issues

Fixes: #12922

Manual testing steps

  1. Go to app, and add a custom network
  2. Ensure the following:
  • When a popular network is selected in global network selector and "Popular networks" filter is enabled, show aggregate balance across popular networks. When "Current network" filter is enabled, show aggregated balance for that chain.
  • When a non-popular network (aka custom network) is selected in global network selector, only show aggregated balance for that chain.
  1. When testnet is selected in global network selector, show aggregated balance for the testnet only. For this case, make sure "Show conversion on test networks" is toggled on.

Screenshots/Recordings

Before

File (1)

After

Screenshot 2025-01-13 at 10 40 40 AM
Screen.Recording.2025-01-13.at.10.40.57.AM.mov

Pre-merge author checklist

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.

Copy link
Contributor

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.

@gambinish gambinish added release-7.38.0 Issue or pull request that will be included in release 7.38.0 Run Smoke E2E Triggers smoke e2e on Bitrise labels Jan 13, 2025
Copy link
Contributor

github-actions bot commented Jan 13, 2025

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 78e065d
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/bd39bbe0-1ee3-41ce-809e-7c23bc3dcdf3

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

@gambinish gambinish added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Jan 13, 2025
Copy link
Contributor

github-actions bot commented Jan 13, 2025

https://bitrise.io/ Bitrise

🔄🔄🔄 pr_smoke_e2e_pipeline started on Bitrise...🔄🔄🔄

Commit hash: be8774b
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/68b66458-9961-44fb-b763-3425adbd0e31

Note

  • This comment will auto-update when build completes
  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@gambinish gambinish added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Jan 13, 2025
@gambinish gambinish added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Jan 13, 2025
Copy link
Contributor

github-actions bot commented Jan 13, 2025

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 9e94673
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/487fd8a0-fb53-4f09-90ec-ff9db5acbf64

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

@gambinish gambinish marked this pull request as ready for review January 13, 2025 21:30
@gambinish gambinish requested review from a team as code owners January 13, 2025 21:30
@gambinish gambinish added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Jan 13, 2025
Copy link
Contributor

github-actions bot commented Jan 13, 2025

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: ca45f15
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/423a45eb-e6bc-4568-a6cf-e87488b59a4e

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@Unik0rnMaggie
Copy link
Contributor

The fix is working:

fix.works.mov

@Unik0rnMaggie Unik0rnMaggie added the QA Passed A successful QA run through has been done label Jan 14, 2025
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@gambinish gambinish added this pull request to the merge queue Jan 14, 2025
Merged via the queue into main with commit a4650ba Jan 14, 2025
43 checks passed
@gambinish gambinish deleted the fix/aggregate-only-popular-networks branch January 14, 2025 17:25
@github-actions github-actions bot locked and limited conversation to collaborators Jan 14, 2025
@metamaskbot metamaskbot added the release-7.39.0 Issue or pull request that will be included in release 7.39.0 label Jan 14, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
QA Passed A successful QA run through has been done release-7.38.0 Issue or pull request that will be included in release 7.38.0 release-7.39.0 Issue or pull request that will be included in release 7.39.0 Run Smoke E2E Triggers smoke e2e on Bitrise team-assets
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[Bug]: Incorrect balance for custom networks
6 participants