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 coin to token before looking up token->coin when fetching SimpleHash NFTs (uplift to 1.69.x) #25171

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Add coin to token before looking up token->coin when fetching SimpleHash NFTs (uplift to 1.69.x) #25171

merged 2 commits into from
Aug 21, 2024

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 16, 2024 •
edited by kjozwiak
Loading

Uplift of #25154
Uplift of #25207
Resolves brave/brave-browser#40489

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team as a code owner August 16, 2024 19:54
@brave-builds brave-builds added this to the 1.69.x - Release milestone Aug 16, 2024
@brave-builds brave-builds self-assigned this Aug 16, 2024
@nvonpentz
Add migration to correct spl_token_program for SPL NFTs (#25207)
afda070 
* Add migration to correct spl_token_program for SPL NFTs
kjozwiak
kjozwiak approved these changes Aug 21, 2024
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.69.x approved 👍 QA has verified the PR on Nightly using 1.71.x as per the following #25207 (comment).

@kjozwiak kjozwiak merged commit aa86596 into 1.69.x Aug 21, 2024
14 checks passed
@kjozwiak kjozwiak deleted the pr25154_spl-nft-fix_1.69.x branch August 21, 2024 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Milestone
1.69.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@brave-builds @kjozwiak @nvonpentz