ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Payments: Fix stuck payment (#3659)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-07-23 10:08:19 +02:00
parent c986ea7953
commit 82a8749482
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/payment/PaymentModal.tsx
View File

@ -18,6 +18,7 @@ import captureKeyboardListeners from '../../util/captureKeyboardListeners';
import useLang from '../../hooks/useLang'; import useLang from '../../hooks/useLang';
import useFlag from '../../hooks/useFlag'; import useFlag from '../../hooks/useFlag';
import usePaymentReducer from '../../hooks/reducers/usePaymentReducer'; import usePaymentReducer from '../../hooks/reducers/usePaymentReducer';
import usePrevious from '../../hooks/usePrevious';
import ShippingInfo from './ShippingInfo'; import ShippingInfo from './ShippingInfo';
import Shipping from './Shipping'; import Shipping from './Shipping';
@ -125,7 +126,8 @@ const PaymentModal: FC<OwnProps & StateProps & GlobalStateProps> = ({
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [isTosAccepted, setIsTosAccepted] = useState(false); const [isTosAccepted, setIsTosAccepted] = useState(false);
const [twoFaPassword, setTwoFaPassword] = useState(''); const [twoFaPassword, setTwoFaPassword] = useState('');
const prevStep = usePrevious(step, true);
const prevRequestId = usePrevious(requestId);
const canRenderFooter = step !== PaymentStep.ConfirmPayment; const canRenderFooter = step !== PaymentStep.ConfirmPayment;
const setStep = useCallback((nextStep) => { const setStep = useCallback((nextStep) => {
@ -151,7 +153,20 @@ const PaymentModal: FC<OwnProps & StateProps & GlobalStateProps> = ({
if (step !== undefined || error) { if (step !== undefined || error) {
setIsLoading(false); setIsLoading(false);
} }
}, [step, error]); }, [step, error, requestId]);
// When payment verification occurs and the `step` does not change, the card details must be requested
useEffect(() => {
if (
step === PaymentStep.Checkout
&& step === prevStep
&& requestId !== prevRequestId
&& !paymentState.savedCredentialId
&& !paymentState.cardNumber
) {
setStep(PaymentStep.PaymentInfo);
}
}, [paymentState.cardNumber, paymentState.savedCredentialId, prevRequestId, prevStep, requestId, setStep, step]);
useEffect(() => { useEffect(() => {
if (error?.field) { if (error?.field) {