diff --git a/package.json b/package.json index 83eb34f838..2f19476751 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "givethdapp", - "version": "2.5.1", + "version": "2.5.2", "private": true, "scripts": { "build": "next build", diff --git a/src/components/modals/DonateModal.tsx b/src/components/modals/DonateModal.tsx index abe37dd2fe..748c62e796 100644 --- a/src/components/modals/DonateModal.tsx +++ b/src/components/modals/DonateModal.tsx @@ -65,8 +65,8 @@ const DonateModal = (props: IDonateModalProps) => { const dispatch = useAppDispatch(); const { isAnimating, closeModal } = useModalAnimation(setShowModal); const isDonatingToGiveth = donationToGiveth > 0; - const { formatMessage } = useIntl(); + const [donating, setDonating] = useState(false); const [firstDonationSaved, setFirstDonationSaved] = useState(false); const [secondDonationSaved, setSecondDonationSaved] = useState(false); @@ -74,6 +74,7 @@ const DonateModal = (props: IDonateModalProps) => { const [secondTxHash, setSecondTxHash] = useState(''); const [isFirstTxSuccess, setIsFirstTxSuccess] = useState(false); const [secondTxStatus, setSecondTxStatus] = useState(); + const [processFinished, setProcessFinished] = useState(false); const [failedModalType, setFailedModalType] = useState(); @@ -111,6 +112,8 @@ const DonateModal = (props: IDonateModalProps) => { }; const delayedCloseModal = (txHash1: string, txHash2?: string) => { + setProcessFinished(true); + setDonating(false); const txHash = txHash2 ? [txHash1, txHash2] : [txHash1]; setTimeout(() => { closeModal(); @@ -278,7 +281,7 @@ const DonateModal = (props: IDonateModalProps) => { )} - {firstDonationSaved && ( + {firstDonationSaved && !processFinished && ( {