diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts
index 252a209715..ad02ee66c2 100644
--- a/apps/browser/src/popup/settings/settings.component.ts
+++ b/apps/browser/src/popup/settings/settings.component.ts
@@ -474,10 +474,7 @@ export class SettingsComponent implements OnInit {
}
async import() {
- await this.router.navigate(["/import"]);
- if (await BrowserApi.isPopupOpen()) {
- this.popupUtilsService.popOut(window);
- }
+ this.router.navigate(["/import"]);
}
export() {
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser.component.html b/apps/browser/src/tools/popup/settings/import/import-browser.component.html
index b305e6c395..695529c4d2 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser.component.html
+++ b/apps/browser/src/tools/popup/settings/import/import-browser.component.html
@@ -16,9 +16,11 @@
+
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser.component.ts b/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
index 3fea3aad04..30ead216b5 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
+++ b/apps/browser/src/tools/popup/settings/import/import-browser.component.ts
@@ -1,11 +1,14 @@
import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
import { Router, RouterLink } from "@angular/router";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
import { ImportComponent } from "@bitwarden/importer/ui";
+import { FilePopoutCalloutComponent } from "../../components/file-popout-callout.component";
+import { FilePopoutUtilsService } from "../../services/file-popout-utils.service";
+
@Component({
templateUrl: "import-browser.component.html",
standalone: true,
@@ -17,13 +20,20 @@ import { ImportComponent } from "@bitwarden/importer/ui";
AsyncActionsModule,
ButtonModule,
ImportComponent,
+ FilePopoutCalloutComponent,
],
})
-export class ImportBrowserComponent {
+export class ImportBrowserComponent implements OnInit {
protected disabled = false;
protected loading = false;
- constructor(private router: Router) {}
+ protected hideFileSelector = false;
+
+ constructor(private router: Router, private filePopoutUtilsService: FilePopoutUtilsService) {}
+
+ ngOnInit(): void {
+ this.hideFileSelector = this.filePopoutUtilsService.showFilePopoutMessage(window);
+ }
protected async onSuccessfulImport(organizationId: string): Promise {
this.router.navigate(["/tabs/settings"]);
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index 83e119fcc5..ab9250a4c7 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -344,7 +344,7 @@
and save the zip file.
-
+
{{ "selectImportFile" | i18n }}