From 9c4291dec583ed5e7ad6e9a39736ca53d3fd1174 Mon Sep 17 00:00:00 2001 From: John Harrington <84741727+harr1424@users.noreply.github.com> Date: Fri, 19 Dec 2025 08:25:14 -0700 Subject: [PATCH] address review comments --- .../src/app/tools/import/desktop-import-metadata.service.ts | 2 +- apps/desktop/src/main.ts | 2 +- .../src/{app => main}/tools/import/chromium-importer.service.ts | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/desktop/src/{app => main}/tools/import/chromium-importer.service.ts (100%) diff --git a/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts b/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts index 1d34232b340..cf7000fc282 100644 --- a/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts +++ b/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts @@ -20,7 +20,7 @@ export class DesktopImportMetadataService } async init(): Promise { - const isMas = ipc.platform.isMacAppStore; + const isMas = this.system.environment.isMacAppStore(); const metadata = await ipc.tools.chromiumImporter.getMetadata(isMas); await this.parseNativeMetaData(metadata); await super.init(); diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index fbb83a1bf56..2dcc0686b42 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -33,7 +33,6 @@ import { } from "@bitwarden/state-internal"; import { SerializedMemoryStorageService, StorageServiceProvider } from "@bitwarden/storage-core"; -import { ChromiumImporterService } from "./app/tools/import/chromium-importer.service"; import { MainDesktopAutotypeService } from "./autofill/main/main-desktop-autotype.service"; import { MainSshAgentService } from "./autofill/main/main-ssh-agent.service"; import { DesktopAutofillSettingsService } from "./autofill/services/desktop-autofill-settings.service"; @@ -44,6 +43,7 @@ import { MenuMain } from "./main/menu/menu.main"; import { MessagingMain } from "./main/messaging.main"; import { NativeMessagingMain } from "./main/native-messaging.main"; import { PowerMonitorMain } from "./main/power-monitor.main"; +import { ChromiumImporterService } from "./main/tools/import/chromium-importer.service"; import { TrayMain } from "./main/tray.main"; import { UpdaterMain } from "./main/updater.main"; import { WindowMain } from "./main/window.main"; diff --git a/apps/desktop/src/app/tools/import/chromium-importer.service.ts b/apps/desktop/src/main/tools/import/chromium-importer.service.ts similarity index 100% rename from apps/desktop/src/app/tools/import/chromium-importer.service.ts rename to apps/desktop/src/main/tools/import/chromium-importer.service.ts