fix: quit confirmation dialog (#647)

* fix: quit confirmation dialog

* test: leftover

* test: quit confirmation dialog

Author: peppescg

e2e-tests/fixtures/electron.ts

@@ -20,6 +20,12 @@ export const test = base.extend<ElectronFixtures>({
 
     await use(app)
 
+    const window = await app.firstWindow()
+    await window.evaluate(() => {
+      // mock confirm quit
+      localStorage.setItem('doNotShowAgain_confirm_quit', 'true')
+    })
+
     // Ensure app is closed and video is recorded
     const appToClose = app.close()
     await appToClose

main/src/main.ts

@@ -389,7 +389,17 @@ app.on('will-finish-launching', () => {
   log.info('App will finish launching - preparing for potential restart')
 })
 
-app.on('before-quit', (e) => blockQuit('before-quit', e))
+app.on('before-quit', (e) => {
+  if (mainWindow) {
+    mainWindow.show()
+    mainWindow.focus()
+    mainWindow.webContents.send('show-quit-confirmation')
+  }
+
+  if (!isQuitting) {
+    e.preventDefault()
+  }
+})
 app.on('will-quit', (e) => blockQuit('will-quit', e))
 
 // Docker / Ctrl-C etc.
@@ -457,8 +467,8 @@ ipcMain.handle('hide-app', () => {
   mainWindow?.hide()
 })
 
-ipcMain.handle('quit-app', () => {
-  app.quit()
+ipcMain.handle('quit-app', (e) => {
+  blockQuit('before-quit', e)
 })
 
 ipcMain.handle('get-toolhive-port', () => getToolhivePort())

renderer/src/common/components/settings/tabs/__tests__/general-tab.test.tsx

@@ -25,7 +25,6 @@ const mockElectronAPI = {
     optIn: vi.fn(),
     optOut: vi.fn(),
   },
-  quitApp: vi.fn(),
 }
 
 Object.defineProperty(window, 'electronAPI', {

renderer/src/common/components/settings/tabs/__tests__/settings-tabs.test.tsx

@@ -16,7 +16,6 @@ const mockElectronAPI = {
     optIn: vi.fn(),
     optOut: vi.fn(),
   },
-  quitApp: vi.fn(),
 }
 
 Object.defineProperty(window, 'electronAPI', {
@@ -35,10 +34,6 @@ vi.mock('@/common/hooks/use-auto-launch', () => ({
   }),
 }))
 
-vi.mock('@/common/hooks/use-confirm-quit', () => ({
-  useConfirmQuit: vi.fn().mockReturnValue(vi.fn().mockResolvedValue(true)),
-}))
-
 const renderWithProviders = (component: React.ReactElement) => {
   const queryClient = new QueryClient({
     defaultOptions: {