1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-09 03:53:53 +00:00

Merge branch 'master' into feature/flexible-collections

This commit is contained in:
Vincent Salucci
2023-09-19 15:41:56 -05:00
18 changed files with 90 additions and 41 deletions

View File

@@ -309,7 +309,7 @@ export class ImportComponent implements OnInit, OnDestroy {
}
private getFileContents(file: File): Promise<string> {
if (this.format === "1password1pux") {
if (this.format === "1password1pux" && file.name.endsWith(".1pux")) {
return this.extractZipContent(file, "export.data");
}
if (