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(11895): remove duplicate networks in incoming transactions settings #12016

Merged

Conversation

vinnyhoward
Copy link
Contributor

@vinnyhoward vinnyhoward commented Oct 24, 2024

Description

We now list mainnet networks in the rpcEndpoints so the previous logic rendering mainnet in separate functions are no longer need. Here is the relevant PR that has those changes. The rpcEndpoints do not render in the right order so filtering by Linea Mainnet and Ethereum Mainnet is needed.

Related issues

Related Issue: #11895

Manual testing steps

  1. Go to this settings page
  2. Click on "Security & Privacy"
  3. Scroll down and toggle "Show incoming transactions" and confirm that it works
  4. Confirm that the duplicate mainnet networks are gone

Screenshots/Recordings

test

Before After
Simulator Screenshot - iPhone 16 Pro Max - 2024-10-24 at 13 37 34 incoming_transactions

Before

NA

After

NA

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.

@vinnyhoward vinnyhoward requested a review from a team as a code owner October 24, 2024 19:40
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.

@vinnyhoward vinnyhoward added the Run Smoke E2E Triggers smoke e2e on Bitrise label Oct 24, 2024
Copy link
Contributor

https://bitrise.io/ Bitrise

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

Commit hash: 69cae3b
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/446ee62e-a4c2-4a38-a2c3-0961becdf962

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 24, 2024
Copy link
Contributor

github-actions bot commented Oct 24, 2024

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 4af32bf
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/210b109c-b252-4b05-abe8-e59101ca2229

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 24, 2024
Copy link
Contributor

github-actions bot commented Oct 24, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 6b5b819
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/db92871f-8d5c-4dae-9078-eb24702615bf

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

@chrisleewilcox chrisleewilcox left a comment

Choose a reason for hiding this comment

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

The app security indicates that 'Mainnet' is not the right name. Expected that the default network name matches suggested name and is aligned with security checks. We can get PM input if needed.

screenshot-1729802892586

andreahaku
andreahaku previously approved these changes Oct 25, 2024
Copy link
Contributor

@andreahaku andreahaku left a comment

Choose a reason for hiding this comment

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

LGTM

…uplicate-networks-incoming-transactions-settings
@sethkfman
Copy link
Contributor

@vinnyhoward Can you provide and update on on the naming of the network?

@vinnyhoward
Copy link
Contributor Author

vinnyhoward commented Oct 28, 2024

@sethkfman I think this PR can be merged to unblock release. The issue found by @chrisleewilcox can be fixed in a later PR since things are still functional and the bug found isn't directly related to this fix here. But related to network names as a whole. I've created an issue to track his finding and create a follow up fix for this release or next. What do you think?

@alfeng6
Copy link

alfeng6 commented Oct 28, 2024

Comment from Slack on overall approach:

Let's keep the name from our default RPC URL as the source of truth across our entire application — 'Ethereum Mainnet'. This should be reflected in the network edit modal as well as in the settings page.
Thus, the change should be that Salim will need to update his previous PR to update the "Mainnet" name back to "Ethereum Mainnet", alongside any other chains and their names to match what chainid.network is fetching for MM as a default.

In the future, we can look to allow multiple different names for the same chainid, but for simplicity in the short term, let's stick to a single name from chainid.network.

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

github-actions bot commented Oct 29, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: e36b656
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/50f6c73f-920d-4c53-a222-1f6fde9537cc

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

…ansactions-settings' of github.com:MetaMask/metamask-mobile into fix-duplicate-networks-incoming-transactions-settings
@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

github-actions bot commented Oct 29, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 07c4a7a
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/4922804c-ae9c-41b4-aa82-2202d7c9f1c5

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

https://bitrise.io/ Bitrise

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

Commit hash: 68d8956
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/2ad84e80-92b5-4022-90a1-f44ca927d92c

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

https://bitrise.io/ Bitrise

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

Commit hash: d61d5e3
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/4df27145-8589-49a4-be3c-aef9fe6157b0

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

https://bitrise.io/ Bitrise

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

Commit hash: f35f0d5
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/214caf55-a49f-43a4-b2d1-27d0dc2c3ecc

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

@vinnyhoward vinnyhoward added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 29, 2024
Copy link
Contributor

github-actions bot commented Oct 29, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 68bcc0c
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/372c33cc-d378-4e09-b753-9724aaf9cd9f

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

Copy link
Contributor

@chrisleewilcox chrisleewilcox left a comment

Choose a reason for hiding this comment

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

LGTM

@vinnyhoward vinnyhoward added this pull request to the merge queue Oct 30, 2024
Merged via the queue into main with commit 60bdb96 Oct 30, 2024
42 of 43 checks passed
@vinnyhoward vinnyhoward deleted the fix-duplicate-networks-incoming-transactions-settings branch October 30, 2024 00:22
@github-actions github-actions bot locked and limited conversation to collaborators Oct 30, 2024
@metamaskbot metamaskbot added the release-7.35.0 Issue or pull request that will be included in release 7.35.0 label Oct 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-7.35.0 Issue or pull request that will be included in release 7.35.0 Run Smoke E2E Triggers smoke e2e on Bitrise team-wallet-ux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants