From a27c1e3a7816889179c38eebaff7acb19989b982 Mon Sep 17 00:00:00 2001 From: Horacio Herrera Date: Mon, 15 Jan 2024 12:40:07 +0100 Subject: [PATCH] fix(desktop): remove icon extension fixes #1448 --- frontend/apps/desktop/forge.config.ts | 2 +- frontend/apps/desktop/src/app-api.ts | 4 ++++ frontend/apps/desktop/src/app-windows.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/apps/desktop/forge.config.ts b/frontend/apps/desktop/forge.config.ts index 0119a0f78..9ec68a95c 100644 --- a/frontend/apps/desktop/forge.config.ts +++ b/frontend/apps/desktop/forge.config.ts @@ -41,7 +41,7 @@ let iconsPath = process.env.CI const commonLinuxConfig: MakerDebConfig = { options: { categories: ['Development', 'Utility'], - icon: `${iconsPath}.png`, + icon: `${iconsPath}`, maintainer: 'Mintter Inc.', description: 'Mintter: a hyper.media protocol client', productName: 'Mintter', diff --git a/frontend/apps/desktop/src/app-api.ts b/frontend/apps/desktop/src/app-api.ts index 3954c36cd..0ca9de1cf 100644 --- a/frontend/apps/desktop/src/app-api.ts +++ b/frontend/apps/desktop/src/app-api.ts @@ -12,6 +12,7 @@ import { import {createIPCHandler} from 'electron-trpc/main' import {writeFile} from 'fs-extra' import {decompressFromEncodedURIComponent} from 'lz-string' +import path from 'path' import z from 'zod' import {commentsApi} from './app-comments' import {diagnosisApi} from './app-diagnosis' @@ -159,6 +160,9 @@ export const router = t.router({ webPreferences: { offscreen: true, }, + icon: process.env.CI + ? path.resolve(__dirname, '../assets/icons-nightly/icon.png') + : path.resolve(__dirname, '../assets/icons/icon.png'), }) await webView.webContents.loadURL(webUrl) const htmlValue = await webView.webContents.executeJavaScript( diff --git a/frontend/apps/desktop/src/app-windows.ts b/frontend/apps/desktop/src/app-windows.ts index 458fd60f7..c97174425 100644 --- a/frontend/apps/desktop/src/app-windows.ts +++ b/frontend/apps/desktop/src/app-windows.ts @@ -185,7 +185,7 @@ export function createAppWindow(input: { minHeight: windowType.minHeight, maxWidth: windowType.maxWidth, maxHeight: windowType.maxHeight, - icon: import.meta.env.RELEASE_NIGHTLY + icon: process.env.CI ? path.resolve(__dirname, '../assets/icons-nightly/icon.png') : path.resolve(__dirname, '../assets/icons/icon.png'), titleBarStyle: 'hidden',