Skip to content

chore: cherry-pick #9206#9210

Merged
sethkfman merged 1 commit intorelease/7.20.0from
chore/cherry-pick-9260
Apr 11, 2024
Merged

chore: cherry-pick #9206#9210
sethkfman merged 1 commit intorelease/7.20.0from
chore/cherry-pick-9260

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 11, 2024

This PR cherry-picks #9206

#9206)

## **Description**

This PR fixes this issue
#9196.
Patch created considering this open PR on core
MetaMask/core#4143

When a user imports an account with Nfts then switches back and forth
betwen two accounts, at some point he will see nfts from one account
appear on another.

Link to core branch for the patch :
https://github.com/MetaMask/core/compare/patch/mobile-assets-controllers-v-12-0-0...patch/mobile-assets-controllers-v-12-0-0-nft-bug?expand=1


## **Related issues**

Fixes: #9196.
Core PR: MetaMask/core#4143

## **Manual testing steps**

1. Open app
2. Import an account that has nfts (use for example orangefox.eth)
3. Create a new account (You can either create a new account which will
be empty or use any account that you already have)
4. Switch back and forth between orangefox.eth and another account fast
and you will see nfts from orangefox.eth that appear on the other
account. (This should not happen on this PR)

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->


https://github.com/MetaMask/metamask-mobile/assets/10994169/611bd2c5-b005-48ed-9926-6d72ff244816


### **After**

<!-- [screenshots/recordings] -->
Switching back and forth between accounts


https://github.com/MetaMask/metamask-mobile/assets/10994169/5c00c78d-f3f2-4080-b441-eaf9828aec13


## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] 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](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **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.

---------

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
@sethkfman sethkfman marked this pull request as ready for review April 11, 2024 20:08
@sethkfman sethkfman requested a review from a team April 11, 2024 20:08
@sethkfman sethkfman requested a review from a team as a code owner April 11, 2024 20:08
@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Apr 11, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 31dff7f
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/cc6fbc92-275a-4551-86ad-82586f8fe683

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 Markdown
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

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

LGTM

@sethkfman sethkfman merged commit 102b6d2 into release/7.20.0 Apr 11, 2024
@sethkfman sethkfman deleted the chore/cherry-pick-9260 branch April 11, 2024 20:43
@github-actions github-actions bot locked and limited conversation to collaborators Apr 11, 2024
@metamaskbot metamaskbot added the release-7.20.0 Issue or pull request that will be included in release 7.20.0 label Apr 11, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-7.20.0 on PR, as PR was cherry-picked in branch 7.20.0.

@gauthierpetetin
Copy link
Copy Markdown
Contributor

Hi @sethkfman , I'm curious to understand what generates the first description of this PR:

This PR cherry-picks #9260
Screenshot 2024-04-12 at 07 15 26

It mentions #9260 which currently doesn't exist, while it seems it was meant to be #9206

@sethkfman sethkfman changed the title chore: cherry-pick #9260 chore: cherry-pick #9206 Apr 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.20.0 Issue or pull request that will be included in release 7.20.0 team-assets

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants