diff --git a/src/app/components/contacts/contact-delete/contact-delete.component.ts b/src/app/components/contacts/contact-delete/contact-delete.component.ts index f68c7bb..97d3024 100644 --- a/src/app/components/contacts/contact-delete/contact-delete.component.ts +++ b/src/app/components/contacts/contact-delete/contact-delete.component.ts @@ -18,7 +18,9 @@ export class ContactDeleteComponent { private sharedService: SharedService, private firebaseService: FirebaseService, private router: Router - ) {} + ) { + console.log(this.sharedService.isEditContactDialogOpen); + } deleteContact() { this.firebaseService.deleteUser(this.currentUserId); diff --git a/src/app/components/contacts/contact-edit/contact-edit.component.html b/src/app/components/contacts/contact-edit/contact-edit.component.html index 3853fac..0101d77 100644 --- a/src/app/components/contacts/contact-edit/contact-edit.component.html +++ b/src/app/components/contacts/contact-edit/contact-edit.component.html @@ -3,9 +3,7 @@

Edit contact

- +
diff --git a/src/app/components/contacts/contact-form/contact-form.component.html b/src/app/components/contacts/contact-form/contact-form.component.html index 63174c3..30ea54f 100644 --- a/src/app/components/contacts/contact-form/contact-form.component.html +++ b/src/app/components/contacts/contact-form/contact-form.component.html @@ -29,14 +29,16 @@ required />
- @if ((!firstName.valid && firstName.touched) && (!lastName.valid && - lastName.touched)) { - {{ "contact-dialog-form.invalid-name" | translate }} - } @else { @if (!firstName.valid && firstName.touched) { - {{ "contact-dialog-form.invalid-firstName" | translate }} - } @else { @if (!lastName.valid && lastName.touched) { - {{ "contact-dialog-form.invalid-lastName" | translate }} - } } } +
+ @if ((!firstName.valid && firstName.touched) && (!lastName.valid && + lastName.touched)) { +

{{ "contact-dialog-form.invalid-name" | translate }}

+ } @else { @if (!firstName.valid && firstName.touched) { +

{{ "contact-dialog-form.invalid-firstName" | translate }}

+ } @else { @if (!lastName.valid && lastName.touched) { +

{{ "contact-dialog-form.invalid-lastName" | translate }}

+ } } } +
- @if (!email.valid && email.touched) { - {{ "contact-dialog-form.invalid-email" | translate }} - } +
+ @if (!email.valid && email.touched) { +

{{ "contact-dialog-form.invalid-email" | translate }}

+ } +
- @if (!phone.valid && phone.touched) { - {{ "contact-dialog-form.invalid-phone" | translate }} - } +
+ @if (!phone.valid && phone.touched) { +

{{ "contact-dialog-form.invalid-phone" | translate }}

+ } +