From ea811f87c0a39b60358636c8221229228fbea52e Mon Sep 17 00:00:00 2001
From: David Requeno <davidrequeno52@gmail.com>
Date: Sun, 7 Jun 2026 23:00:12 -0600
Subject: [PATCH] Fix account balance form prefill

---
 .../account-balances.component.ts             | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/libs/ui/src/lib/account-balances/account-balances.component.ts b/libs/ui/src/lib/account-balances/account-balances.component.ts
index 1a3082066..503f84071 100644
--- a/libs/ui/src/lib/account-balances/account-balances.component.ts
+++ b/libs/ui/src/lib/account-balances/account-balances.component.ts
@@ -13,6 +13,7 @@ import {
   OnChanges,
   OnInit,
   Output,
+  effect,
   inject,
   input,
   viewChild
@@ -90,6 +91,17 @@ export class GfAccountBalancesComponent implements OnChanges, OnInit {
 
   public constructor() {
     addIcons({ calendarClearOutline, ellipsisHorizontal, trashOutline });
+
+    effect(() => {
+      const currentBalance = this.currentBalance();
+
+      if (
+        this.accountBalanceForm.controls.balance.pristine &&
+        typeof currentBalance === 'number'
+      ) {
+        this.accountBalanceForm.controls.balance.setValue(currentBalance);
+      }
+    });
   }
 
   public ngOnInit() {
@@ -103,8 +115,6 @@ export class GfAccountBalancesComponent implements OnChanges, OnInit {
       this.dataSource.sort = this.sort();
       this.dataSource.sortingDataAccessor = get;
     }
-
-    this.prefillAccountBalanceForm();
   }
 
   public onDeleteAccountBalance(aId: string) {
@@ -143,17 +153,4 @@ export class GfAccountBalancesComponent implements OnChanges, OnInit {
 
     this.accountBalanceCreated.emit(accountBalance);
   }
-
-  private prefillAccountBalanceForm() {
-    const currentBalance = this.currentBalance();
-
-    if (
-      typeof currentBalance !== 'number' ||
-      !this.accountBalanceForm.controls.balance.pristine
-    ) {
-      return;
-    }
-
-    this.accountBalanceForm.patchValue({ balance: currentBalance });
-  }
 }