etkr4k/bedolaga-cabinet
1
0
Fork 0
mirror of https://github.com/chillpadclub/bedolaga-cabinet.git synced 2026-07-29 18:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent duplicate Telegram popup opening

Browse Source 
Add popup guard in TelegramAdapter DialogController to prevent
"Popup is already opened" error. Migrate PromoOffersSection from
direct showPopup call to useDestructiveConfirm hook.
This commit is contained in:
c0mrade
2026-02-04 08:54:23 +03:00
parent dc6041e6a9
commit 71647ebc87
2 changed files with 68 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/platform/adapters/TelegramAdapter.ts
View File

@@ -183,58 +183,69 @@ function createHapticController(): HapticController {
function createDialogController(): DialogController {
const tg = getTelegram();
const inTelegram = isInTelegramWebApp();
let popupOpen = false;
function showPopupSafe<T>(
params: Parameters<NonNullable<TelegramWebApp['showPopup']>>[0],
mapResult: (buttonId: string) => T,
fallback: () => T,
): Promise<T> {
if (!inTelegram || !tg?.showPopup) {
return Promise.resolve(fallback());
}
if (popupOpen) {
return Promise.resolve(mapResult(''));
}
return new Promise((resolve) => {
popupOpen = true;
tg.showPopup(params, (buttonId) => {
popupOpen = false;
resolve(mapResult(buttonId));
});
});
}
return {
alert(message: string, _title?: string): Promise<void> {
return new Promise((resolve) => {
if (inTelegram && tg?.showPopup) {
tg.showPopup({ message, buttons: [{ type: 'ok' }] }, () => resolve());
} else {
return showPopupSafe(
{ message, buttons: [{ type: 'ok' }] },
() => undefined,
() => {
window.alert(message);
resolve();
}
});
},
);
},
confirm(message: string, _title?: string): Promise<boolean> {
return new Promise((resolve) => {
if (inTelegram && tg?.showPopup) {
tg.showPopup(
{
message,
buttons: [
{ id: 'ok', type: 'ok' },
{ id: 'cancel', type: 'cancel' },
],
},
(buttonId) => resolve(buttonId === 'ok'),
);
} else {
resolve(window.confirm(message));
}
});
return showPopupSafe(
{
message,
buttons: [
{ id: 'ok', type: 'ok' },
{ id: 'cancel', type: 'cancel' },
],
},
(buttonId) => buttonId === 'ok',
() => window.confirm(message),
);
},
popup(options: PopupOptions): Promise<string | null> {
return new Promise((resolve) => {
if (inTelegram && tg?.showPopup) {
tg.showPopup(
{
title: options.title,
message: options.message,
buttons: options.buttons?.map((btn) => ({
id: btn.id,
type: btn.type,
text: btn.text,
})),
},
(buttonId) => resolve(buttonId ?? null),
);
} else {
const confirmed = window.confirm(options.message);
resolve(confirmed ? 'ok' : null);
}
});
return showPopupSafe(
{
title: options.title,
message: options.message,
buttons: options.buttons?.map((btn) => ({
id: btn.id,
type: btn.type,
text: btn.text,
})),
},
(buttonId) => buttonId || null,
() => (window.confirm(options.message) ? 'ok' : null),
);
},
};
}