Skip to content

Commit 3fde6d4

Browse files
fix: Prevent rental modals from closing (#1053)
* fix: Prevent rental modals from closing * fix: Use function instead of undefined
1 parent 6f6cd0b commit 3fde6d4

File tree

11 files changed

+14
-91
lines changed

11 files changed

+14
-91
lines changed

webapp/src/components/Modals/ConfirmRentModal/ConfirmRentModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const ConfirmRentModal = ({
6262
size="small"
6363
className={styles.modal}
6464
name={t('rental_modal.confirm_rent_step.title')}
65-
onClose={onClose}
65+
onClose={!isLoading ? onClose : undefined}
6666
>
6767
<ModalNavigation title={t('rental_modal.confirm_rent_step.title')} />
6868
<Modal.Content>

webapp/src/components/Modals/RentalListingModal/AuthorizationStep/AuthorizationStep.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const AuthorizationStep = (props: Props) => {
3030

3131
// State
3232
const [showError, setShowError] = useState(false)
33+
const isLoading = isConfirmingAuthorization || isAuthorizing
3334

3435
// Authorization
3536
const rentalContractData = getContract(ContractName.Rentals, nft.chainId)
@@ -70,7 +71,7 @@ const AuthorizationStep = (props: Props) => {
7071
<>
7172
<ModalNavigation
7273
title={t('rental_modal.authorization_step.title')}
73-
onClose={onCancel}
74+
onClose={!isLoading ? onCancel : undefined}
7475
/>
7576
<Modal.Content>
7677
<div className={styles.notice}>
@@ -133,17 +134,14 @@ const AuthorizationStep = (props: Props) => {
133134
) : (
134135
<Button
135136
primary
136-
loading={isConfirmingAuthorization || isAuthorizing}
137+
loading={isLoading}
137138
onClick={handleSubmit}
138-
disabled={isConfirmingAuthorization || isAuthorizing}
139+
disabled={isLoading}
139140
>
140141
{t('global.proceed')}
141142
</Button>
142143
)}
143-
<Button
144-
onClick={handleCancel}
145-
disabled={isConfirmingAuthorization || isAuthorizing}
146-
>
144+
<Button onClick={handleCancel} disabled={isLoading}>
147145
{t('global.cancel')}
148146
</Button>
149147
{showError && (

webapp/src/components/Modals/RentalListingModal/ConfirmationStep/ConfirmationStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const ConfirmationStep = (props: Props) => {
3535
<>
3636
<ModalNavigation
3737
title={t('rental_modal.confirmation_step.title')}
38-
onClose={onCancel}
38+
onClose={!isSigning ? onCancel : undefined}
3939
/>
4040
<Modal.Content>
4141
<div className={styles.notice}>

webapp/src/components/Modals/RentalListingModal/EditConfirmationStep/EditConfirmationStep.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ const EditConfirmationStep = (props: Props) => {
2222

2323
const [hasTriggeredStepOne, setHasTriggeredStepOne] = useState(false)
2424
const [isStepOneCompleted, setIsStepOneCompleted] = useState(false)
25+
const isLoading =
26+
isSubmittingRemoveTransaction ||
27+
isRemoveTransactionBeingConfirmed ||
28+
isSigning
2529

2630
useEffect(() => {
2731
if (isRemoveTransactionBeingConfirmed) {
@@ -59,7 +63,7 @@ const EditConfirmationStep = (props: Props) => {
5963
<>
6064
<ModalNavigation
6165
title={t('rental_modal.confirmation_edit_step.title')}
62-
onClose={onCancel}
66+
onClose={!isLoading ? onCancel : undefined}
6367
/>
6468
<Modal.Content>
6569
<div className={styles.notice}>

webapp/src/components/Modals/RentalListingModal/RentalListingModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const RentalListingModal = (props: Props) => {
7777
styles.modal,
7878
isConfirmingEditingStep && styles.editingModal
7979
)}
80-
onClose={onClose}
80+
onClose={() => undefined}
8181
>
8282
{!isAuthorized ? (
8383
<AuthorizationStep nft={nft} onCancel={onClose} />

webapp/src/components/Modals/SubmitTransactionModal/SubmitTransactionModal.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ const SubmitTransactionModal = ({
2121
const isLoading = isTransactionBeingConfirmed || isSubmittingTransaction
2222

2323
return (
24-
<Modal
25-
size="tiny"
26-
name={name}
27-
onClose={isLoading ? () => undefined : onClose}
28-
>
24+
<Modal size="tiny" name={name} onClose={!isLoading ? onClose : undefined}>
2925
<ModalNavigation title={title} />
3026
<Modal.Content className={className}>
3127
{children}

webapp/src/components/Modals/TestModal/TestModal.container.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

webapp/src/components/Modals/TestModal/TestModal.tsx

Lines changed: 0 additions & 35 deletions
This file was deleted.

webapp/src/components/Modals/TestModal/TestModal.types.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

webapp/src/components/Modals/TestModal/index.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)