Merge branch 'main' into feature/check-for-updates

package.json

@@ -106,7 +106,7 @@
     "class-variance-authority": "0.7.0",
     "clsx": "2.1.1",
     "date-fns": "3.6.0",
-    "electron-log": "^5.1.6",
+    "electron-log": "5.1.6",
     "electron-updater": "6.3.0",
     "final-form": "4.20.10",
     "menubar": "9.5.0",
@@ -117,7 +117,7 @@
     "react-router-dom": "6.25.1",
     "tailwind-merge": "2.4.0",
     "ts-loader": "9.5.1",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   },
   "devDependencies": {
     "@biomejs/biome": "1.8.3",

renovate.json

@@ -4,7 +4,6 @@
     "config:recommended",
     ":separateMultipleMajorReleases",
     ":enableVulnerabilityAlerts",
-    "schedule:weekly",
     "regexManagers:biomeVersions"
   ],
   "labels": ["dependency"],

src/electron/first-run.js

@@ -1,7 +1,7 @@
 const { app, dialog } = require('electron');
-
 const fs = require('node:fs');
 const path = require('node:path');
+const log = require('electron-log');
 
 async function onFirstRunMaybe() {
   if (isFirstRun()) {
@@ -49,7 +49,7 @@ function isFirstRun() {
 
     fs.writeFileSync(configPath, '');
   } catch (error) {
-    console.warn('First run: Unable to write firstRun file', error);
+    log.warn('First run: Unable to write firstRun file', error);
   }
 
   return true;

src/electron/main.js

@@ -11,6 +11,7 @@ const { onFirstRunMaybe } = require('./first-run');
 const path = require('node:path');
 const log = require('electron-log');
 
+log.initialize();
 autoUpdater.logger = log;
 
 // TODO: Remove @electron/remote use - see #650
@@ -60,18 +61,22 @@ const contextMenu = Menu.buildFromTemplate([
     },
   },
   { type: 'separator' },
-
-  {
-    role: 'reload',
-    accelerator: 'CommandOrControl+R',
-  },
   {
-    role: 'toggleDevTools',
-    accelerator: 'CommandOrControl+I',
+    label: 'Developer',
+    submenu: [
+      {
+        role: 'reload',
+        accelerator: 'CommandOrControl+R',
+      },
+      {
+        role: 'toggleDevTools',
+        accelerator: 'CommandOrControl+I',
+      },
+    ],
   },
   { type: 'separator' },
   {
-    label: 'Quit',
+    label: 'Quit Gitify',
     accelerator: 'CommandOrControl+Q',
     click: () => {
       app.quit();
@@ -94,6 +99,7 @@ app.whenReady().then(async () => {
     mb.app.setAppUserModelId('com.electron.gitify');
 
     // Tray configuration
+    mb.tray.setToolTip('Gitify');
     mb.tray.setIgnoreDoubleClickEvents(true);
     mb.tray.on('right-click', (_event, bounds) => {
       mb.tray.popUpContextMenu(contextMenu, { x: bounds.x, y: bounds.y });

src/utils/api/client.test.ts

@@ -1,4 +1,5 @@
 import axios, { type AxiosPromise, type AxiosResponse } from 'axios';
+import log from 'electron-log';
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
@@ -278,7 +279,7 @@ describe('utils/api/client.ts', () => {
     });
 
     it('should handle error', async () => {
-      const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+      const logErrorSpy = jest.spyOn(log, 'error').mockImplementation();
 
       const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
 
@@ -291,7 +292,7 @@ describe('utils/api/client.ts', () => {
         '123' as Token,
       );
 
-      expect(consoleErrorSpy).toHaveBeenCalledWith('Failed to get html url');
+      expect(logErrorSpy).toHaveBeenCalledWith('Failed to get html url');
     });
   });
 });