From d07acf57fd376c198a6e861a8c9f46bd6e65a5fb Mon Sep 17 00:00:00 2001 From: IlyaDoronin Date: Mon, 8 Apr 2024 15:56:46 +0300 Subject: [PATCH] fix: cart payment --- src/utils/hooks/useAfterpay.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/utils/hooks/useAfterpay.ts b/src/utils/hooks/useAfterpay.ts index c7218508..68d89784 100644 --- a/src/utils/hooks/useAfterpay.ts +++ b/src/utils/hooks/useAfterpay.ts @@ -14,9 +14,14 @@ export const useAfterpay = () => { const checkPayment = () => { const redirectUrl = new URL(window.location.href); + const paymentUserId = redirectUrl.searchParams.get("userid"); redirectUrl.searchParams.set("afterpay", "false"); navigate(redirectUrl); + if (userId !== paymentUserId) { + return; + } + const payCartPendingRequestDeadline = localStorage.getItem( "payCartPendingRequestDeadline", ); @@ -50,14 +55,15 @@ export const useAfterpay = () => { }; const checkParams = () => { - const params = new URLSearchParams(window.location.search); - const afterpay = params.get("afterpay"); - const paymentUserId = params.get("userid"); + const afterpay = new URLSearchParams(window.location.search).get( + "afterpay", + ); - if (afterpay && userId === paymentUserId) { + if (afterpay) { checkPayment(); } }; setInterval(checkParams, 5000); + checkParams(); };