From 69f40293bb082cb6f9ea69bda8a5e255277a815c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 11 Oct 2025 10:38:58 +0200
Subject: [PATCH] Refactoring

---
 .../pages/portfolio/fire/fire-page.component.ts    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
index 636f2c51d..63187c05c 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
@@ -91,6 +91,12 @@ export class GfFirePageComponent implements OnDestroy, OnInit {
         this.hasImpersonationId = !!impersonationId;
       });
 
+    this.safeWithdrawalRateControl.valueChanges
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((value) => {
+        this.onSafeWithdrawalRateChange(Number(value));
+      });
+
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((state) => {
@@ -115,14 +121,6 @@ export class GfFirePageComponent implements OnDestroy, OnInit {
           this.changeDetectorRef.markForCheck();
         }
       });
-
-    this.safeWithdrawalRateControl.valueChanges
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((value: number) => {
-        if (!this.safeWithdrawalRateControl.disabled) {
-          this.onSafeWithdrawalRateChange(Number(value));
-        }
-      });
   }
 
   public onAnnualInterestRateChange(annualInterestRate: number) {