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.

Sign up for GitHub

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

Jump to bottom

Add test for NFT added via wallet_watchAsset #1415

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Add test for NFT added via wallet_watchAsset #1415

merged 1 commit into from
Jun 8, 2023

Conversation

adonesky1
Copy link
Contributor

@adonesky1 adonesky1 commented Jun 5, 2023 •
edited
Loading

Added

  • a test to ensure that nfts are added to correct account/chainId when the user changes account/chain before accepting the pending request

@adonesky1 adonesky1 requested a review from a team as a code owner June 5, 2023 21:50
@adonesky1 adonesky1 force-pushed the fix-watch-nft-edge-case branch 3 times, most recently from 60e3c3d to 85f9838 Compare June 6, 2023 22:13
adonesky1
adonesky1 commented Jun 6, 2023
View reviewed changes
packages/approval-controller/src/ApprovalController.ts
Comment on lines +206 to +207
string,
string
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mcmire helped me with getting the messenger working in the new NFTController test added here, and we found that this change was required for typescript to be happy with this line

@adonesky1 adonesky1 force-pushed the fix-watch-nft-edge-case branch 2 times, most recently from a1c8780 to 9005f7d Compare June 7, 2023 16:07
@adonesky1 adonesky1 changed the base branch from main to decouple-detection-param June 7, 2023 21:03
@adonesky1 adonesky1 changed the title fix wallet_watchAsset NFT support edge case Add test for NFT added via wallet_watchAsset Jun 7, 2023
@adonesky1 adonesky1 mentioned this pull request Jun 7, 2023
Merged
mcmire
mcmire approved these changes Jun 7, 2023
View reviewed changes
Copy link
Contributor

@mcmire mcmire left a comment

Choose a reason for hiding this comment

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

Looks better, thanks!

@adonesky1 adonesky1 merged commit f6dec32 into decouple-detection-param Jun 8, 2023
@adonesky1 adonesky1 deleted the fix-watch-nft-edge-case branch June 8, 2023 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jiexi jiexi jiexi left review comments

@mcmire mcmire mcmire approved these changes

@shanejonas shanejonas Awaiting requested review from shanejonas

@BelfordZ BelfordZ Awaiting requested review from BelfordZ

@Gudahtt Gudahtt Awaiting requested review from Gudahtt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adonesky1 @mcmire @jiexi