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

Web App Modal: Do not close along with Payment Modal (#2008)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-08-31 15:00:39 +02:00
parent 21a989b165
commit b35090a0c7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/main/WebAppModal.tsx
View File

@ -125,7 +125,7 @@ const WebAppModal: FC<OwnProps & StateProps> = ({
}); });
} }
if (eventType === 'web_app_open_tg_link') { if (eventType === 'web_app_open_tg_link' && !isPaymentModalOpen) {
const linkUrl = TME_LINK_PREFIX + eventData.path_full; const linkUrl = TME_LINK_PREFIX + eventData.path_full;
openTelegramLink({ url: linkUrl }); openTelegramLink({ url: linkUrl });
closeWebApp(); closeWebApp();
@ -185,7 +185,10 @@ const WebAppModal: FC<OwnProps & StateProps> = ({
if (!eventData.message.trim().length || !eventData.buttons?.length || eventData.buttons.length > 3) return; if (!eventData.message.trim().length || !eventData.buttons?.length || eventData.buttons.length > 3) return;
setPopupParams(eventData); setPopupParams(eventData);
} }
}, [bot, buttonText, closeWebApp, openInvoice, openTelegramLink, sendWebViewData, setWebAppPaymentSlug]); }, [
bot, buttonText, closeWebApp, openInvoice, openTelegramLink, sendWebViewData, setWebAppPaymentSlug,
isPaymentModalOpen,
]);
const { const {
ref, reloadFrame, sendEvent, sendViewport, sendTheme, ref, reloadFrame, sendEvent, sendViewport, sendTheme,