Skip to content

fix(pos): close the payment queue drawer on Escape #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khaira777 merged 3 commits into from
Nov 7, 2026
+29 −0
Merged

fix(pos): close the payment queue drawer on Escape #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90cf12c
fix(pos): close the payment queue drawer on Escape
khaira777 Nov 7, 2026
54c0df0
fix(pos): restore focus to payment queue button on Escape close
khaira777 Nov 7, 2026
5699b9e
Merge branch 'main' into fix/pos-escape-payment-queue
khaira777 Nov 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions frontend/e2e/pos-keyboard-shortcuts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,28 @@ test.describe('POS Keyboard Shortcuts & Rapid Cashier Ergonomics', () => {
await page.getByRole('button', { name: 'Remove', exact: true }).first().click();
});

test('Escape closes the payment queue drawer', async ({ page }) => {
await page.route('**/api/settings/multi_counter_enabled', async (route) => {
await route.fulfill({ json: { setting: { key: 'multi_counter_enabled', value: 'true' } } });
});
await page.route('**/api/counters*', async (route) => {
await route.fulfill({ json: { counters: [] } });
});
await page.reload();
await expect(page.getByTestId('pos-product-grid')).toBeVisible();

await page.getByTestId('pos-payment-queue-btn').click();
const drawer = page.getByTestId('payment-queue-drawer');
await expect(drawer).toBeVisible();

await page.getByTestId('payment-queue-search').focus();
await page.keyboard.press('Escape');
await expect(drawer).toBeVisible();
await page.keyboard.press('Escape');
await expect(drawer).toHaveCount(0);
await expect(page.getByTestId('pos-payment-queue-btn')).toBeFocused();
});

test('PrepaidCheckoutModal focused buttons are not hijacked by global Space/Enter quick-pay', async ({
page,
}) => {
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/app/(dashboard)/pos/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3621,6 +3621,13 @@ export default function POSPage() {
setShowScheduledOrders(false);
return true;
}
if (showPaymentQueue) {
setShowPaymentQueue(false);
setTimeout(() => {
document.querySelector<HTMLElement>('[data-testid="pos-payment-queue-btn"]')?.focus();
}, 0);
return true;
}
Comment thread
qodo-code-review[bot] marked this conversation as resolved.
Resolved
if (cashDrawer.open) {
cashDrawer.setOpen(false);
return true;
Expand Down
Loading