Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(suite): hide solana unstake amount #17283

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

dev-pvl
Copy link
Contributor

@dev-pvl dev-pvl commented Feb 27, 2025

Description

Fixed an issue where transactions with "Split stake" incorrectly had fiat value and amount.

Related Issue

Resolve #17222

Screenshots:

image
image

Copy link

coderabbitai bot commented Feb 27, 2025

Walkthrough

The pull request introduces updates to handle Solana unstake transactions and broadens stake transaction identification. A new optional property, unstakeAmount of type string, is added to the Solana-specific section of the transaction type. The transformation logic in the transaction utilities has been modified to set different handling for unstake transactions by computing a separate unstake amount, while standard amounts are set to zero when applicable. UI components have been updated to show the unstake amount instead of the conventional amount and to hide or recalculate the display value based on transaction type. Additionally, the criteria identifying stake transactions have been adjusted to include both Ethereum and Solana contexts.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 480c589 and f089416.

📒 Files selected for processing (5)
  • packages/blockchain-link-types/src/common.ts (1 hunks)
  • packages/blockchain-link-utils/src/solana.ts (2 hunks)
  • packages/suite/src/components/suite/UnstakingTxAmount.tsx (1 hunks)
  • packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/Detail/AdvancedTxDetails/AmountDetails.tsx (1 hunks)
  • packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx (2 hunks)
🔇 Additional comments (8)
packages/blockchain-link-types/src/common.ts (1)

155-158: Added necessary field for Solana unstake transactions

The addition of the optional unstakeAmount field to the solanaSpecific object is appropriate for storing the unstake amount for Solana transactions. This will allow for proper handling of unstake transactions in the Solana context.

packages/suite/src/components/suite/UnstakingTxAmount.tsx (2)

17-17: Correctly removed the amount field from destructuring

Removed the amount property from destructuring as it's not needed for Solana unstake transactions, since we'll be using the specialized unstakeAmount field.


23-28: Properly implemented unstake amount display

This implementation correctly retrieves the unstake amount from the new solanaSpecific.unstakeAmount field with a fallback to '0'. Using the unstake amount for rendering ensures the correct value is displayed for Solana unstake transactions.

packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx (3)

69-69: Added check for Solana unstake transactions

This new check correctly identifies Solana unstake transactions by examining the transaction's solanaSpecific.stakeType property.


72-73: Properly hiding amount for Solana unstake transactions

This change ensures that the amount is hidden (by returning null) when the transaction is a Solana unstake transaction, which aligns with the PR objective to hide Solana unstake amounts.


83-83: Updated dependency array to include new condition

Correctly updated the dependency array of the useMemo hook to include the isSolanaUnstakeTx variable, ensuring that the memoized value recalculates when this condition changes.

packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/Detail/AdvancedTxDetails/AmountDetails.tsx (1)

49-50: Expanded stake type transaction detection

This change broadens the criteria for identifying stake type transactions to include both Ethereum-based stake transactions (via isStakeTypeTx(txSignature)) and Solana-specific stake transactions (via tx?.solanaSpecific?.stakeType). This ensures consistent handling of stake transactions across different blockchain implementations.

The isStakeTypeTxNoAmount check now correctly identifies Solana stake transactions with zero amount, which prevents showing unnecessary amount rows in the transaction details.

packages/blockchain-link-utils/src/solana.ts (1)

740-750: Clean implementation for hiding unstake amount and providing separate field!

The approach taken here is good - creating a dedicated unstakeAmount field while setting the regular amount to '0' for unstake transactions ensures that the UI can properly display or hide values as needed. The boolean flag isUnstakeTx provides clear intent and makes the code more readable.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@tomasklim tomasklim added the release Will be included in the upcoming release. Needs to be backported to the release branch. label Feb 27, 2025
@tomasklim tomasklim requested a review from martykan February 28, 2025 15:12
@martykan
Copy link
Member

Ideally I would imagine something like stakeOperation: { type: 'unstake', amount: '10000' }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Will be included in the upcoming release. Needs to be backported to the release branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SOL staking - Transactions with "Split stake" have fiat value and amount attached to them.
3 participants