Merged
Conversation
PR SummaryFixed multiple issues related to child account management and arithmetic operations. Improved child account caching by replacing custom cache class with ArrayList, added null safety checks in NFT movement dialog, and prevented division by zero in amount conversion. Also bumped app version to r2.8.4. Changes
autogenerated by presubmit.ai |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
🚨 Pull request needs attention.
Review Summary
Files Processed (4)
- app/src/main/java/com/flowfoundation/wallet/manager/childaccount/ChildAccountList.kt (4 hunks)
- app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt (1 hunk)
- app/src/main/java/com/flowfoundation/wallet/page/send/transaction/subpage/amount/presenter/SendAmountPresenter.kt (1 hunk)
- gradle.properties (1 hunk)
Actionable Comments (2)
-
app/src/main/java/com/flowfoundation/wallet/page/nft/move/MoveNFTDialog.kt [126-130]
possible bug: "Potential null pointer exception in list access"
-
app/src/main/java/com/flowfoundation/wallet/page/send/transaction/subpage/amount/presenter/SendAmountPresenter.kt [261-263]
possible issue: "Potential division by zero error"
Skipped Comments (0)
lmcmz
approved these changes
Apr 30, 2025
lealobanov
added a commit
that referenced
this pull request
Dec 17, 2025
Restore the Android native implementations for recovery/restore screen entry points that were lost during the refactoring from monolithic NativeFRWBridge to handler-based architecture. ## Changes ### NativeScreen.kt - Add missing restore screen enum values: - RECOVERY_PHRASE_RESTORE - KEY_STORE_RESTORE - PRIVATE_KEY_RESTORE - GOOGLE_DRIVE_RESTORE - ICLOUD_RESTORE - MULTI_RESTORE ### UIBridgeHandler.kt - Add imports for restore activities - Add handlers for all 6 restore screen types - Map each screen to appropriate Android Activity: - RECOVERY_PHRASE_RESTORE → RestoreMnemonicActivity - KEY_STORE_RESTORE → KeyStoreRestoreActivity (key store mode) - PRIVATE_KEY_RESTORE → KeyStoreRestoreActivity (private key mode) - GOOGLE_DRIVE_RESTORE → MultiRestoreActivity - ICLOUD_RESTORE → MultiRestoreActivity (Android fallback) - MULTI_RESTORE → MultiRestoreActivity ## Context These implementations existed in commit ec2fb17 but were lost during the architectural refactoring to handler-based pattern (commit cbb91ac). This fix restores the functionality in the new architecture. Closes #900
5 tasks
lealobanov
added a commit
that referenced
this pull request
Dec 17, 2025
Restore the Android native implementations for recovery/restore screen entry points that were lost during the refactoring from monolithic NativeFRWBridge to handler-based architecture. ## Changes ### NativeScreen.kt - Add missing restore screen enum values: - RECOVERY_PHRASE_RESTORE - KEY_STORE_RESTORE - PRIVATE_KEY_RESTORE - GOOGLE_DRIVE_RESTORE - ICLOUD_RESTORE - MULTI_RESTORE ### UIBridgeHandler.kt - Add imports for restore activities - Add handlers for all 6 restore screen types - Map each screen to appropriate Android Activity: - RECOVERY_PHRASE_RESTORE → RestoreMnemonicActivity - KEY_STORE_RESTORE → KeyStoreRestoreActivity (key store mode) - PRIVATE_KEY_RESTORE → KeyStoreRestoreActivity (private key mode) - GOOGLE_DRIVE_RESTORE → MultiRestoreActivity - ICLOUD_RESTORE → MultiRestoreActivity (Android fallback) - MULTI_RESTORE → MultiRestoreActivity ## Context These implementations existed in commit ec2fb17 but were lost during the architectural refactoring to handler-based pattern (commit cbb91ac). This fix restores the functionality in the new architecture. Closes #900
lealobanov
added a commit
that referenced
this pull request
Dec 17, 2025
* fix(android): re-implement missing native recovery screen entry points Restore the Android native implementations for recovery/restore screen entry points that were lost during the refactoring from monolithic NativeFRWBridge to handler-based architecture. ## Changes ### NativeScreen.kt - Add missing restore screen enum values: - RECOVERY_PHRASE_RESTORE - KEY_STORE_RESTORE - PRIVATE_KEY_RESTORE - GOOGLE_DRIVE_RESTORE - ICLOUD_RESTORE - MULTI_RESTORE ### UIBridgeHandler.kt - Add imports for restore activities - Add handlers for all 6 restore screen types - Map each screen to appropriate Android Activity: - RECOVERY_PHRASE_RESTORE → RestoreMnemonicActivity - KEY_STORE_RESTORE → KeyStoreRestoreActivity (key store mode) - PRIVATE_KEY_RESTORE → KeyStoreRestoreActivity (private key mode) - GOOGLE_DRIVE_RESTORE → MultiRestoreActivity - ICLOUD_RESTORE → MultiRestoreActivity (Android fallback) - MULTI_RESTORE → MultiRestoreActivity ## Context These implementations existed in commit ec2fb17 but were lost during the architectural refactoring to handler-based pattern (commit cbb91ac). This fix restores the functionality in the new architecture. Closes #900 * fix(android): re-implement missing native recovery screen entry points Restore the Android native implementations for recovery/restore screen entry points that were lost during the refactoring from monolithic NativeFRWBridge to handler-based architecture. ## Changes ### NativeScreen.kt - Add missing restore screen enum values: - RECOVERY_PHRASE_RESTORE - KEY_STORE_RESTORE - PRIVATE_KEY_RESTORE - GOOGLE_DRIVE_RESTORE - ICLOUD_RESTORE - MULTI_RESTORE ### UIBridgeHandler.kt - Add imports for restore activities - Add handlers for all 6 restore screen types - Map each screen to appropriate Android Activity: - RECOVERY_PHRASE_RESTORE → RestoreMnemonicActivity - KEY_STORE_RESTORE → KeyStoreRestoreActivity (key store mode) - PRIVATE_KEY_RESTORE → KeyStoreRestoreActivity (private key mode) - GOOGLE_DRIVE_RESTORE → MultiRestoreActivity - ICLOUD_RESTORE → MultiRestoreActivity (Android fallback) - MULTI_RESTORE → MultiRestoreActivity ## Context These implementations existed in commit ec2fb17 but were lost during the architectural refactoring to handler-based pattern (commit cbb91ac). This fix restores the functionality in the new architecture. Closes #900 * refactor(android): remove ICLOUD_RESTORE handler (iOS-only feature) Remove ICLOUD_RESTORE from Android native code since: - iCloud button is only shown on iOS (Platform.OS === 'ios') - Handler is unreachable on Android - Keeps Android code clean and platform-specific Changes: - Remove ICLOUD_RESTORE from NativeScreen enum - Remove ICLOUD_RESTORE handler from UIBridgeHandler
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related Issue
Closes #880 #493
Summary of Changes
Need Regression Testing
Risk Assessment
Additional Notes
Screenshots (if applicable)