From d85c439e80d8d5f3e82dda12682eab47a9af6584 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 8 Dec 2023 09:43:45 -0600
Subject: [PATCH 1/4] 8975-qa-no-error-menssage-on-addional-email

---
 .../backend-error/backend-error.component.html       | 12 +-----------
 .../backend-error/backend-error.component.ts         |  1 +
 .../form-personal-additional-emails.component.html   |  9 ++++++++-
 .../form-personal-additional-emails.component.ts     |  7 +++++++
 .../form-personal/form-personal.component.html       |  1 +
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html
index 261415a216..76c98f9f73 100644
--- a/src/app/register2/components/backend-error/backend-error.component.html
+++ b/src/app/register2/components/backend-error/backend-error.component.html
@@ -1,15 +1,5 @@
 <ng-container *ngIf="recognizedError[errorCode] === 0">
-  <ng-container *ngIf="!registrationTogglz">
-    <ng-container i18n="@@register.emailAlreadyExists"
-      >This email already exists in our system. Would you like to</ng-container
-    >
-
-    <a (click)="navigateToSignin(value)" i18n="@@register.signinLowerCase"
-      >sign in</a
-    ><ng-container i18n="@@shared.questionMark">?</ng-container>
-  </ng-container>
-
-  <ng-container *ngIf="registrationTogglz && nextButtonWasClicked">
+  <ng-container *ngIf="(showEmailAlreadyExistUntilNextButtonWasClicked && nextButtonWasClicked) || !showEmailAlreadyExistUntilNextButtonWasClicked">
     <ng-container i18n="@@register.emailIsAlreadyAssociated"
       >This email is already associated with an existing ORCID record. Please
       use a different email address.</ng-container
diff --git a/src/app/register2/components/backend-error/backend-error.component.ts b/src/app/register2/components/backend-error/backend-error.component.ts
index a9dc479478..bdbc066fca 100644
--- a/src/app/register2/components/backend-error/backend-error.component.ts
+++ b/src/app/register2/components/backend-error/backend-error.component.ts
@@ -31,6 +31,7 @@ export class BackendErrorComponent implements OnInit {
   recognizedError = RegisterBackendErrors
   _errorCode: string
   @Input() nextButtonWasClicked = false
+  @Input() showEmailAlreadyExistUntilNextButtonWasClicked = false
   registrationTogglz = false
 
   @Input()
diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
index 8e6e00efd8..ee08b0bd47 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
@@ -6,7 +6,11 @@
       index as i
     "
   >
-    <mat-label class="orc-font-small-print" id="additional-email-label">
+  {{additionalEmails.valid}}
+    <mat-label class="orc-font-small-print" id="additional-email-label" [ngClass]="{
+      'error': additionalEmailsTouched && additionalEmails.valid === false
+    }"
+    >
       <ng-container i18n="@@register.additionalEmails"
         >Additional email</ng-container
       >
@@ -36,6 +40,8 @@
     >
       Please enter a valid email address, for example joe@institution.edu
     </mat-error>
+    <ng-container      *ngIf="additionalEmailsTouched"
+    >
     <mat-error
       *ngFor="
         let error of getControlErrorAtFormLevel(
@@ -49,6 +55,7 @@
         [value]="additionalEmailControl.value.value"
       ></app-backend-error>
     </mat-error>
+  </ng-container>
 
     <!-- <button
       *ngIf="i == 0"
diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
index 85784289b0..71de192151 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
@@ -22,6 +22,7 @@ import { ErrorStateMatcherForFormLevelErrors } from '../../ErrorStateMatcherForF
   styleUrls: [
     './form-personal-additional-emails.component.scss',
     '../register2.style.scss',
+    '../register2.scss-theme.scss'
   ],
 })
 export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
@@ -55,6 +56,12 @@ export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
     )
   }
 
+
+
+  get emailError(): boolean {
+    console.log(this.additionalEmails.controls[0].touched && this.additionalEmails.controls[0].errors)
+    return !!(this.additionalEmails.controls[0].touched && this.additionalEmails.controls[0].errors);
+  }
   // deleteEmailInput(id: string): void {
   //   this.additionalEmails.removeControl(id)
   //   this._changeDetectorRef.detectChanges()
diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html
index 8baaa83ff0..6110d6cbaf 100644
--- a/src/app/register2/components/form-personal/form-personal.component.html
+++ b/src/app/register2/components/form-personal/form-personal.component.html
@@ -145,6 +145,7 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
           *ngFor="let error of this.emails.getError('backendError', 'email')"
         >
           <app-backend-error
+            [showEmailAlreadyExistUntilNextButtonWasClicked]="true"
             [nextButtonWasClicked]="nextButtonWasClicked"
             [errorCode]="error"
             [value]="emails.get('email').value"

From 7ed39bf01ddd9fa3bc0fecc99642a2000599376f Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 8 Dec 2023 09:44:10 -0600
Subject: [PATCH 2/4] 8975-qa-no-error-menssage-on-addional-email

---
 CHANGELOG.md                                  |  2 +-
 .../backend-error.component.html              |  8 +++-
 ...-personal-additional-emails.component.html | 42 ++++++++++---------
 ...rm-personal-additional-emails.component.ts | 14 ++++---
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04b7e26fcf..282779a852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.51.11...v2.51.12)
 
-- [#2116](https://github.com/ORCID/orcid-angular/pull/2116): 
+- [#2116](https://github.com/ORCID/orcid-angular/pull/2116):
 
 ### Fix
 
diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html
index 76c98f9f73..f5bd8766f5 100644
--- a/src/app/register2/components/backend-error/backend-error.component.html
+++ b/src/app/register2/components/backend-error/backend-error.component.html
@@ -1,5 +1,11 @@
 <ng-container *ngIf="recognizedError[errorCode] === 0">
-  <ng-container *ngIf="(showEmailAlreadyExistUntilNextButtonWasClicked && nextButtonWasClicked) || !showEmailAlreadyExistUntilNextButtonWasClicked">
+  <ng-container
+    *ngIf="
+      (showEmailAlreadyExistUntilNextButtonWasClicked &&
+        nextButtonWasClicked) ||
+      !showEmailAlreadyExistUntilNextButtonWasClicked
+    "
+  >
     <ng-container i18n="@@register.emailIsAlreadyAssociated"
       >This email is already associated with an existing ORCID record. Please
       use a different email address.</ng-container
diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
index ee08b0bd47..e406028792 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
@@ -6,10 +6,13 @@
       index as i
     "
   >
-  {{additionalEmails.valid}}
-    <mat-label class="orc-font-small-print" id="additional-email-label" [ngClass]="{
-      'error': additionalEmailsTouched && additionalEmails.valid === false
-    }"
+    {{ additionalEmails.valid }}
+    <mat-label
+      class="orc-font-small-print"
+      id="additional-email-label"
+      [ngClass]="{
+        error: additionalEmailsTouched && additionalEmails.valid === false
+      }"
     >
       <ng-container i18n="@@register.additionalEmails"
         >Additional email</ng-container
@@ -40,22 +43,21 @@
     >
       Please enter a valid email address, for example joe@institution.edu
     </mat-error>
-    <ng-container      *ngIf="additionalEmailsTouched"
-    >
-    <mat-error
-      *ngFor="
-        let error of getControlErrorAtFormLevel(
-          additionalEmailControl.value,
-          'backendErrors'
-        )
-      "
-    >
-      <app-backend-error
-        [errorCode]="error"
-        [value]="additionalEmailControl.value.value"
-      ></app-backend-error>
-    </mat-error>
-  </ng-container>
+    <ng-container *ngIf="additionalEmailsTouched">
+      <mat-error
+        *ngFor="
+          let error of getControlErrorAtFormLevel(
+            additionalEmailControl.value,
+            'backendErrors'
+          )
+        "
+      >
+        <app-backend-error
+          [errorCode]="error"
+          [value]="additionalEmailControl.value.value"
+        ></app-backend-error>
+      </mat-error>
+    </ng-container>
 
     <!-- <button
       *ngIf="i == 0"
diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
index 71de192151..8d0d82c2c2 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
@@ -22,7 +22,7 @@ import { ErrorStateMatcherForFormLevelErrors } from '../../ErrorStateMatcherForF
   styleUrls: [
     './form-personal-additional-emails.component.scss',
     '../register2.style.scss',
-    '../register2.scss-theme.scss'
+    '../register2.scss-theme.scss',
   ],
 })
 export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
@@ -56,11 +56,15 @@ export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
     )
   }
 
-
-
   get emailError(): boolean {
-    console.log(this.additionalEmails.controls[0].touched && this.additionalEmails.controls[0].errors)
-    return !!(this.additionalEmails.controls[0].touched && this.additionalEmails.controls[0].errors);
+    console.log(
+      this.additionalEmails.controls[0].touched &&
+        this.additionalEmails.controls[0].errors
+    )
+    return !!(
+      this.additionalEmails.controls[0].touched &&
+      this.additionalEmails.controls[0].errors
+    )
   }
   // deleteEmailInput(id: string): void {
   //   this.additionalEmails.removeControl(id)

From 316f57d915a3e26feadda3038301143f43b81921 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 8 Dec 2023 09:44:48 -0600
Subject: [PATCH 3/4] 8975-qa-no-error-menssage-on-addional-email

---
 .../form-personal-additional-emails.component.html               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
index e406028792..73b138c8b9 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html
@@ -6,7 +6,6 @@
       index as i
     "
   >
-    {{ additionalEmails.valid }}
     <mat-label
       class="orc-font-small-print"
       id="additional-email-label"

From fbcbf53030322a3fa67e0468f8cd82769470d88c Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Fri, 8 Dec 2023 09:49:28 -0600
Subject: [PATCH 4/4] 8975-qa-no-error-menssage-on-addional-email

---
 .../form-personal-additional-emails.component.ts       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
index 8d0d82c2c2..e4394e123a 100644
--- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
+++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
@@ -56,16 +56,6 @@ export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
     )
   }
 
-  get emailError(): boolean {
-    console.log(
-      this.additionalEmails.controls[0].touched &&
-        this.additionalEmails.controls[0].errors
-    )
-    return !!(
-      this.additionalEmails.controls[0].touched &&
-      this.additionalEmails.controls[0].errors
-    )
-  }
   // deleteEmailInput(id: string): void {
   //   this.additionalEmails.removeControl(id)
   //   this._changeDetectorRef.detectChanges()