Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
Code Issues Projects Releases Wiki Activity

Fixing Successful toast message does not appear (#4421)

Browse Source
This commit is contained in:
cyprain-okeke 2023-01-09 12:59:08 +01:00 committed by GitHub
parent d79fd7f417
commit 6b1a72851a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/angular/src/components/send/add-edit.component.ts
View File

@ -201,25 +201,14 @@ export class AddEditComponent implements OnInit, OnDestroy {
} }
this.onSavedSend.emit(this.send); this.onSavedSend.emit(this.send);
if (this.copyLink && this.link != null) { if (this.copyLink && this.link != null) {
const copySuccess = await this.copyLinkToClipboard(this.link); await this.handleCopyLinkToClipboard();
if (copySuccess ?? true) { return;
}
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"success", "success",
null, null,
this.i18nService.t(this.editMode ? "editedSend" : "createdSend") this.i18nService.t(this.editMode ? "editedSend" : "createdSend")
); );
} else {
await this.platformUtilsService.showDialog(
this.i18nService.t(this.editMode ? "editedSend" : "createdSend"),
null,
this.i18nService.t("ok"),
null,
"success",
null
);
await this.copyLinkToClipboard(this.link);
}
}
}); });
try { try {
await this.formPromise; await this.formPromise;
@ -308,4 +297,24 @@ export class AddEditComponent implements OnInit, OnDestroy {
this.showPassword = !this.showPassword; this.showPassword = !this.showPassword;
document.getElementById("password").focus(); document.getElementById("password").focus();
} }
private async handleCopyLinkToClipboard() {
const copySuccess = await this.copyLinkToClipboard(this.link);
if (copySuccess ?? true) {
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t(this.editMode ? "editedSend" : "createdSend")
);
} else {
await this.platformUtilsService.showDialog(
this.i18nService.t(this.editMode ? "editedSend" : "createdSend"),
null,
this.i18nService.t("ok"),
null,
"success",
null
);
await this.copyLinkToClipboard(this.link);
}
}
} }