Skip to content

Merge r2.8.7 with code 298 from develop to master #1172

Merged
jaymengxy merged 6 commits intomasterfrom
develop
Jun 10, 2025
Merged

Merge r2.8.7 with code 298 from develop to master #1172
jaymengxy merged 6 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 June 10, 2025 08:16
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 10, 2025

PR Summary

Enhanced Firebase authentication by implementing forced JWT token refresh, improved NFT list view functionality with grid/list toggle support, and optimized token management for better display of newly added tokens. Also includes version bump to 298.

Changes

File Summary
app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt Enhanced firebaseCustomLogin to force refresh the JWT token after successful authentication, ensuring up-to-date token state and better error handling.
app/src/main/java/com/flowfoundation/wallet/manager/token/FungibleTokenListManager.kt Added support for updating token list with specific contractId, allowing immediate display of newly added tokens without requiring full list refresh.
app/src/main/java/com/flowfoundation/wallet/page/nft/nftlist/NftViewModel.kt Changed default view to grid layout and modified collection expansion logic based on view type (grid/list), improving NFT browsing experience.
app/src/main/java/com/flowfoundation/wallet/page/nft/nftlist/presenter/NFTFragmentPresenter.kt Updated view type toggle logic to properly handle collection expansion state based on grid/list view selection.
app/src/main/java/com/flowfoundation/wallet/page/token/addtoken/AddTokenViewModel.kt Modified token list update to specifically refresh newly added token by passing contractId, ensuring immediate visibility of added tokens.
gradle.properties Incremented version code from 297 to 298 for release r2.8.7.

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 (6)

fix: login jwt force refresh

  • NFT list

  • NFT list

  • NFT list

fix: display the added new token

  • 0eea9bc: fix: display the added new token
Files Processed (6)
  • app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/manager/token/FungibleTokenListManager.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/nft/nftlist/NftViewModel.kt (2 hunks)
  • app/src/main/java/com/flowfoundation/wallet/page/nft/nftlist/presenter/NFTFragmentPresenter.kt (1 hunk)
  • app/src/main/java/com/flowfoundation/wallet/page/token/addtoken/AddTokenViewModel.kt (1 hunk)
  • gradle.properties (1 hunk)
Actionable Comments (1)
  • app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt [40-40]

    security: "Security concern with logging sensitive authentication token"

Skipped Comments (2)
  • app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt [38-47]

    possible issue: "Potential memory leak in async callback chain"

  • app/src/main/java/com/flowfoundation/wallet/manager/token/FungibleTokenListManager.kt [192-199]

    enhancement: "Simplify nested null checks"

if (task.isSuccessful) {
auth.currentUser?.getIdToken(true)?.addOnSuccessListener { result ->
val jwt = result.token
logd(TAG, "get token finish, token:${jwt}")
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Avoid logging sensitive information like JWT tokens, even in debug logs. This could lead to token exposure if logs are captured. Consider logging only non-sensitive metadata or removing the token from the log message.

@jaymengxy jaymengxy merged commit d5f353c into master Jun 10, 2025
5 checks passed
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