Show a loading UI when accepting a dispute is in progress #7476
+45
−14
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: patch | ||
| Type: fix | ||
|
|
||
| Show loading state when accepting a dispute from the transaction details screen. |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,10 +82,14 @@ interface AcceptDisputeProps { | |
| /** | ||
| * Disputes and Inquiries have different text for buttons and the modal. | ||
| * They also have different icons and tracks events. This function returns the correct props. | ||
| */ | ||
| function getAcceptDisputeProps( { | ||
| dispute, | ||
| isLoading, | ||
| }: { | ||
| dispute: Dispute; | ||
| isLoading: boolean; | ||
| } ): AcceptDisputeProps { | ||
| if ( isInquiry( dispute ) ) { | ||
| return { | ||
| acceptButtonLabel: __( 'Issue refund', 'woocommerce-payments' ), | ||
|
|
@@ -146,7 +150,9 @@ function getAcceptDisputeProps( dispute: Dispute ): AcceptDisputeProps { | |
| ), | ||
| }, | ||
| ], | ||
| modalButtonLabel: isLoading | ||
Jinksi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ? __( 'Accepting…', 'woocommerce-payments' ) | ||
| : __( 'Accept dispute', 'woocommerce-payments' ), | ||
| modalButtonTracksEvent: wcpayTracks.events.DISPUTE_ACCEPT_CLICK, | ||
| }; | ||
| } | ||
|
|
@@ -171,6 +177,9 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( { | |
| } = useContext( WCPaySettingsContext ); | ||
|
|
||
| const onModalClose = () => { | ||
| if ( isLoading ) { | ||
| return; | ||
| } | ||
|
There was a problem hiding this comment. More renaming suggestions 😁
There was a problem hiding this comment. I've renamed it to |
||
| setModalOpen( false ); | ||
| }; | ||
|
|
||
|
|
@@ -188,7 +197,7 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( { | |
| ); | ||
| }; | ||
|
|
||
| const disputeAcceptAction = getAcceptDisputeProps( { dispute, isLoading } ); | ||
|
|
||
| const challengeButtonDefaultText = isInquiry( dispute ) | ||
| ? __( 'Submit evidence', 'woocommerce-payments' ) | ||
|
|
@@ -326,6 +335,7 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( { | |
| > | ||
| <Button | ||
| variant="tertiary" | ||
| disabled={ isLoading } | ||
| onClick={ onModalClose } | ||
| > | ||
| { __( | ||
|
|
@@ -335,6 +345,8 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( { | |
| </Button> | ||
| <Button | ||
| variant="primary" | ||
| isBusy={ isLoading } | ||
| disabled={ isLoading } | ||
Jinksi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| data-testid="accept-dispute-button" | ||
| onClick={ () => { | ||
| wcpayTracks.recordEvent( | ||
|
|
@@ -346,7 +358,7 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( { | |
| 'transaction_details', | ||
| } | ||
| ); | ||
|
There was a problem hiding this comment. Curious why we didn't use There was a problem hiding this comment. Same! I don't have an answer. |
||
|
|
||
| /** | ||
| * Handle the primary modal action. | ||
| * If it's an inquiry, redirect to the order page; otherwise, continue with the default dispute acceptance. | ||
|
|
||
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getAcceptDisputePropsis pretty strange to read and reason about. I think this code would be a lot clearer if it just had a dedicated modal for each case (inquiry vs dispute).AcceptDisputePropsis a domain-specific interface for a semi-generic modal (e.g.modalLines); I don't see a benefit to that over using the React components we have (i.e. a powerful, readable, flexible modal API).That said, I don't know if it's safe/worthwhile to refactor this for this change. I would be tempted 😁
Mentioning because this PR reads as very decoupled – can't really see what changed. Specifically, the button
Submitting…label should be an implementation detail inside a modal component. I find it strange (and complex) that this is delegated to a function (that now needs a new param).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I agree and I began a refactor of this code in #7339, but it became low-priority and out-of-scope due to time constraints.
I think a refactor should be handled in a separate PR, as it is a more significant quantity of work and is separate from this PR's goal.