Skip to content

Fixed: handle dialog closure case in confirmation flow #195

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
merged 5 commits into from
Oct 27, 2025
Merged

Fixed: handle dialog closure case in confirmation flow #195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d755a59
fix(gator-permissions-snap): handle dialog closure case in confirmati…
mj-kiwi Oct 14, 2025
8bd9211
Ensure unbind handlers are cleared on dialog closure
mj-kiwi Oct 14, 2025
4261d0f
enhance cleanup logic for event handlers and interface resolution
mj-kiwi Oct 14, 2025
57ab78d
refactor: streamline cleanup process in confirmation dialog
mj-kiwi Oct 21, 2025
f5ef30a
fix: ensure interfaceId is cleared after dialog resolution
mj-kiwi Oct 21, 2025
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
12 changes: 12 additions & 0 deletions packages/gator-permissions-snap/src/core/confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,18 @@ export class ConfirmationDialog {
id: interfaceId,
},
})
.then(async (result) => {
// Should resolve with false when dialog is closed.
if (result === null) {
unbindGrantButtonClick();
unbindCancelButtonClick();

// clear our stored unbind handler reference
this.#unbindHandlers = undefined;

resolve(false);
}
})
.catch((error) => {
const reason = error as Error;
reject(reason);
Expand Down
19 changes: 19 additions & 0 deletions packages/gator-permissions-snap/test/core/confirmation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,25 @@ describe('ConfirmationDialog', () => {
expect(result).toStrictEqual({ isConfirmationGranted: false });
});

it('should resolve with false when dialog is closed', async () => {
// Simulate dialog closure
mockSnaps.request.mockResolvedValueOnce(null);

const awaitingUserDecision =
confirmationDialog.displayConfirmationDialogAndAwaitUserDecision();

expect(mockUserEventDispatcher.on).toHaveBeenCalledTimes(2);
expect(mockUnbindFunctions).toHaveLength(2);

const result = await awaitingUserDecision;

mockUnbindFunctions.forEach((mockUnbindFn) => {
expect(mockUnbindFn).toHaveBeenCalledTimes(1);
});

expect(result).toStrictEqual({ isConfirmationGranted: false });
});

it('should clean up event listeners after decision', async () => {
const awaitingUserDecision =
confirmationDialog.displayConfirmationDialogAndAwaitUserDecision();
Expand Down
Loading