From 4dff06e88436ea73fd70c09f134350be11fd45a6 Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza <leomendoza123@gmail.com>
Date: Mon, 4 Dec 2023 18:23:09 -0600
Subject: [PATCH] batch-fixes-4-dec

---
 src/app/register2/components/BaseForm.ts                  | 1 -
 src/app/register2/pages/register/register2.component.html | 3 ++-
 src/app/register2/pages/register/register2.component.ts   | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/register2/components/BaseForm.ts b/src/app/register2/components/BaseForm.ts
index 317ced3fb2..67888b5de5 100644
--- a/src/app/register2/components/BaseForm.ts
+++ b/src/app/register2/components/BaseForm.ts
@@ -13,7 +13,6 @@ export abstract class BaseForm implements ControlValueAccessor, AsyncValidator {
   public onTouchedFunction
   constructor() {}
   writeValue(val: any): void {
-    console.log('writeValue', val)
     if (val != null && val !== undefined && val !== '') {
       this.form.setValue(val, { emitEvent: true })
       // Trigger registerOnChange custom function by calling form.updateValueAndValidity
diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html
index db7dcf6ef1..84918f637a 100644
--- a/src/app/register2/pages/register/register2.component.html
+++ b/src/app/register2/pages/register/register2.component.html
@@ -7,6 +7,7 @@
           #stepper
           labelPosition="bottom"
           class="orcid-stepper-wizard"
+          (selectionChange)="selectionChange($event)"
         >
           <mat-step [stepControl]="FormGroupStepA">
             <ng-template matStepLabel i18n="@@register.personalData"
@@ -46,7 +47,7 @@
               >Visibility and terms</ng-template
             >
             <app-step-d
-              #stepComponentC
+              #stepComponentD
               [(formGroup)]="FormGroupStepD"
               (submit)="register()"
               [loading]="loading"
diff --git a/src/app/register2/pages/register/register2.component.ts b/src/app/register2/pages/register/register2.component.ts
index 7409ce242a..7368e123b2 100644
--- a/src/app/register2/pages/register/register2.component.ts
+++ b/src/app/register2/pages/register/register2.component.ts
@@ -224,6 +224,11 @@ export class Register2Component implements OnInit, AfterViewInit {
       }
     }
   }
+  selectionChange(event: StepperSelectionEvent) {
+    if (this.platform.columns4 || this.platform.columns8) {
+      this.focusCurrentStep(event)
+    }
+  }
 
   // Fix to material vertical stepper not focusing current header
   // related issue https://github.com/angular/components/issues/8881