From ed0f198ffe764caf8198e9259d5e23daa4e92f83 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Wed, 21 May 2025 15:05:52 -0700
Subject: [PATCH] [PM-18721] revert submit/disabled handling

---
 ...ency-access-takeover-dialog.component.html | 19 ++-----------------
 ...rgency-access-takeover-dialog.component.ts | 18 +-----------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
index a5be649c06f..5bc10fcbe1f 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
@@ -17,23 +17,8 @@
   </div>
 
   <ng-container bitDialogFooter>
-    <button
-      class="tw-relative"
-      type="button"
-      bitButton
-      buttonType="primary"
-      [disabled]="submitting"
-      (click)="handlePrimaryButtonClick()"
-    >
-      <span
-        [ngClass]="{ 'tw-invisible': !submitting }"
-        class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center"
-      >
-        <i class="bwi bwi-spinner bwi-lg bwi-spin" aria-hidden="true"></i>
-      </span>
-      <span [ngClass]="{ 'tw-invisible': submitting }">
-        {{ "save" | i18n }}
-      </span>
+    <button type="button" bitButton buttonType="primary" (click)="handlePrimaryButtonClick()">
+      {{ "save" | i18n }}
     </button>
     <button type="button" bitButton buttonType="secondary" bitDialogClose>
       {{ "cancel" | i18n }}
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
index 9506ce1ca61..dd31502f405 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
@@ -67,8 +67,6 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
 
   inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
   masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
-  receivedPasswordInputResult = false;
-  submitting = false;
 
   constructor(
     @Inject(DIALOG_DATA) protected dialogData: EmergencyAccessTakeoverDialogData,
@@ -93,24 +91,10 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
   }
 
   protected handlePrimaryButtonClick = async () => {
-    try {
-      this.submitting = true;
-      await this.inputPasswordComponent.submit();
-    } catch {
-      // Flip to false if submit() throws an error
-      this.submitting = false;
-    }
-
-    // Flip to false if submit() returns early without a PasswordInputResult
-    // emission due to form validation errors or new password doesn't meet org policy reqs.
-    if (!this.receivedPasswordInputResult) {
-      this.submitting = false;
-    }
+    await this.inputPasswordComponent.submit();
   };
 
   protected async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
-    this.receivedPasswordInputResult = Boolean(passwordInputResult);
-
     try {
       await this.emergencyAccessService.takeover(
         this.dialogData.emergencyAccessId,