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: filter token activity when clicking on native token #12732

Merged

Conversation

sahar-fehri
Copy link
Contributor

@sahar-fehri sahar-fehri commented Dec 17, 2024

Description

This PR filters out token related activity from activity list when clicking on a native token.

Related issues

Fixes: #6164

Manual testing steps

  1. Create an ERC20 token
  2. Add the new token to your wallet
  3. Send some tokens to another wallet
  4. Send ETH to another account
  5. Click on the native token and scroll down to see activity, you should not see ERC2O related activity
  6. Click on the token; you should see the activity related to token

Screenshots/Recordings

Before

Screen.Recording.2024-12-19.at.14.08.30.mov

After

Screen.Recording.2024-12-19.at.14.04.05.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.

@sahar-fehri sahar-fehri added needs-assets-ux-review A shared label between the Assets and UX team to flag PRs ready for consolidated team review. Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 17, 2024
Copy link
Contributor

github-actions bot commented Dec 17, 2024

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: f04c0f4
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/8f7fcff5-8483-40dd-bf65-a6a50b0cb998

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

@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 17, 2024
@salimtb salimtb added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 18, 2024
Copy link
Contributor

github-actions bot commented Dec 18, 2024

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 709bc8e
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/4a938595-83ff-4abe-8cc1-7b1b57006630

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

@salimtb salimtb added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 18, 2024
Copy link
Contributor

github-actions bot commented Dec 18, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 4d7622b
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/b6ffcd7e-651c-4a2b-b453-9fe8e9cf21ad

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

@sahar-fehri sahar-fehri marked this pull request as ready for review December 19, 2024 09:28
@sahar-fehri sahar-fehri requested review from a team as code owners December 19, 2024 09:28
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 19, 2024
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 19, 2024
Copy link
Contributor

github-actions bot commented Dec 19, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 9d83ffb
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/964e1fcc-ba59-48a8-8370-10c15e43a943

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

Copy link
Contributor

@tommasini tommasini left a comment

Choose a reason for hiding this comment

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

LGTM

@sahar-fehri sahar-fehri added this pull request to the merge queue Dec 19, 2024
Merged via the queue into main with commit 48a86c7 Dec 19, 2024
44 checks passed
@sahar-fehri sahar-fehri deleted the fix/filter-out-token-activity-when-clicking-on-native-token branch December 19, 2024 14:26
@github-actions github-actions bot locked and limited conversation to collaborators Dec 19, 2024
@metamaskbot metamaskbot added the release-7.39.0 Issue or pull request that will be included in release 7.39.0 label Dec 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-assets-ux-review A shared label between the Assets and UX team to flag PRs ready for consolidated team review. 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
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] Token Activity is displayed under Native Token Activity
4 participants