Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-11 13:30:39 +01:00
Code Issues Projects Releases Wiki Activity

[PM-4357] remove disableClose on BrowserSyncVerificationDialog and AwaitDesktopDialog (#6730)

Browse Source 
* remove disableClose on BrowserSyncVerificationDialogComponent

* remove disableClose from AwaitDesktopDialogComponent
This commit is contained in:
Will Martin 2023-10-30 12:24:26 -04:00 committed by GitHub
parent b9e8f61831
commit c325e996f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/popup/settings/await-desktop-dialog.component.html
View File

@ -4,7 +4,7 @@
{{ "awaitDesktopDesc" | i18n }} {{ "awaitDesktopDesc" | i18n }}
</span> </span>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>
<button bitButton type="button" buttonType="secondary" [bitDialogClose]="true"> <button bitButton type="button" buttonType="secondary" [bitDialogClose]="false">
{{ "close" | i18n }} {{ "close" | i18n }}
</button> </button>
</ng-container> </ng-container>

4
apps/browser/src/popup/settings/await-desktop-dialog.component.ts
View File

@ -10,8 +10,6 @@ import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components
}) })
export class AwaitDesktopDialogComponent { export class AwaitDesktopDialogComponent {
static open(dialogService: DialogService) { static open(dialogService: DialogService) {
return dialogService.open<boolean>(AwaitDesktopDialogComponent, { return dialogService.open<boolean>(AwaitDesktopDialogComponent);
disableClose: true,
});
} }
} }

4
apps/browser/src/popup/settings/settings.component.ts
View File

@ -370,7 +370,7 @@ export class SettingsComponent implements OnInit {
await Promise.race([ await Promise.race([
awaitDesktopDialogClosed.then(async (result) => { awaitDesktopDialogClosed.then(async (result) => {
if (result) { if (result !== true) {
this.form.controls.biometric.setValue(false); this.form.controls.biometric.setValue(false);
await this.stateService.setBiometricAwaitingAcceptance(null); await this.stateService.setBiometricAwaitingAcceptance(null);
} }
@ -402,7 +402,7 @@ export class SettingsComponent implements OnInit {
}); });
}) })
.finally(() => { .finally(() => {
awaitDesktopDialogRef.close(false); awaitDesktopDialogRef.close(true);
}), }),
]); ]);
} else { } else {

1
apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
View File

@ -19,7 +19,6 @@ export class BrowserSyncVerificationDialogComponent {
static open(dialogService: DialogService, data: BrowserSyncVerificationDialogParams) { static open(dialogService: DialogService, data: BrowserSyncVerificationDialogParams) {
return dialogService.open(BrowserSyncVerificationDialogComponent, { return dialogService.open(BrowserSyncVerificationDialogComponent, {
data, data,
disableClose: true,
}); });
} }
} }