From 02aa3680eff25e98643f943915288d42bf8242c7 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 4 May 2026 19:08:49 +0300
Subject: [PATCH 1/2] PD-5112 initial depreaction update changes

---
 .../account-settings.module.ts                |   6 -
 ...duplicated-merged-confirmed.component.html |  43 ----
 ...duplicated-merged-confirmed.component.scss |   0
 ...licated-merged-confirmed.component.spec.ts |  33 ---
 ...s-duplicated-merged-confirmed.component.ts |  24 ---
 ...-duplicated-two-factor-auth.component.html |  12 --
 ...-duplicated-two-factor-auth.component.scss |   0
 ...plicated-two-factor-auth.component.spec.ts |  56 -----
 ...ns-duplicated-two-factor-auth.component.ts |  51 -----
 .../dialog-actions-duplicated.component.html  | 100 ---------
 .../dialog-actions-duplicated.component.scss  |   5 -
 ...tions-duplicated.component.scss-theme.scss |  19 --
 ...ialog-actions-duplicated.component.spec.ts |  52 -----
 .../dialog-actions-duplicated.component.ts    |  35 ----
 ...settings-actions-duplicated.component.html | 194 ++++++++++++------
 ...settings-actions-duplicated.component.scss |   4 +
 .../settings-actions-duplicated.component.ts  | 158 +++++++++-----
 .../settings-actions.component.ts             |   3 +
 .../form-authorize.component.ts               |   6 -
 .../account-actions-duplicated.service.ts     |   2 +-
 src/app/types/account-actions-duplicated.ts   |   4 +-
 21 files changed, 247 insertions(+), 560 deletions(-)
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.html
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.scss
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.spec.ts
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.ts
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.html
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.scss
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.spec.ts
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.ts
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.html
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss-theme.scss
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.spec.ts
 delete mode 100644 src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.ts

diff --git a/src/app/account-settings/account-settings.module.ts b/src/app/account-settings/account-settings.module.ts
index b7f9a3bd55..5a906d3eb5 100644
--- a/src/app/account-settings/account-settings.module.ts
+++ b/src/app/account-settings/account-settings.module.ts
@@ -24,9 +24,6 @@ import { TwoFactorAuthenticationFormModule } from '../cdk/two-factor-authenticat
 import { VerificationEmailModalService } from '../core/verification-email-modal/verification-email-modal.service'
 import { SharedModule } from '../shared/shared.module'
 import { AccountSettingsRoutingModule } from './account-settings-routing.module'
-import { DialogActionsDuplicatedMergedConfirmedComponent } from './components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component'
-import { DialogActionsDuplicatedTwoFactorAuthComponent } from './components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component'
-import { DialogActionsDuplicatedComponent } from './components/dialog-actions-duplicated/dialog-actions-duplicated.component'
 import { DialogSecurityAlternateAccountDeleteComponent } from './components/dialog-security-alternate-account-delete/dialog-security-alternate-account-delete.component'
 import { SettingsActionsDeactivateComponent } from './components/settings-actions-deactivate/settings-actions-deactivate.component'
 import { SettingsActionsDownloadComponent } from './components/settings-actions-download/settings-actions-download.component'
@@ -68,9 +65,6 @@ import { ConfirmDeactivateAccountComponent } from './pages/confirm-deactivate-ac
     SettingsActionsDownloadComponent,
     SettingsActionsDeactivateComponent,
     SettingsActionsDuplicatedComponent,
-    DialogActionsDuplicatedComponent,
-    DialogActionsDuplicatedMergedConfirmedComponent,
-    DialogActionsDuplicatedTwoFactorAuthComponent,
     SettingsSharingComponent,
     SettingsSharingQrCodeComponent,
     SettingsSharingHtmlCodeComponent,
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.html b/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.html
deleted file mode 100644
index b4a7bdffee..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<app-modal [noSidebar]="true">
-  <app-modal-header i18n="@@account.deleteDuplicatedAccount"
-    >Duplicate record removed!</app-modal-header
-  >
-  <ng-container i18n="@@account.orcidRecord"> ORCID record </ng-container>
-  <strong
-    ><a
-      id="cy-deprecating-orcid"
-      class="underline"
-      href="{{ baseUrl }}{{ data.deprecatingOrcid }}"
-      rel="noopener noreferrer"
-      target="_blank"
-      >{{ data.deprecatingOrcid }}</a
-    ></strong
-  >
-  <ng-container i18n="@@account.hasBeenRemovedDuplicated">
-    has been removed and now refers to your current record,
-  </ng-container>
-
-  <strong
-    >{{ data.primaryAccountName }}
-    <a
-      id="cy-primary-orcid"
-      class="underline"
-      href="{{ baseUrl }}{{ data.primaryOrcid }}"
-      rel="noopener noreferrer"
-      target="_blank"
-      >{{ data.primaryOrcid }}</a
-    ></strong
-  >
-
-  <app-modal-footer>
-    <button
-      mat-stroked-button
-      color="primary"
-      (click)="ok()"
-      i18n="@@shared.ok"
-      id="cy-dialog-ok"
-    >
-      Ok
-    </button>
-  </app-modal-footer></app-modal
->
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.scss b/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.spec.ts b/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.spec.ts
deleted file mode 100644
index e7dc6b1022..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-
-import { DialogActionsDuplicatedMergedConfirmedComponent } from './dialog-actions-duplicated-merged-confirmed.component'
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'
-
-describe('DialogActionsDuplicatedMergedConfirmedComponent', () => {
-  let component: DialogActionsDuplicatedMergedConfirmedComponent
-  let fixture: ComponentFixture<DialogActionsDuplicatedMergedConfirmedComponent>
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [DialogActionsDuplicatedMergedConfirmedComponent],
-      providers: [
-        { provide: MatDialogRef, useValue: {} },
-        { provide: MAT_DIALOG_DATA, useValue: {} },
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents()
-  })
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(
-      DialogActionsDuplicatedMergedConfirmedComponent
-    )
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should create', () => {
-    expect(component).toBeTruthy()
-  })
-})
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.ts b/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.ts
deleted file mode 100644
index 3cc916cfeb..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core'
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'
-import { DuplicateRemoveEndpoint } from 'src/app/types/account-actions-duplicated'
-@Component({
-  selector: 'app-dialog-actions-duplicated-merged-confirmed',
-  templateUrl: './dialog-actions-duplicated-merged-confirmed.component.html',
-  styleUrls: ['./dialog-actions-duplicated-merged-confirmed.component.scss'],
-  preserveWhitespaces: true,
-  standalone: false,
-})
-export class DialogActionsDuplicatedMergedConfirmedComponent implements OnInit {
-  baseUrl = runtimeEnvironment.BASE_URL
-
-  constructor(
-    private matRef: MatDialogRef<DialogActionsDuplicatedMergedConfirmedComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: DuplicateRemoveEndpoint
-  ) {}
-
-  ngOnInit(): void {}
-
-  ok() {
-    this.matRef.close(this.data)
-  }
-}
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.html b/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.html
deleted file mode 100644
index 02688a9cc5..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<app-modal [noSidebar]="true" [loading]="loading">
-  <app-modal-header i18n="@@account.twoFactor"
-    >Two factor authentication</app-modal-header
-  >
-
-  <app-two-factor-authentication-form
-    [showBadVerificationCode]="showBadVerificationCode"
-    [showBadRecoveryCode]="showBadRecoveryCode"
-    (authenticate)="authenticate($event)"
-  >
-  </app-two-factor-authentication-form>
-</app-modal>
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.scss b/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.spec.ts b/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.spec.ts
deleted file mode 100644
index 383c5cf999..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-
-import { DialogActionsDuplicatedTwoFactorAuthComponent } from './dialog-actions-duplicated-two-factor-auth.component'
-import { WINDOW_PROVIDERS } from '../../../cdk/window'
-import { PlatformInfoService } from '../../../cdk/platform-info'
-import { ErrorHandlerService } from '../../../core/error-handler/error-handler.service'
-import { SnackbarService } from '../../../cdk/snackbar/snackbar.service'
-import { MatSnackBar } from '@angular/material/snack-bar'
-import {
-  MAT_DIALOG_DATA,
-  MatDialog,
-  MatDialogRef,
-} from '@angular/material/dialog'
-import { Overlay } from '@angular/cdk/overlay'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
-import { RouterTestingModule } from '@angular/router/testing'
-import { TwoFactorAuthenticationService } from '../../../core/two-factor-authentication/two-factor-authentication.service'
-
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'
-
-describe('DialogActionsDuplicatedTwoFactorAuthComponent', () => {
-  let component: DialogActionsDuplicatedTwoFactorAuthComponent
-  let fixture: ComponentFixture<DialogActionsDuplicatedTwoFactorAuthComponent>
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, RouterTestingModule],
-      declarations: [DialogActionsDuplicatedTwoFactorAuthComponent],
-      providers: [
-        { provide: MatDialogRef, useValue: {} },
-        { provide: MAT_DIALOG_DATA, useValue: {} },
-        WINDOW_PROVIDERS,
-        TwoFactorAuthenticationService,
-        PlatformInfoService,
-        ErrorHandlerService,
-        SnackbarService,
-        MatSnackBar,
-        MatDialog,
-        Overlay,
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents()
-  })
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(
-      DialogActionsDuplicatedTwoFactorAuthComponent
-    )
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should create', () => {
-    expect(component).toBeTruthy()
-  })
-})
diff --git a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.ts b/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.ts
deleted file mode 100644
index 5121589682..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core'
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'
-import { OauthService } from 'src/app/core/oauth/oauth.service'
-import { DuplicateRemoveEndpoint } from 'src/app/types/account-actions-duplicated'
-
-import { DialogActionsDuplicatedMergedConfirmedComponent } from '../dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component'
-import { TwoFactorAuthenticationService } from '../../../core/two-factor-authentication/two-factor-authentication.service'
-
-@Component({
-  selector: 'app-dialog-actions-duplicated-two-factor-auth',
-  templateUrl: './dialog-actions-duplicated-two-factor-auth.component.html',
-  styleUrls: ['./dialog-actions-duplicated-two-factor-auth.component.scss'],
-  standalone: false,
-})
-export class DialogActionsDuplicatedTwoFactorAuthComponent implements OnInit {
-  showBadVerificationCode: boolean
-  showBadRecoveryCode: boolean
-  loading: boolean
-  constructor(
-    private _twoFactorAuthenticationService: TwoFactorAuthenticationService,
-    private matRef: MatDialogRef<DialogActionsDuplicatedMergedConfirmedComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: DuplicateRemoveEndpoint
-  ) {}
-
-  ngOnInit(): void {}
-  authenticate(code: { verificationCode?: string; recoveryCode?: string }) {
-    this.showBadVerificationCode = false
-    this.showBadRecoveryCode = false
-    this.loading = true
-    this._twoFactorAuthenticationService
-      .submitCodeForAnotherAccount({
-        orcid: this.data.deprecatingOrcid,
-        verificationCode: code.verificationCode || null,
-        recoveryCode: code.recoveryCode || null,
-        errors: [],
-        redirectUrl: null,
-      })
-      .subscribe((res) => {
-        this.loading = false
-        if (res.errors && res.errors.length > 0) {
-          if (res.errors[0].includes('verification')) {
-            this.showBadVerificationCode = true
-          } else {
-            this.showBadRecoveryCode = true
-          }
-        } else if (res.redirectUrl) {
-          this.matRef.close(this.data)
-        }
-      })
-  }
-}
diff --git a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.html b/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.html
deleted file mode 100644
index 4ed2df5107..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<app-modal [noSidebar]="true">
-  <app-modal-header i18n="@@account.removeDuplicateRecord"
-    >Remove duplicate record
-  </app-modal-header>
-
-  <app-alert-message type="warning" class="orc-font-body-small">
-    <ng-container content i18n="@@account.warningDuplicated">
-      Warning! All information will be deleted from the duplicate record. Only
-      the email addresses will be transferred to your main ORCID record.
-      Removing a duplicate record cannot be undone.
-    </ng-container>
-  </app-alert-message>
-
-  <h2 class="remove">
-    <strong class="orc-font-body-large" i18n="@@account.removeThisRecord"
-      >Remove this record</strong
-    >
-  </h2>
-  <ng-container *ngIf="data.deprecatingAccountName">
-    <strong
-      >{{ data.deprecatingAccountName }}
-      <a
-        id="cy-deprecating-orcid"
-        class="underline"
-        href="{{ baseUrl }}{{ data.deprecatingOrcid }}"
-        rel="noopener noreferrer"
-        target="_blank"
-        >({{ data.deprecatingOrcid }})</a
-      ></strong
-    >
-  </ng-container>
-  <ng-container *ngIf="!data.deprecatingAccountName">
-    <strong
-      ><ng-container i18n="@@account.nameIsPri">Name is private</ng-container>
-      <a
-        id="cy-deprecating-orcid"
-        class="underline"
-        href="{{ baseUrl }}{{ data.deprecatingOrcid }}"
-        rel="noopener noreferrer"
-        target="_blank"
-        >{{ data.deprecatingOrcid }}</a
-      ></strong
-    >
-  </ng-container>
-  <div *ngFor="let email of data.deprecatingEmails">{{ email }}</div>
-
-  <h2 class="keep">
-    <strong class="orc-font-body-large" i18n="@@account.keepThisRecord"
-      >Keep this record</strong
-    >
-  </h2>
-
-  <ng-container *ngIf="data.primaryAccountName">
-    <strong
-      >{{ data.primaryAccountName }}
-      <a
-        id="cy-primary-orcid"
-        class="underline"
-        href="{{ baseUrl }}{{ data.primaryOrcid }}"
-        rel="noopener noreferrer"
-        target="_blank"
-        >({{ data.primaryOrcid }})</a
-      ></strong
-    >
-  </ng-container>
-  <ng-container *ngIf="!data.primaryAccountName">
-    <strong>
-      <a
-        id="cy-primary-orcid"
-        class="underline"
-        href="{{ baseUrl }}{{ data.primaryOrcid }}"
-        rel="noopener noreferrer"
-        target="_blank"
-        >{{ data.primaryOrcid }}</a
-      ></strong
-    >
-  </ng-container>
-  <div *ngFor="let email of data.primaryEmails">{{ email }}</div>
-
-  <app-modal-footer>
-    <button
-      mat-raised-button
-      color="warn"
-      (click)="ok()"
-      i18n="@@account.removeDuplicatedRecord"
-      id="cy-remove-duplicate-record"
-    >
-      Remove duplicate record
-    </button>
-    <button
-      mat-stroked-button
-      color="primary"
-      (click)="cancel()"
-      i18n="@@shared.cancel"
-      id="cy-dialog-cancel"
-    >
-      Cancel
-    </button>
-  </app-modal-footer></app-modal
->
diff --git a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss b/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss
deleted file mode 100644
index ff0d54d759..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-h2 {
-  border-bottom: solid 2px;
-  padding-bottom: 8px;
-  margin-bottom: 16px;
-}
diff --git a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss-theme.scss b/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss-theme.scss
deleted file mode 100644
index ddb1f163d4..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.scss-theme.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-@use '@angular/material' as mat;
-@import 'src/assets/scss/material.orcid-theme.scss';
-
-@mixin dialog-actions-duplicated($theme) {
-  $primary: map-get($theme, primary);
-  $accent: map-get($theme, accent);
-  $warn: map-get($theme, accent);
-  $foreground: map-get($theme, foreground);
-  $background: map-get($theme, background);
-
-  h2.remove {
-    border-color: map-get($foreground, 'state-warning-dark');
-  }
-  h2.keep {
-    border-color: mat.m2-get-color-from-palette($accent, 400);
-  }
-}
-
-@include dialog-actions-duplicated($orcid-app-theme);
diff --git a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.spec.ts b/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.spec.ts
deleted file mode 100644
index d63bdff293..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.spec.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-
-import { DialogActionsDuplicatedComponent } from './dialog-actions-duplicated.component'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
-import { RouterTestingModule } from '@angular/router/testing'
-import {
-  MAT_DIALOG_DATA,
-  MatDialog,
-  MatDialogRef,
-} from '@angular/material/dialog'
-import { WINDOW_PROVIDERS } from '../../../cdk/window'
-import { PlatformInfoService } from '../../../cdk/platform-info'
-import { ErrorHandlerService } from '../../../core/error-handler/error-handler.service'
-import { SnackbarService } from '../../../cdk/snackbar/snackbar.service'
-import { MatSnackBar } from '@angular/material/snack-bar'
-import { Overlay } from '@angular/cdk/overlay'
-
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'
-
-describe('DialogActionsDuplicatedComponent', () => {
-  let component: DialogActionsDuplicatedComponent
-  let fixture: ComponentFixture<DialogActionsDuplicatedComponent>
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, RouterTestingModule],
-      declarations: [DialogActionsDuplicatedComponent],
-      providers: [
-        { provide: MatDialogRef, useValue: {} },
-        { provide: MAT_DIALOG_DATA, useValue: {} },
-        WINDOW_PROVIDERS,
-        PlatformInfoService,
-        ErrorHandlerService,
-        SnackbarService,
-        MatSnackBar,
-        MatDialog,
-        Overlay,
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents()
-  })
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DialogActionsDuplicatedComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should create', () => {
-    expect(component).toBeTruthy()
-  })
-})
diff --git a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.ts b/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.ts
deleted file mode 100644
index f19876df1b..0000000000
--- a/src/app/account-settings/components/dialog-actions-duplicated/dialog-actions-duplicated.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core'
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
-import { PlatformInfoService } from 'src/app/cdk/platform-info'
-import { DuplicateRemoveEndpoint } from 'src/app/types/account-actions-duplicated'
-@Component({
-  selector: 'app-dialog-actions-duplicated',
-  templateUrl: './dialog-actions-duplicated.component.html',
-  styleUrls: [
-    './dialog-actions-duplicated.component.scss',
-    './dialog-actions-duplicated.component.scss-theme.scss',
-  ],
-  standalone: false,
-})
-export class DialogActionsDuplicatedComponent implements OnInit {
-  isMobile: boolean
-  baseUrl = runtimeEnvironment.BASE_URL
-  constructor(
-    private matRef: MatDialogRef<DialogActionsDuplicatedComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: DuplicateRemoveEndpoint,
-    private _platform: PlatformInfoService
-  ) {}
-
-  ngOnInit(): void {
-    this._platform.get().subscribe((platform) => {
-      this.isMobile = platform.columns4 || platform.columns8
-    })
-  }
-
-  ok() {
-    this.matRef.close(this.data)
-  }
-  cancel() {
-    this.matRef.close(null)
-  }
-}
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
index 3cda8dee92..ab0a1bcae1 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
@@ -1,57 +1,131 @@
 <app-settings-panels-data>
-  <form [formGroup]="form" (ngSubmit)="onSubmit()">
-    <p i18n="@@account.ifYouHaveTwoorMore">
-      If you have two or more ORCID records you can easily remove any unwanted
-      duplicates.
-    </p>
+  <p i18n="@@account.ifYouHaveTwoorMore" class="mb-0 leading-5.25">
+    If you have two or more ORCID records you can easily remove any unwanted
+    duplicates.
+  </p>
+  <p class="mb-4!">
+    <a
+      id="cy-learn-more-about-removing-duplicated"
+      class="underline leading-5.25"
+      href="https://support.orcid.org/hc/en-us/articles/360006896634-Removing-your-additional-or-duplicate-ORCID-iD"
+      rel="noopener noreferrer"
+      target="_blank"
+      i18n="@@account.learnMoreAboutRemovingDuplicates"
+      >Learn more about removing duplicate records</a
+    >
+  </p>
 
-    <label class="row">
-      <strong i18n="@@account.whatHappensWhenIRemove">
-        What happens when I remove a duplicate record?
-      </strong>
-    </label>
+  <app-alert-message class="row mb-8">
+    <h3 title i18n>What happens when you remove a duplicate ORCID account?</h3>
 
-    <ul>
-      <li>
-        <ng-container i18n="@@account.deprecate1">
-          - The email addresses associated with the duplicate record are added
-          to this record</ng-container
-        ><ng-container>
-          ({{ userSession?.userInfo?.EFFECTIVE_USER_ORCID }})</ng-container
-        >
+    <ul content i18n>
+      <li class="list-disc">
+        The email addresses are transferred from the duplicate account to
+        <strong>{{ orcid }}</strong>
       </li>
-      <li i18n="@@account.deprecate2">
-        - All other information is deleted from the duplicate record
+      <li class="list-disc">
+        All information on the duplicate account is permanently deleted
       </li>
     </ul>
+  </app-alert-message>
+  @if (authenticated) {
+  <form [formGroup]="form" (ngSubmit)="onSubmit()">
+    <ng-container *ngIf="data.deprecatingAccountName">
+      <strong
+        >{{ data.deprecatingAccountName }}
+        <a
+          id="cy-deprecating-orcid"
+          class="underline"
+          routerLink="/"
+          +
+          data.deprecatingOrcid
+          rel="noopener noreferrer"
+          target="_blank"
+          >({{ data.deprecatingOrcid }})</a
+        ></strong
+      >
+    </ng-container>
+    <ng-container *ngIf="!data.deprecatingAccountName">
+      <strong
+        ><ng-container i18n="@@account.nameIsPri">Name is private</ng-container>
+        <a
+          id="cy-deprecating-orcid"
+          class="underline"
+          routerLink="/"
+          +
+          data.deprecatingOrcid
+          rel="noopener noreferrer"
+          target="_blank"
+          >{{ data.deprecatingOrcid }}</a
+        ></strong
+      >
+    </ng-container>
+    <div *ngFor="let email of data.deprecatingEmails">{{ email }}</div>
 
-    <p>
-      <a
-        id="cy-learn-more-about-removing-duplicated"
-        class="underline"
-        href="https://support.orcid.org/hc/en-us/articles/360006896634-Removing-your-additional-or-duplicate-ORCID-iD"
-        rel="noopener noreferrer"
-        target="_blank"
-        i18n="@@account.learnMoreAboutRemovingDuplicates"
-        >Learn more about removing duplicate records</a
+    <h2 class="keep">
+      <strong class="orc-font-body-large" i18n="@@account.keepThisRecord"
+        >Keep this record</strong
       >
-    </p>
+    </h2>
 
-    <p i18n="@@account.ifYouHaveDuplicated">
-      If you have more than one duplicate record repeat the process for each
-      record.
-    </p>
+    <ng-container *ngIf="data.primaryAccountName">
+      <strong
+        >{{ data.primaryAccountName }}
+        <a
+          id="cy-primary-orcid"
+          class="underline"
+          routerLink="/"
+          +
+          data.primaryOrcid
+          rel="noopener noreferrer"
+          target="_blank"
+          >({{ data.primaryOrcid }})</a
+        ></strong
+      >
+    </ng-container>
+    <ng-container *ngIf="!data.primaryAccountName">
+      <strong>
+        <a
+          id="cy-primary-orcid"
+          class="underline"
+          routerLink="/"
+          +
+          data.primaryOrcid
+          rel="noopener noreferrer"
+          target="_blank"
+          >{{ data.primaryOrcid }}</a
+        ></strong
+      >
+    </ng-container>
+    <div *ngFor="let email of data.primaryEmails">{{ email }}</div>
 
-    <label class="row form-title">
-      <strong i18n="@@account.removeADuplicatedRecord">
-        Remove a duplicate record
-      </strong>
-    </label>
+    <button
+      mat-raised-button
+      color="warn"
+      (click)="onSubmit()"
+      i18n="@@account.removeDuplicatedRecord"
+      id="cy-remove-duplicate-record"
+    >
+      Remove duplicate record
+    </button>
+  </form>
+  } @else {
+  <form [formGroup]="form" (ngSubmit)="submitVerify()">
+    <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
+    <p i18n class="mb-8!">
+      You will need to verify your sign in details for the duplicate account
+      before it can be removed.
+    </p>
 
-    <label class="row mat-caption">
-      <strong i18n="@@account.duplicateRecordEmail"
-        >Duplicate record email or iD
-      </strong>
+    <label
+      class="row mat-caption"
+      [ngClass]="{
+        error:
+          form.controls.deprecatingOrcidOrEmail?.invalid &&
+          form.controls.deprecatingOrcidOrEmail?.touched
+      }"
+    >
+      <strong i18n>Duplicate account email address or ORCID iD </strong>
     </label>
     <mat-form-field
       appearance="outline"
@@ -62,34 +136,32 @@
         type="text"
         matInput
         autocomplete="email"
+        [errorStateMatcher]="errorMatcher"
         id="cy-duplicate-rercod-email"
       />
-
-      <mat-hint i18n="@@account.duplicatedEmailHint"
-        >The email or iD of the record to be removed
-      </mat-hint>
     </mat-form-field>
 
-    <label class="row mat-caption">
-      <strong i18n="@@account.duplicatedRecordPassword"
-        >Duplicate record password
-      </strong>
+    <label
+      class="row mat-caption"
+      [ngClass]="{
+        error:
+          form.controls.password?.invalid && form.controls.password?.touched
+      }"
+    >
+      <strong i18n>Duplicate account password </strong>
     </label>
     <mat-form-field
       appearance="outline"
-      class="mat-form-field-min input-container"
+      class="mat-form-field-min input-container mb-8"
     >
       <input
-        formControlName="deprecatingPassword"
+        formControlName="password"
         type="password"
         matInput
         autocomplete="password"
+        [errorStateMatcher]="errorMatcher"
         id="cy-duplicate-rercod-email"
       />
-
-      <mat-hint i18n="@@account.duplicatedPasswordHint"
-        >The password for the record to be removed
-      </mat-hint>
     </mat-form-field>
 
     <mat-error *ngFor="let error of errors">{{ error }}</mat-error>
@@ -97,14 +169,14 @@
     <div class="button-container">
       <button
         mat-raised-button
-        color="warn"
-        i18n="@@account.removeDuplicatedRecord"
+        i18n
         type="submit"
-        [disabled]="!this.form.valid"
+        [disabled]="form.invalid"
         class="cy-remove-duplicated-record"
       >
-        Remove duplicate record
+        Verify duplicate account details
       </button>
     </div>
   </form>
+  }
 </app-settings-panels-data>
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
index 4dd2d103dc..0e58e0ef4b 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
@@ -1,3 +1,7 @@
+p {
+  margin: 0;
+}
+
 ul {
   padding-inline-start: 8px;
   li {
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
index f041e5b100..7668918e87 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import {
   UntypedFormBuilder,
   UntypedFormGroup,
@@ -6,14 +6,15 @@ import {
 } from '@angular/forms'
 import { MatDialog } from '@angular/material/dialog'
 import { of, throwError } from 'rxjs'
-import { switchMap, take } from 'rxjs/operators'
+import { switchMap, take, takeUntil } from 'rxjs/operators'
 import { UserService } from 'src/app/core'
 import { AccountActionsDuplicatedService } from 'src/app/core/account-actions-duplicated/account-actions-duplicated.service'
 import { UserSession } from 'src/app/types/session.local'
 
-import { DialogActionsDuplicatedMergedConfirmedComponent } from '../dialog-actions-duplicated-merged-confirmed/dialog-actions-duplicated-merged-confirmed.component'
-import { DialogActionsDuplicatedTwoFactorAuthComponent } from '../dialog-actions-duplicated-two-factor-auth/dialog-actions-duplicated-two-factor-auth.component'
-import { DialogActionsDuplicatedComponent } from '../dialog-actions-duplicated/dialog-actions-duplicated.component'
+import { AuthChallengeComponent } from '@orcid/registry-ui'
+import { AuthChallengeFormData } from '../../../types/common.endpoint'
+import { DuplicateRemoveEndpoint } from '../../../types/account-actions-duplicated'
+import { ErrorStateMatcherForTwoFactorFields } from '../../../sign-in/ErrorStateMatcherForTwoFactorFields'
 
 @Component({
   selector: 'app-settings-actions-duplicated',
@@ -23,6 +24,7 @@ import { DialogActionsDuplicatedComponent } from '../dialog-actions-duplicated/d
   standalone: false,
 })
 export class SettingsActionsDuplicatedComponent implements OnInit {
+  errorMatcher = new ErrorStateMatcherForTwoFactorFields()
   userSession: UserSession
   constructor(
     private _duplicateService: AccountActionsDuplicatedService,
@@ -33,79 +35,125 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
   @Output() loading = new EventEmitter<boolean>()
   @Output() close = new EventEmitter<void>()
 
+  authChallengeLeadingText = $localize`:@@accountSettings.security.password.authChallengeLeadingText:for`
+  authChallengeTrailingText = $localize`:@@accountSettings.security.password.authChallengeDuplicationTrailingText:to continue removing a duplicate account`
+
   form: UntypedFormGroup
   errors: any[]
   showBadRecoveryCode = false
   showBadVerificationCode = false
   show2FA = true
+  authenticated = false
+  cancelAuthentication = false
+  success = false
+  orcid = ''
+  data: DuplicateRemoveEndpoint
 
   ngOnInit(): void {
     this.form = this._form.group({
       deprecatingOrcidOrEmail: ['', Validators.required],
-      deprecatingPassword: ['', Validators.required],
+      password: ['', Validators.required],
+      twoFactorCode: [null, [Validators.minLength(6), Validators.maxLength(6)]],
+      twoFactorRecoveryCode: [
+        null,
+        [Validators.minLength(10), Validators.maxLength(10)],
+      ],
     })
     this._user
       .getUserSession()
       .pipe(take(1))
       .subscribe((userSession) => {
         this.userSession = userSession
+        this.orcid = userSession.userInfo.EFFECTIVE_USER_ORCID
       })
   }
 
-  onSubmit() {
-    this.loading.next(true)
-    this._duplicateService
-      .deprecate(this.form.value)
-      .pipe(
-        switchMap((data) => {
+  openAuthChallenge(orcid: string) {
+    const dialogRef = this._dialog.open<AuthChallengeComponent>(
+      AuthChallengeComponent,
+      {
+        data: {
+          parentForm: this.form,
+          showPasswordField: false,
+          actionDescription: this.authChallengeLeadingText,
+          boldText: orcid,
+          trailingText: this.authChallengeTrailingText,
+        } as AuthChallengeFormData,
+      }
+    )
+
+    dialogRef.componentInstance.submitAttempt
+      .pipe(takeUntil(dialogRef.afterClosed()))
+      .subscribe(() => {
+        this._duplicateService.validateDeprecation(this.form.value).subscribe({
+          next: (response: any) => {
+            if (response.success) {
+              this.data = response
+              dialogRef.close(true)
+            } else {
+              dialogRef.componentInstance.loading = false
+              dialogRef.componentInstance.processBackendResponse(response)
+            }
+          },
+        })
+      })
+
+    dialogRef.afterClosed().subscribe((success) => {
+      if (document.activeElement instanceof HTMLElement) {
+        document.activeElement.blur()
+      }
+      this.form.reset()
+      if (success) {
+        this.authenticated = true
+      } else {
+        this.cancelAuthentication = true
+      }
+    })
+  }
+
+  submitVerify() {
+    if (this.form.valid) {
+      this._duplicateService.validateDeprecation(this.form.value).subscribe({
+        next: (response: any) => {
           this.errors = []
           this.loading.next(false)
-          if (data.errors?.length) {
-            this.errors = data.errors
-            return throwError('error-backend-errors')
-          }
-          if (data.verificationCodeRequired) {
-            return this._dialog
-              .open(DialogActionsDuplicatedTwoFactorAuthComponent, { data })
-              .afterClosed()
-          } else {
-            return of(data)
-          }
-        }),
-        switchMap((data) => {
-          if (data) {
-            return this._dialog
-              .open(DialogActionsDuplicatedComponent, { data })
-              .afterClosed()
-          } else {
-            return throwError('error-2FA-fail')
-          }
-        }),
-        switchMap((data) => {
-          if (data) {
-            this.loading.next(true)
-            return this._duplicateService.confirmDeprecate(data)
+          if (response.success) {
+            this.data = response
+            this.authenticated = true
           } else {
-            return throwError('error-user-cancelled')
+            if (response.errors?.length) {
+              this.errors = response.errors
+            } else if (response.twoFactorEnabled) {
+              this.openAuthChallenge(response.deprecatingOrcid)
+            }
           }
-        }),
-        switchMap((data) => {
-          this.loading.next(false)
-          return this._dialog
-            .open(DialogActionsDuplicatedMergedConfirmedComponent, {
-              data,
-            })
-            .afterClosed()
-        })
-      )
-      .subscribe(
-        (value) => {
-          this.loading.next(false)
-          this.close.next()
         },
-        (error) => {
-          this.loading.next(false)
+      })
+    }
+  }
+
+  onSubmit() {
+    this.loading.next(true)
+    this._duplicateService.confirmDeprecate(this.data).subscribe({
+      next: (data: DuplicateRemoveEndpoint) => {
+        this.loading.next(false)
+        this.authenticated = false
+
+        if (data.success) {
+          this.errors = []
+          this.form.reset()
+          this.success = true
+        }
+        if (data.errors?.length) {
+          this.errors = data.errors
+          this.cancelAuthentication = true
         }
-      )
+      },
+      error: () => {
+        this.cancelAuthentication = true
+        this.form.reset()
+        this.loading.next(false)
+      },
+    })
   }
 }
diff --git a/src/app/account-settings/components/settings-actions/settings-actions.component.ts b/src/app/account-settings/components/settings-actions/settings-actions.component.ts
index 3f0b8662b8..7536e3989e 100644
--- a/src/app/account-settings/components/settings-actions/settings-actions.component.ts
+++ b/src/app/account-settings/components/settings-actions/settings-actions.component.ts
@@ -2,6 +2,8 @@ import { Component, Inject, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { set } from 'lodash'
 import { WINDOW } from 'src/app/cdk/window'
+import { TwoFactorAuthenticationService } from '../../../core/two-factor-authentication/two-factor-authentication.service'
+import { first } from 'rxjs'
 
 @Component({
   selector: 'app-settings-actions',
@@ -14,6 +16,7 @@ export class SettingsActionsComponent implements OnInit {
   titleDuplicatedRecord = $localize`:@@account.removeDuplicate:Remove a duplicate record`
   titleDeactivate = $localize`:@@account.deactivateYourOrcidAccount:Deactivate your ORCID account`
 
+  twoFactorState = false
   settingDownload = false
   settingDuplicatedRecord = false
   settingDeactivate = false
diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.ts b/src/app/authorize/components/form-authorize/form-authorize.component.ts
index b6b7ca0425..3d0463d582 100644
--- a/src/app/authorize/components/form-authorize/form-authorize.component.ts
+++ b/src/app/authorize/components/form-authorize/form-authorize.component.ts
@@ -345,12 +345,6 @@ export class FormAuthorizeComponent implements OnInit, OnDestroy {
   }
 
   changeAccount(delegator: Delegator) {
-    this._observability.recordSimpleEvent(
-      AppEventName.OauthAuthorizeSwitchDelegatedAccount,
-      {
-        approval_date: delegator?.approvalDate,
-      }
-    )
     this.loadingTrustedIndividuals = true
     this.loadingUserInfo = true
 
diff --git a/src/app/core/account-actions-duplicated/account-actions-duplicated.service.ts b/src/app/core/account-actions-duplicated/account-actions-duplicated.service.ts
index c25eb79b18..6b36f80bfb 100644
--- a/src/app/core/account-actions-duplicated/account-actions-duplicated.service.ts
+++ b/src/app/core/account-actions-duplicated/account-actions-duplicated.service.ts
@@ -35,7 +35,7 @@ export class AccountActionsDuplicatedService {
       )
   }
 
-  deprecate(
+  validateDeprecation(
     account: DuplicateRemoveEndpoint
   ): Observable<DuplicateRemoveEndpoint> {
     return this._http
diff --git a/src/app/types/account-actions-duplicated.ts b/src/app/types/account-actions-duplicated.ts
index 5c9ecfe048..fa2bedca16 100644
--- a/src/app/types/account-actions-duplicated.ts
+++ b/src/app/types/account-actions-duplicated.ts
@@ -1,4 +1,6 @@
-export interface DuplicateRemoveEndpoint {
+import { AuthChallenge } from './common.endpoint'
+
+export interface DuplicateRemoveEndpoint extends AuthChallenge {
   deprecatingEmails?: string[]
   deprecatingPassword: string
   errors?: any[]

From 64dd288174e036174eb9a2acb32ee4d0c94838ec Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 5 May 2026 20:52:19 +0300
Subject: [PATCH 2/2] PD-5112 update deprecation process

---
 ...settings-actions-duplicated.component.html | 132 +++++++-----------
 ...settings-actions-duplicated.component.scss |   1 -
 ...tions-duplicated.component.scss-theme.scss |  26 ++++
 .../settings-actions-duplicated.component.ts  |  42 +++++-
 src/app/types/account-actions-duplicated.ts   |   1 +
 5 files changed, 116 insertions(+), 86 deletions(-)
 create mode 100644 src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss-theme.scss

diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
index ab0a1bcae1..483a7972ca 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.html
@@ -1,4 +1,28 @@
 <app-settings-panels-data>
+  @if (success) {
+  <app-alert-message type="success" class="mb-4.5">
+    <h4 title i18n>Duplicate account removed</h4>
+    <p
+      content
+      class="mt-0.5"
+      i18n="
+        successful deprecation message|orcidToDeprecate=accound id that was
+        deprecated
+      "
+    >
+      <span>The record</span>&nbsp;<strong>{{ orcidToDeprecate }}</strong
+      >&nbsp;<span>has been deprecated.</span>
+    </p>
+  </app-alert-message>
+  } @if (cancelAuthentication) {
+  <app-alert-message type="warning" class="mb-4.5">
+    <h4 title i18n>Duplicate account not removed</h4>
+    <p content class="mt-0.5" i18n>
+      We could not verify your ORCID account details. The duplicate record has
+      not been deprecated.
+    </p>
+  </app-alert-message>
+  }
   <p i18n="@@account.ifYouHaveTwoorMore" class="mb-0 leading-5.25">
     If you have two or more ORCID records you can easily remove any unwanted
     duplicates.
@@ -16,97 +40,45 @@
   </p>
 
   <app-alert-message class="row mb-8">
-    <h3 title i18n>What happens when you remove a duplicate ORCID account?</h3>
+    <h4 title i18n>What happens when you remove a duplicate ORCID account?</h4>
 
     <ul content i18n>
-      <li class="list-disc">
+      <li class="list-disc!">
         The email addresses are transferred from the duplicate account to
         <strong>{{ orcid }}</strong>
       </li>
-      <li class="list-disc">
+      <li class="list-disc!">
         All information on the duplicate account is permanently deleted
       </li>
     </ul>
   </app-alert-message>
   @if (authenticated) {
   <form [formGroup]="form" (ngSubmit)="onSubmit()">
-    <ng-container *ngIf="data.deprecatingAccountName">
-      <strong
-        >{{ data.deprecatingAccountName }}
-        <a
-          id="cy-deprecating-orcid"
-          class="underline"
-          routerLink="/"
-          +
-          data.deprecatingOrcid
-          rel="noopener noreferrer"
-          target="_blank"
-          >({{ data.deprecatingOrcid }})</a
-        ></strong
-      >
-    </ng-container>
-    <ng-container *ngIf="!data.deprecatingAccountName">
-      <strong
-        ><ng-container i18n="@@account.nameIsPri">Name is private</ng-container>
-        <a
-          id="cy-deprecating-orcid"
-          class="underline"
-          routerLink="/"
-          +
-          data.deprecatingOrcid
-          rel="noopener noreferrer"
-          target="_blank"
-          >{{ data.deprecatingOrcid }}</a
-        ></strong
-      >
-    </ng-container>
-    <div *ngFor="let email of data.deprecatingEmails">{{ email }}</div>
-
-    <h2 class="keep">
-      <strong class="orc-font-body-large" i18n="@@account.keepThisRecord"
-        >Keep this record</strong
-      >
-    </h2>
-
-    <ng-container *ngIf="data.primaryAccountName">
-      <strong
-        >{{ data.primaryAccountName }}
-        <a
-          id="cy-primary-orcid"
-          class="underline"
-          routerLink="/"
-          +
-          data.primaryOrcid
-          rel="noopener noreferrer"
-          target="_blank"
-          >({{ data.primaryOrcid }})</a
-        ></strong
-      >
-    </ng-container>
-    <ng-container *ngIf="!data.primaryAccountName">
-      <strong>
-        <a
-          id="cy-primary-orcid"
-          class="underline"
-          routerLink="/"
-          +
-          data.primaryOrcid
-          rel="noopener noreferrer"
-          target="_blank"
-          >{{ data.primaryOrcid }}</a
-        ></strong
-      >
-    </ng-container>
-    <div *ngFor="let email of data.primaryEmails">{{ email }}</div>
+    <h3 i18n class="mb-2 mt-0">You are removing this duplicate account</h3>
+    @if (data.deprecatingAccountName) {
+    <p class="leading-5.25">{{ data.deprecatingAccountName }}</p>
+    } @else {
+    <p class="leading-5.25" i18n="@@account.nameIsPri">Name is private</p>
+    }
+    <p class="mb-6! leading-5.25">
+      https:{{ baseUrl + data.deprecatingOrcid }}
+    </p>
 
+    <strong i18n class="leading-5.25"
+      >Email addresses to be transferred to this account</strong
+    >&nbsp;<strong>({{ orcid }})</strong>
+    <div class="mb-6!">{{ data.deprecatingEmails?.join(', ') }}</div>
+    <em class="block mb-8!" i18n
+      >All other information on this account will be permanently deleted.</em
+    >
     <button
       mat-raised-button
       color="warn"
-      (click)="onSubmit()"
-      i18n="@@account.removeDuplicatedRecord"
+      type="submit"
+      i18n
       id="cy-remove-duplicate-record"
     >
-      Remove duplicate record
+      Remove duplicate account
     </button>
   </form>
   } @else {
@@ -129,7 +101,8 @@ <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
     </label>
     <mat-form-field
       appearance="outline"
-      class="mat-form-field-min input-container"
+      subscriptSizing="dynamic"
+      class="mat-form-field-min input-container mb-6!"
     >
       <input
         formControlName="deprecatingOrcidOrEmail"
@@ -152,7 +125,8 @@ <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
     </label>
     <mat-form-field
       appearance="outline"
-      class="mat-form-field-min input-container mb-8"
+      subscriptSizing="dynamic"
+      class="mat-form-field-min input-container mb-8!"
     >
       <input
         formControlName="password"
@@ -164,14 +138,16 @@ <h3 i18n class="mt-0 mb-2">Which account do you want to remove?</h3>
       />
     </mat-form-field>
 
-    <mat-error *ngFor="let error of errors">{{ error }}</mat-error>
+    <mat-error class="mb-4! -mt-2!" *ngFor="let error of errors">{{
+      error
+    }}</mat-error>
 
     <div class="button-container">
       <button
         mat-raised-button
         i18n
         type="submit"
-        [disabled]="form.invalid"
+        [disabled]="form.invalid || loadingVerify"
         class="cy-remove-duplicated-record"
       >
         Verify duplicate account details
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
index 0e58e0ef4b..325a40944c 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss
@@ -11,7 +11,6 @@ ul {
 .button-container {
   display: flex;
   align-items: row;
-  margin-top: 16px;
 }
 
 :host {
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss-theme.scss b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss-theme.scss
new file mode 100644
index 0000000000..b914d81aab
--- /dev/null
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.scss-theme.scss
@@ -0,0 +1,26 @@
+@use '@angular/material' as mat;
+@import 'src/assets/scss/material.orcid-theme.scss';
+
+@mixin settings-actions-duplicated($theme) {
+  $primary: map-get($theme, primary);
+  $accent: map-get($theme, accent);
+  $warn: map-get($theme, accent);
+  $foreground: map-get($theme, foreground);
+  $background: map-get($theme, background);
+
+  .cy-remove-duplicated-record {
+    background: $brand-secondary-dark !important;
+    color: white !important;
+  }
+
+  .cy-remove-duplicated-record[disabled] {
+    opacity: 30%;
+  }
+
+  #cy-remove-duplicate-record {
+    background-color: $state-warning-darkest !important;
+    color: white !important;
+  }
+}
+
+@include settings-actions-duplicated($orcid-app-theme);
diff --git a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
index 7668918e87..e75d6b4e4b 100644
--- a/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
+++ b/src/app/account-settings/components/settings-actions-duplicated/settings-actions-duplicated.component.ts
@@ -1,6 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import {
+  FormGroupDirective,
+  NgForm,
   UntypedFormBuilder,
+  UntypedFormControl,
   UntypedFormGroup,
   Validators,
 } from '@angular/forms'
@@ -15,16 +18,27 @@ import { AuthChallengeComponent } from '@orcid/registry-ui'
 import { AuthChallengeFormData } from '../../../types/common.endpoint'
 import { DuplicateRemoveEndpoint } from '../../../types/account-actions-duplicated'
 import { ErrorStateMatcherForTwoFactorFields } from '../../../sign-in/ErrorStateMatcherForTwoFactorFields'
-
+import { ErrorStateMatcher } from '@angular/material/core'
+export class NeverShowErrorMatcher implements ErrorStateMatcher {
+  isErrorState(
+    control: UntypedFormControl | null,
+    form: FormGroupDirective | NgForm | null
+  ): boolean {
+    return false
+  }
+}
 @Component({
   selector: 'app-settings-actions-duplicated',
   templateUrl: './settings-actions-duplicated.component.html',
-  styleUrls: ['./settings-actions-duplicated.component.scss'],
+  styleUrls: [
+    './settings-actions-duplicated.component.scss',
+    './settings-actions-duplicated.component.scss-theme.scss',
+  ],
   preserveWhitespaces: true,
   standalone: false,
 })
 export class SettingsActionsDuplicatedComponent implements OnInit {
-  errorMatcher = new ErrorStateMatcherForTwoFactorFields()
+  errorMatcher = new NeverShowErrorMatcher()
   userSession: UserSession
   constructor(
     private _duplicateService: AccountActionsDuplicatedService,
@@ -44,10 +58,13 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
   showBadVerificationCode = false
   show2FA = true
   authenticated = false
+  loadingVerify = false
   cancelAuthentication = false
   success = false
+  orcidToDeprecate = ''
   orcid = ''
   data: DuplicateRemoveEndpoint
+  baseUrl = runtimeEnvironment.BASE_URL
 
   ngOnInit(): void {
     this.form = this._form.group({
@@ -68,7 +85,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
       })
   }
 
-  openAuthChallenge(orcid: string) {
+  openAuthChallenge(orcidOrEmail: string) {
     const dialogRef = this._dialog.open<AuthChallengeComponent>(
       AuthChallengeComponent,
       {
@@ -76,7 +93,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
           parentForm: this.form,
           showPasswordField: false,
           actionDescription: this.authChallengeLeadingText,
-          boldText: orcid,
+          boldText: orcidOrEmail,
           trailingText: this.authChallengeTrailingText,
         } as AuthChallengeFormData,
       }
@@ -88,6 +105,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
         this._duplicateService.validateDeprecation(this.form.value).subscribe({
           next: (response: any) => {
             if (response.success) {
+              this.orcidToDeprecate = response.deprecatingOrcid
               this.data = response
               dialogRef.close(true)
             } else {
@@ -102,6 +120,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
       if (document.activeElement instanceof HTMLElement) {
         document.activeElement.blur()
       }
+      this.loadingVerify = false
       this.form.reset()
       if (success) {
         this.authenticated = true
@@ -113,21 +132,30 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
 
   submitVerify() {
     if (this.form.valid) {
+      this.cancelAuthentication = false
+      this.success = false
+      this.loadingVerify = true
       this._duplicateService.validateDeprecation(this.form.value).subscribe({
         next: (response: any) => {
           this.errors = []
           this.loading.next(false)
           if (response.success) {
+            this.loadingVerify = false
+            this.orcidToDeprecate = response.deprecatingOrcid
             this.data = response
             this.authenticated = true
           } else {
             if (response.errors?.length) {
+              this.loadingVerify = false
               this.errors = response.errors
             } else if (response.twoFactorEnabled) {
-              this.openAuthChallenge(response.deprecatingOrcid)
+              this.openAuthChallenge(response.deprecatingOrcidOrEmail)
             }
           }
         },
+        error: () => {
+          this.loadingVerify = false
+        },
       })
     }
   }
@@ -144,7 +172,7 @@ export class SettingsActionsDuplicatedComponent implements OnInit {
           this.form.reset()
           this.success = true
         }
-        if (data.errors?.length) {
+        if (data.errors?.length || !data.twoFactorToken) {
           this.errors = data.errors
           this.cancelAuthentication = true
         }
diff --git a/src/app/types/account-actions-duplicated.ts b/src/app/types/account-actions-duplicated.ts
index fa2bedca16..a72c4560be 100644
--- a/src/app/types/account-actions-duplicated.ts
+++ b/src/app/types/account-actions-duplicated.ts
@@ -10,5 +10,6 @@ export interface DuplicateRemoveEndpoint extends AuthChallenge {
   primaryEmails?: string[]
   primaryOrcid?: string
   primaryAccountName?: string
+  twoFactorToken?: string
   verificationCodeRequired?: boolean
 }