Skip to content

Merge r2.8.5 from develop to master#1066

Merged
jaymengxy merged 5 commits intomasterfrom
develop
May 15, 2025
Merged

Merge r2.8.5 from develop to master#1066
jaymengxy merged 5 commits intomasterfrom
develop

Conversation

@jaymengxy
Copy link
Copy Markdown
Contributor

Related Issue

Closes #???

Summary of Changes

Need Regression Testing

  • Yes
  • No

Risk Assessment

  • Low
  • Medium
  • High

Additional Notes

Screenshots (if applicable)

@jaymengxy jaymengxy added this to the Release 2.8.5 milestone May 14, 2025
@jaymengxy jaymengxy requested a review from a team as a code owner May 14, 2025 23:48
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 14, 2025

PR Summary

Enhanced the NFT bridge functionality by simplifying EVM address checks and improved token security information display. Removed conditional EVM bridge checks and updated token contract verification links to support both Flow and EVM tokens.

Changes

File Summary
app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt Removed canBridgeToEVM() conditional checks and simplified EVM address handling in NFT transfer dialog. Always adds EVM address to address list and sets move fee accordingly. Streamlined NFT movement logic for both regular and child NFTs.
app/src/main/java/com/flowfoundation/wallet/page/token/detail/presenter/TokenDetailPresenter.kt Updated token verification display to show security info for all accounts. Added smart contract link routing based on token type - Flow tokens redirect to flowscan.io while EVM tokens redirect to evm.flowscan.io.

autogenerated by presubmit.ai

Copy link
Copy Markdown

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

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

🚨 Pull request needs attention.

Review Summary

Commits Considered (5)
  • 29accef: Merge pull request #1064 from onflow/move_nft_check

feat: move nft evm address check

  • 78f260c: feat: move nft evm address check
  • 03f0569: Merge pull request #1060 from onflow/fix_token_security_info

Fix token security info

  • c675712: fix: evm flow token info
  • e6b7287: fix: evm token security info
Files Processed (2)
  • app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt (4 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/token/detail/presenter/TokenDetailPresenter.kt (2 hunks)
Actionable Comments (2)
  • app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt [95-96]

    possible issue: "Potential unhandled null case in address list modification"

  • app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt [119-122]

    possible bug: "Potential null reference when handling EVM address"

Skipped Comments (1)
  • app/src/main/java/com/flowfoundation/wallet/page/token/detail/presenter/TokenDetailPresenter.kt [138-143]

    best practice: "Missing error handling for browser navigation"

@jaymengxy jaymengxy merged commit b40754e into master May 15, 2025
5 checks passed
@github-actions github-actions Bot mentioned this pull request May 28, 2025
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants