From 1fd52727eaffdcfc1f438d33bb2a9fac7f36b4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vi=CC=81ctor=20Falco=CC=81n?= <victoor89@gmail.com>
Date: Fri, 26 Jun 2026 19:51:45 +0200
Subject: [PATCH] feat(transactions): refine new transaction form layout and
 balance toggle

- Move the account selector to the top of the create form
- Hide the "Update account balance" checkbox for connected accounts and
  skip the balance update on submit for them
- Show a -25.00 placeholder in the amount field
---
 .../edit-transaction-dialog.test.tsx          |  26 ++++
 .../transactions/edit-transaction-dialog.tsx  | 117 ++++++++++--------
 2 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/resources/js/components/transactions/edit-transaction-dialog.test.tsx b/resources/js/components/transactions/edit-transaction-dialog.test.tsx
index bd4fcccb..d4814261 100644
--- a/resources/js/components/transactions/edit-transaction-dialog.test.tsx
+++ b/resources/js/components/transactions/edit-transaction-dialog.test.tsx
@@ -222,9 +222,35 @@ describe('EditTransactionDialog', () => {
                 onOpenChange={vi.fn()}
                 onSuccess={vi.fn()}
                 mode="create"
+                initialAccountId="account-1"
             />,
         );
 
         expect(screen.getByRole('checkbox')).toBeChecked();
     });
+
+    it('hides "update account balance" for a connected account', () => {
+        const connectedAccount = {
+            ...checkingAccount,
+            id: 'account-connected',
+            banking_connection_id: 'connection-1',
+        };
+
+        render(
+            <EditTransactionDialog
+                transaction={null}
+                categories={[]}
+                accounts={[connectedAccount]}
+                banks={[]}
+                labels={[]}
+                open
+                onOpenChange={vi.fn()}
+                onSuccess={vi.fn()}
+                mode="create"
+                initialAccountId="account-connected"
+            />,
+        );
+
+        expect(screen.queryByRole('checkbox')).not.toBeInTheDocument();
+    });
 });
diff --git a/resources/js/components/transactions/edit-transaction-dialog.tsx b/resources/js/components/transactions/edit-transaction-dialog.tsx
index 9a88590f..1dcf4f9f 100644
--- a/resources/js/components/transactions/edit-transaction-dialog.tsx
+++ b/resources/js/components/transactions/edit-transaction-dialog.tsx
@@ -354,7 +354,11 @@ export function EditTransactionDialog({
                                 ? finalLabelIds
                                 : undefined,
                     },
-                    { updateBalance: updateAccountBalance },
+                    {
+                        updateBalance: selectedAccount.banking_connection_id
+                            ? false
+                            : updateAccountBalance,
+                    },
                 );
 
                 const updatedCategory = finalCategoryId
@@ -523,6 +527,42 @@ export function EditTransactionDialog({
 
                 <form onSubmit={handleSubmit}>
                     <div className="space-y-4 py-4">
+                        {mode === 'create' && (
+                            <div className="space-y-2">
+                                <FormLabel htmlFor="account">
+                                    {__('Account')}
+                                </FormLabel>
+                                <Select
+                                    value={accountId}
+                                    onValueChange={setAccountId}
+                                    disabled={isSubmitting}
+                                >
+                                    <SelectTrigger
+                                        id="account"
+                                        data-testid="account-select"
+                                    >
+                                        <SelectValue
+                                            placeholder={__('Select account')}
+                                        />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        {transactionalAccounts.map(
+                                            (account) => (
+                                                <SelectItem
+                                                    key={account.id}
+                                                    value={String(account.id)}
+                                                >
+                                                    {decryptedAccountNames.get(
+                                                        account.id,
+                                                    ) || __('[Loading...]')}
+                                                </SelectItem>
+                                            ),
+                                        )}
+                                    </SelectContent>
+                                </Select>
+                            </div>
+                        )}
+
                         <div className="space-y-2">
                             <FormLabel
                                 htmlFor="date"
@@ -683,29 +723,32 @@ export function EditTransactionDialog({
                                             selectedAccount?.currency_code ||
                                             'USD'
                                         }
+                                        placeholder="-25.00"
                                         disabled={isSubmitting}
                                         required
                                     />
 
-                                    <div className="flex items-center gap-2">
-                                        <Checkbox
-                                            id="update-balance"
-                                            checked={updateAccountBalance}
-                                            onCheckedChange={(checked) =>
-                                                handleUpdateBalanceChange(
-                                                    checked === true,
-                                                )
-                                            }
-                                            disabled={isSubmitting}
-                                        />
+                                    {!selectedAccount?.banking_connection_id && (
+                                        <div className="flex items-center gap-2">
+                                            <Checkbox
+                                                id="update-balance"
+                                                checked={updateAccountBalance}
+                                                onCheckedChange={(checked) =>
+                                                    handleUpdateBalanceChange(
+                                                        checked === true,
+                                                    )
+                                                }
+                                                disabled={isSubmitting}
+                                            />
 
-                                        <FormLabel
-                                            htmlFor="update-balance"
-                                            className="cursor-pointer font-normal"
-                                        >
-                                            {__('Update account balance')}
-                                        </FormLabel>
-                                    </div>
+                                            <FormLabel
+                                                htmlFor="update-balance"
+                                                className="cursor-pointer font-normal"
+                                            >
+                                                {__('Update account balance')}
+                                            </FormLabel>
+                                        </div>
+                                    )}
                                 </>
                             ) : (
                                 <div className="text-sm font-medium">
@@ -720,42 +763,6 @@ export function EditTransactionDialog({
                             )}
                         </div>
 
-                        {mode === 'create' && (
-                            <div className="space-y-2">
-                                <FormLabel htmlFor="account">
-                                    {__('Account')}
-                                </FormLabel>
-                                <Select
-                                    value={accountId}
-                                    onValueChange={setAccountId}
-                                    disabled={isSubmitting}
-                                >
-                                    <SelectTrigger
-                                        id="account"
-                                        data-testid="account-select"
-                                    >
-                                        <SelectValue
-                                            placeholder={__('Select account')}
-                                        />
-                                    </SelectTrigger>
-                                    <SelectContent>
-                                        {transactionalAccounts.map(
-                                            (account) => (
-                                                <SelectItem
-                                                    key={account.id}
-                                                    value={String(account.id)}
-                                                >
-                                                    {decryptedAccountNames.get(
-                                                        account.id,
-                                                    ) || __('[Loading...]')}
-                                                </SelectItem>
-                                            ),
-                                        )}
-                                    </SelectContent>
-                                </Select>
-                            </div>
-                        )}
-
                         <div className="space-y-2">
                             <FormLabel htmlFor="category">
                                 {__('Category')}