Skip to content

Merge r2.8.6 with code 295 from develop to master#1118

Merged
jaymengxy merged 52 commits intomasterfrom
develop
May 28, 2025
Merged

Merge r2.8.6 with code 295 from develop to master#1118
jaymengxy merged 52 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 requested a review from a team as a code owner May 28, 2025 04:49
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 28, 2025

PR Summary

Improved WalletConnect integration with better error handling and session management. Introduced a new URI handling system for deep links and universal links. Updated Crowdin SDK and version code to r2.8.6. Enhanced UI components and fixed various bugs in address book and profile sections.

Changes

File Summary
app/build.gradle Upgraded Crowdin SDK from version 1.9.2 to 1.13.1
app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt Added Crowdin initialization in application onCreate method
app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/WalletConnect.kt Added URI validation and improved error handling for WalletConnect pairing process
app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/WalletConnectDelegate.kt Added session topic validation and enhanced error handling for WalletConnect delegate
app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkType.kt Added new enums for Universal Link hosts and Deep Link schemes
app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/UriHandler.kt Created new centralized URI handler for processing deep links, universal links, and WalletConnect URIs
app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt Improved URL handling in WebView with new UriHandler integration and better error handling
app/src/main/java/com/flowfoundation/wallet/manager/config/NftCollectionConfig.kt Added externalURL field to NFT collection configuration
app/src/main/java/com/flowfoundation/wallet/page/profile/presenter/ProfileFragmentPresenter.kt Added fragment attachment check and fixed theme preference description updates
app/src/main/java/com/flowfoundation/wallet/page/profile/subpage/wallet/key/presenter/AccountKeyListItemPresenter.kt Improved key list item expansion state and added swipe lock for revoked keys
app/src/main/res/layout/dialog_evm_transaction.xml Added close button and improved layout constraints in EVM transaction dialog
gradle.properties Updated version code to 295 and version name to r2.8.6

autogenerated by presubmit.ai

@jaymengxy jaymengxy merged commit f52830c into master May 28, 2025
3 of 5 checks passed
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 (30)
  • f4926bf: Merge pull request #1078 from onflow/upgrade_code

fix: update the version code

  • Hot fix - telegram deep linking

  • Hot fix - telegram deep linking

  • Hot fix - telegram deep linking

  • Hot fix - telegram deep linking

  • Hot fix - telegram deep linking

  • Hot fix - telegram deep linking

  • WC deep linking

  • WC deep linking

Files Processed (24)
  • app/build.gradle (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/crowdin/CrowdinUtils.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/manager/config/NftCollectionConfig.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/Utils.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/WalletConnect.kt (3 hunks)
  • app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/WalletConnectDelegate.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/address/presenter/AddressBookPersonPresenter.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt (7 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/collection/presenter/CollectionContentPresenter.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkType.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkingActivity.kt (3 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/PendingActionHelper.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/UriHandler.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/Utils.kt (6 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/profile/presenter/ProfileFragmentPresenter.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/profile/subpage/wallet/key/presenter/AccountKeyListItemPresenter.kt (3 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/wallet/sync/WalletSyncViewModel.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/widgets/webview/evm/dialog/EVMSendTransactionDialog.kt (1 hunk)
  • app/src/main/res/layout/activity_add_address.xml (1 hunk)
  • app/src/main/res/layout/dialog_evm_transaction.xml (2 hunks)
  • app/src/main/res/layout/layout_key_list_item.xml (1 hunk)
  • app/src/main/res/values/strings.xml (2 hunks)
  • gradle.properties (1 hunk)
Actionable Comments (1)
  • app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/UriHandler.kt [80-83]

    possible issue: "Potential loss of WalletConnect connections"

Skipped Comments (3)
  • app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/WalletConnectDelegate.kt [446-449]

    enhancement: "Improve error handling for stale session requests"

  • app/src/main/java/com/flowfoundation/wallet/page/profile/presenter/ProfileFragmentPresenter.kt [156-156]

    enhancement: "Optimize fragment lifecycle check placement"

  • app/src/main/java/com/flowfoundation/wallet/manager/walletconnect/Utils.kt [31-42]

    enhancement: "Enhance session approval error handling"

Comment on lines +80 to +83
if (WalletConnect.isInitialized()) {
WalletConnect.get().pair(wcUri)
true
} else {
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 WalletConnect initialization check could lead to lost connections. Consider saving the URI for later processing when WalletConnect is not initialized, similar to the commented code.

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.

3 participants