From 13fa5085bf15d7c5f19227d3c68cf99d7120615a Mon Sep 17 00:00:00 2001
From: Isaac Ivins <iivins@livefront.com>
Date: Tue, 3 Feb 2026 15:47:42 -0500
Subject: [PATCH] updated try/cache, toast, and FF placement

---
 .../src/auth/delete-account.component.html    |  6 ++--
 .../src/auth/delete-account.component.ts      | 28 +++++++++++--------
 libs/common/src/enums/feature-flag.enum.ts    |  9 ------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/apps/desktop/src/auth/delete-account.component.html b/apps/desktop/src/auth/delete-account.component.html
index 33bc7f4c92d..9136b1de486 100644
--- a/apps/desktop/src/auth/delete-account.component.html
+++ b/apps/desktop/src/auth/delete-account.component.html
@@ -21,10 +21,10 @@
             name="verification"
           ></app-user-verification>
         </div>
+        <div id="confirmIdentityHelp">
+          <p>{{ "confirmIdentity" | i18n }}</p>
+        </div>
       }
-      <div id="confirmIdentityHelp">
-        <p>{{ "confirmIdentity" | i18n }}</p>
-      </div>
     </div>
     <ng-container bitDialogFooter>
       <button bitButton bitFormButton type="submit" buttonType="danger" [disabled]="!secret">
diff --git a/apps/desktop/src/auth/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts
index e449fb390b2..9d4e176b8ee 100644
--- a/apps/desktop/src/auth/delete-account.component.ts
+++ b/apps/desktop/src/auth/delete-account.component.ts
@@ -72,10 +72,18 @@ export class DeleteAccountComponent {
   }
 
   submit = async () => {
+    if (!this.migrationMilestone4()) {
+      const verification = this.deleteForm.get("verification").value;
+      await this.accountApiService.deleteAccount(verification);
+      this.toastService.showToast({
+        variant: "success",
+        title: this.i18nService.t("accountDeleted"),
+        message: this.i18nService.t("accountDeletedDesc"),
+      });
+      return;
+    }
     try {
-      if (this.migrationMilestone4()) {
-        this.invalidSecret.set(false);
-      }
+      this.invalidSecret.set(false);
       const verification = this.deleteForm.get("verification").value;
       await this.accountApiService.deleteAccount(verification);
       this.toastService.showToast({
@@ -84,14 +92,12 @@ export class DeleteAccountComponent {
         message: this.i18nService.t("accountDeletedDesc"),
       });
     } catch {
-      if (this.migrationMilestone4()) {
-        this.invalidSecret.set(true);
-        this.toastService.showToast({
-          variant: "error",
-          title: this.i18nService.t("errorOccurred"),
-          message: this.i18nService.t("userVerificationFailed"),
-        });
-      }
+      this.invalidSecret.set(true);
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("userVerificationFailed"),
+      });
     }
   };
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 82c8aabf4bf..e9fd1628ff9 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -196,15 +196,6 @@ export function getFeatureFlagValue<Flag extends FeatureFlag>(
   serverConfig: ServerConfig | null,
   flag: Flag,
 ) {
-  if (
-    flag === FeatureFlag.DesktopUiMigrationMilestone1 ||
-    flag === FeatureFlag.DesktopUiMigrationMilestone2 ||
-    flag === FeatureFlag.DesktopUiMigrationMilestone3 ||
-    flag === FeatureFlag.DesktopUiMigrationMilestone4
-  ) {
-    // Desktop milestone flags are only read from the server config during desktop app runtime.
-    return true;
-  }
   if (serverConfig?.featureStates == null || serverConfig.featureStates[flag] == null) {
     return DefaultFeatureFlagValue[flag];
   }