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

feat: add error screen for RBF modal when TX is confirmed #16893

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

peter-sanderson
Copy link
Contributor

Partially addresses #16875

image

Copy link

coderabbitai bot commented Feb 7, 2025

Walkthrough

The changes involve updates to modal components handling transaction-related actions. In the CancelTransactionModal, the Button component has been replaced with NewModal.Button, and the associated import statement has been updated accordingly. The modal’s functionality, including error handling and transaction confirmation, remains unchanged. In the BumpFeeModal, additional imports have been introduced, including a function to select transaction confirmations, the new modal component, and a hook for accessing the state. The component now uses these updates to conditionally render content based on the confirmation status of a transaction—displaying different modal components and buttons depending on whether the transaction is confirmed. The overall structure and state management of the modals are maintained.

Suggested reviewers

  • MiroslavProchazka
  • komret

📜 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 2db04c3 and aafb565.

📒 Files selected for processing (2)
  • packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/CancelTransaction/CancelTransactionModal.tsx (2 hunks)
  • packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/BumpFeeModal.tsx (2 hunks)
🧰 Additional context used
🧠 Learnings (1)
packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/CancelTransaction/CancelTransactionModal.tsx (1)
Learnt from: Lemonexe
PR: trezor/trezor-suite#16525
File: packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/CancelTransaction/CancelTransactionModal.tsx:60-76
Timestamp: 2025-02-03T17:19:25.374Z
Learning: The CancelTransactionModal component should handle error states from composeCancelTransactionThunk by showing CancelTransactionFailed component and disable the cancel button during loading.
⏰ Context from checks skipped due to timeout of 90000ms (9)
  • GitHub Check: run-desktop-tests (@group=wallet, trezor-user-env-unix bitcoin-regtest)
  • GitHub Check: run-desktop-tests (@group=other, trezor-user-env-unix)
  • GitHub Check: run-desktop-tests (@group=settings, trezor-user-env-unix bitcoin-regtest)
  • GitHub Check: run-desktop-tests (@group=device-management, trezor-user-env-unix)
  • GitHub Check: run-desktop-tests (@group=suite, trezor-user-env-unix)
  • GitHub Check: build-web
  • GitHub Check: Setup and Cache Dependencies
  • GitHub Check: build-web
  • GitHub Check: Analyze with CodeQL (javascript)
🔇 Additional comments (6)
packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/BumpFeeModal.tsx (4)

1-14: LGTM!

The new imports are well-organized and align with the PR objective to implement an error screen for confirmed transactions.


37-41: LGTM!

The transaction confirmation check is correctly implemented using the selector and a clear boolean flag.


49-57: LGTM!

The conditional rendering of bottom content appropriately shows either a close button for confirmed transactions or a replace button for unconfirmed ones.


60-64: LGTM!

The conditional rendering of main content correctly implements the error screen for confirmed transactions while maintaining the change fee functionality for unconfirmed ones.

packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/CancelTransaction/CancelTransactionModal.tsx (2)

14-14: LGTM!

The import change maintains consistency with the use of NewModal.Button across modals.


84-86: LGTM!

The button component update maintains consistency with the use of NewModal.Button across modals while preserving the existing functionality.


🪧 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. (Beta)
  • @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.

@peter-sanderson peter-sanderson added the no-project This label is used to specify that PR doesn't need to be added to a project label Feb 7, 2025
Copy link
Contributor

@Lemonexe Lemonexe left a comment

Choose a reason for hiding this comment

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

LGTM. Especially thanks for the overview in the issue, otherwise I'd be quite confused what is this compared to the previous PR 👍

@peter-sanderson peter-sanderson force-pushed the cancel-transaction-screen-2-error branch from ab34593 to 5933cb7 Compare February 10, 2025 08:49
Base automatically changed from cancel-transaction-screen-2-error to develop February 10, 2025 09:41
@peter-sanderson peter-sanderson force-pushed the cancel-transaction-screen-2-error-basic branch from cb26855 to aafb565 Compare February 10, 2025 09:42
@peter-sanderson peter-sanderson merged commit 7b3e916 into develop Feb 10, 2025
30 checks passed
@peter-sanderson peter-sanderson deleted the cancel-transaction-screen-2-error-basic branch February 10, 2025 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-project This label is used to specify that PR doesn't need to be added to a project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants