Skip to content
This repository was archived by the owner on Mar 2, 2026. It is now read-only.

Merge from master#1214

Merged
tombeckenham merged 11 commits into
devfrom
master
Jul 24, 2025
Merged

Merge from master#1214
tombeckenham merged 11 commits into
devfrom
master

Conversation

@tombeckenham

Copy link
Copy Markdown
Contributor

Related Issue

Closes #1202
Closes #1206
Closes #1204
Closes #1208

@github-actions

github-actions Bot commented Jul 24, 2025

Copy link
Copy Markdown

PR Summary

Fixed multiple issues including EVM address type handling, NFT movement from child accounts, navigation in profile import/registration flows, and UI improvements. Temporarily disabled NFT movement from child accounts due to missing script functionality. Enhanced wallet loading checks and improved back button behavior across different views.

Changes

File Summary
src/background/controller/provider/controller.ts Enhanced EVM address handling by properly typing evmAddress as string and adding proper null checks for evmAccount. Improved validation flow when requesting and checking EVM addresses.
src/ui/components/PrivateRoute.tsx Added useWalletLoaded hook to ensure wallet is fully loaded before making routing decisions. Enhanced state management by adding wallet loading dependency.
src/ui/components/password/PasswordTextarea.tsx Added right padding to password textarea for better visual alignment and improved text security display handling.
src/ui/views/Linked/LinkedNftDetail.tsx Commented out NFT move button functionality due to missing script implementation. Added TODO comment for future implementation in July 2025.
src/ui/views/NFT/Detail.tsx Simplified child account NFT movement logic by removing async permission check. Added conditional check based on account type and wallet address.
src/ui/views/SortHat.tsx Enhanced view loading logic by adding wallet loaded state check before initializing the view.
src/ui/views/Welcome/Register/index.tsx Enhanced back button visibility logic in registration flow based on navigation history and active tab state.
src/ui/views/Welcome/import-profile/index.tsx Improved back button behavior and navigation logic in profile import flow, considering navigation history and current step.

autogenerated by presubmit.ai

@tombeckenham
tombeckenham requested a review from zzggo July 24, 2025 08:48

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

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 (11)
  • 4838cdd: Merge pull request #1212 from onflow:1208-bug-move-nft-from-child-broken-part2

1208-bug-move-nft-from-child-broken-part2

  • 4eef8fc: Re-enabled move button for main accounts

Closes #1208

  • fd50b70: Now wants til wallet is loaded before redirecting

Closes #1208

  • b21eb9b: Merge pull request #1210 from onflow:1208-bug-move-nft-from-child-broken

1208-bug-move-nft-from-child-broken

  • b493005: Corrected back button on create new profile

Closes #1208

  • 39d72a9: Turn off moving NFT from child until we can redo it

Closes #1208

  • 91c1192: Merge pull request #1207 from onflow:1206-bug-back-button-doesnt-appear-on-import

Fixed back button and seed phrase import padding

  • b98c662: Fixed back button and seed phrase import padding

Closes #1206

  • 12e40fa: Merge pull request #1205 from onflow:1204-bug-error-returning-evmaddress

Corrected type issue getting the evm address when requesting accounts

  • daf7c18: Corrected type issue getting the evm address when requesting accounts

Closes #1204

2.9.1 master

Files Processed (8)
  • src/background/controller/provider/controller.ts (2 hunks)
  • src/ui/components/PrivateRoute.tsx (2 hunks)
  • src/ui/components/password/PasswordTextarea.tsx (1 hunk)
  • src/ui/views/Linked/LinkedNftDetail.tsx (3 hunks)
  • src/ui/views/NFT/Detail.tsx (1 hunk)
  • src/ui/views/SortHat.tsx (2 hunks)
  • src/ui/views/Welcome/Register/index.tsx (3 hunks)
  • src/ui/views/Welcome/import-profile/index.tsx (4 hunks)
Actionable Comments (1)
  • src/ui/views/NFT/Detail.tsx [56-56]

    possible bug: "Potential unhandled edge case in wallet check"

Skipped Comments (2)
  • src/background/controller/provider/controller.ts [248-249]

    enhancement: "Potential error message improvement needed"

  • src/ui/views/Welcome/import-profile/index.tsx [111-119]

    possible issue: "Potential navigation flow issue"

// TB July 2025. This always fails as the script doesn't exist. Turning off for now
// const [canMoveChild, setCanMoveChild] = useState(false);

const canMoveChild = activeAccountType !== 'child' && currentWallet.address;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The condition currentWallet.address might throw if currentWallet is null/undefined. Consider adding a null check: activeAccountType !== 'child' && currentWallet?.address

@tombeckenham
tombeckenham merged commit e33c176 into dev Jul 24, 2025
14 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Move NFT from Child broken [BUG] Back button doesn't appear on import [BUG] Error returning evmAddress

2 participants