Tweak code style

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/main/tray/electron-tray/electron-tray.injectable.ts

@@ -82,7 +82,7 @@ const convertToElectronMenuTemplate = (trayMenuItems: TrayMenuItem[]) => {
 
           return {
             id: trayMenuItem.id,
-            label: trayMenuItem.label.get(),
+            label: trayMenuItem.label?.get(),
             enabled: trayMenuItem.enabled.get(),
             toolTip: trayMenuItem.tooltip,
 

src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts

@@ -16,11 +16,13 @@ import type { TrayMenuRegistration } from "../tray-menu-registration";
 const trayMenuItemRegistratorInjectable = getInjectable({
   id: "tray-menu-item-registrator",
 
-  instantiate: (di) => (extension: LensMainExtension, installationCounter) => {
+  instantiate: (di) => (extension, installationCounter) => {
-    pipeline(
+    const mainExtension = extension as LensMainExtension;
-      extension.trayMenus,
 
-      flatMap(toItemInjectablesFor(extension, installationCounter)),
+    pipeline(
+      mainExtension.trayMenus,
+
+      flatMap(toItemInjectablesFor(mainExtension, installationCounter)),
 
       (injectables) => di.register(...injectables),
     );
@@ -34,7 +36,7 @@ export default trayMenuItemRegistratorInjectable;
 
 const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: number) => {
   const _toItemInjectables = (parentId: string | null) => (registration: TrayMenuRegistration): Injectable<TrayMenuItem, TrayMenuItem, void>[] => {
-    const trayItemId = registration.id || kebabCase(registration.label);
+    const trayItemId = registration.id || kebabCase(registration.label || "");
     const id = `${trayItemId}-tray-menu-item-for-extension-${extension.sanitizedExtensionId}-instance-${installationCounter}`;
 
     const parentInjectable = getInjectable({
@@ -47,14 +49,14 @@ const toItemInjectablesFor = (extension: LensMainExtension, installationCounter:
 
         separator: registration.type === "separator",
 
-        label: computed(() => registration.label),
+        label: computed(() => registration.label || ""),
         tooltip: registration.toolTip,
 
         click: () => {
           registration.click?.(registration);
         },
 
-        enabled: computed(() => registration.enabled),
+        enabled: computed(() => !!registration.enabled),
         visible: computed(() => true),
       }),
 

src/main/tray/tray.ts

@@ -72,7 +72,7 @@ const toTrayMenuOptions = (trayMenuItems: TrayMenuItem[]) => {
 
           return {
             id: trayMenuItem.id,
-            label: trayMenuItem.label.get(),
+            label: trayMenuItem.label?.get(),
             enabled: trayMenuItem.enabled.get(),
             toolTip: trayMenuItem.tooltip,
 

src/main/update-app/install-application-update-tray-item.injectable.ts

@@ -23,7 +23,7 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({
       orderNumber: 50,
 
       label: computed(() => {
-        const versionToBeInstalled = discoveredVersionState.value.get().version;
+        const versionToBeInstalled = discoveredVersionState.value.get()?.version;
 
         return `Install update ${versionToBeInstalled}`;
       }),
@@ -31,7 +31,7 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({
       enabled: computed(() => true),
 
       visible: computed(
-        () => discoveredVersionState.value.get() && !downloadingUpdateState.value.get(),
+        () => !!discoveredVersionState.value.get() && !downloadingUpdateState.value.get(),
       ),
 
       click: () => {

src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts

@@ -27,7 +27,11 @@ const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
 
         const updateIsDiscoveredFromChannel = discoveredVersion?.updateChannel;
 
-        const updateOnQuit = sufficientlyStableUpdateChannels.includes(updateIsDiscoveredFromChannel);
+        const updateOnQuit = updateIsDiscoveredFromChannel
+          ? sufficientlyStableUpdateChannels.includes(
+            updateIsDiscoveredFromChannel,
+          )
+          : false;
 
         setUpdateOnQuit(updateOnQuit);
       }),

src/test-utils/override-ipc-bridge.ts

@@ -123,7 +123,7 @@ export const overrideIpcBridge = ({
   );
 
   rendererDi.override(sendToMainInjectable, () => (channelId, message) => {
-    const handles = mainIpcFakeHandles.get(channelId);
+    const handles = mainIpcFakeHandles.get(channelId) || [];
 
     if (isEmpty(handles)) {
       throw new Error(