From 49e7afb0ab37a07e3be1e600301f9b251b5a1627 Mon Sep 17 00:00:00 2001
From: Padreug <padreug@aiolabs.dev>
Date: Thu, 25 Jun 2026 22:16:44 +0200
Subject: [PATCH 1/4] feat(libra): put Amount and Currency on the same row

Wrap the Amount and Currency fields in a two-column grid on both the
expense (AddExpense.vue) and income (AddIncome.vue) forms, and add
w-full to the currency SelectTrigger so the dropdown fills its column.
Tightens the vertical layout of the entry dialogs.
---
 src/accounting-app/views/AddIncome.vue        | 70 +++++++-------
 .../expenses/components/AddExpense.vue        | 91 ++++++++++---------
 2 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/src/accounting-app/views/AddIncome.vue b/src/accounting-app/views/AddIncome.vue
index a0dabf2..2c3254b 100644
--- a/src/accounting-app/views/AddIncome.vue
+++ b/src/accounting-app/views/AddIncome.vue
@@ -106,42 +106,44 @@
                 </FormItem>
               </FormField>
 
-              <FormField v-slot="{ componentField }" name="amount">
-                <FormItem>
-                  <FormLabel>Amount *</FormLabel>
-                  <FormControl>
-                    <Input
-                      type="number"
-                      placeholder="0.00"
-                      v-bind="componentField"
-                      min="0.01"
-                      step="0.01"
-                    />
-                  </FormControl>
-                  <FormDescription>Amount in selected currency</FormDescription>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
-
-              <FormField v-slot="{ componentField }" name="currency">
-                <FormItem>
-                  <FormLabel>Currency *</FormLabel>
-                  <Select v-bind="componentField">
+              <div class="grid grid-cols-2 gap-4">
+                <FormField v-slot="{ componentField }" name="amount">
+                  <FormItem>
+                    <FormLabel>Amount *</FormLabel>
                     <FormControl>
-                      <SelectTrigger>
-                        <SelectValue placeholder="Select currency" />
-                      </SelectTrigger>
+                      <Input
+                        type="number"
+                        placeholder="0.00"
+                        v-bind="componentField"
+                        min="0.01"
+                        step="0.01"
+                      />
                     </FormControl>
-                    <SelectContent>
-                      <SelectItem v-for="currency in availableCurrencies" :key="currency" :value="currency">
-                        {{ currency }}
-                      </SelectItem>
-                    </SelectContent>
-                  </Select>
-                  <FormDescription>Currency for this income</FormDescription>
-                  <FormMessage />
-                </FormItem>
-              </FormField>
+                    <FormDescription>Amount in selected currency</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                </FormField>
+
+                <FormField v-slot="{ componentField }" name="currency">
+                  <FormItem>
+                    <FormLabel>Currency *</FormLabel>
+                    <Select v-bind="componentField">
+                      <FormControl>
+                        <SelectTrigger class="w-full">
+                          <SelectValue placeholder="Select currency" />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        <SelectItem v-for="currency in availableCurrencies" :key="currency" :value="currency">
+                          {{ currency }}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                    <FormDescription>Currency for this income</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                </FormField>
+              </div>
 
               <FormField v-slot="{ componentField }" name="reference">
                 <FormItem>
diff --git a/src/modules/expenses/components/AddExpense.vue b/src/modules/expenses/components/AddExpense.vue
index d5f4322..37be23d 100644
--- a/src/modules/expenses/components/AddExpense.vue
+++ b/src/modules/expenses/components/AddExpense.vue
@@ -113,52 +113,55 @@
             </FormItem>
           </FormField>
 
-          <!-- Amount -->
-          <FormField v-slot="{ componentField }" name="amount">
-            <FormItem>
-              <FormLabel>Amount *</FormLabel>
-              <FormControl>
-                <Input
-                  type="number"
-                  placeholder="0.00"
-                  v-bind="componentField"
-                  min="0.01"
-                  step="0.01"
-                />
-              </FormControl>
-              <FormDescription>
-                Amount in selected currency
-              </FormDescription>
-              <FormMessage />
-            </FormItem>
-          </FormField>
-
-          <!-- Currency -->
-          <FormField v-slot="{ componentField }" name="currency">
-            <FormItem>
-              <FormLabel>Currency *</FormLabel>
-              <Select v-bind="componentField">
+          <!-- Amount + Currency -->
+          <div class="grid grid-cols-2 gap-4">
+            <!-- Amount -->
+            <FormField v-slot="{ componentField }" name="amount">
+              <FormItem>
+                <FormLabel>Amount *</FormLabel>
                 <FormControl>
-                  <SelectTrigger>
-                    <SelectValue placeholder="Select currency" />
-                  </SelectTrigger>
+                  <Input
+                    type="number"
+                    placeholder="0.00"
+                    v-bind="componentField"
+                    min="0.01"
+                    step="0.01"
+                  />
                 </FormControl>
-                <SelectContent>
-                  <SelectItem
-                    v-for="currency in availableCurrencies"
-                    :key="currency"
-                    :value="currency"
-                  >
-                    {{ currency }}
-                  </SelectItem>
-                </SelectContent>
-              </Select>
-              <FormDescription>
-                Currency for this expense
-              </FormDescription>
-              <FormMessage />
-            </FormItem>
-          </FormField>
+                <FormDescription>
+                  Amount in selected currency
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            </FormField>
+
+            <!-- Currency -->
+            <FormField v-slot="{ componentField }" name="currency">
+              <FormItem>
+                <FormLabel>Currency *</FormLabel>
+                <Select v-bind="componentField">
+                  <FormControl>
+                    <SelectTrigger class="w-full">
+                      <SelectValue placeholder="Select currency" />
+                    </SelectTrigger>
+                  </FormControl>
+                  <SelectContent>
+                    <SelectItem
+                      v-for="currency in availableCurrencies"
+                      :key="currency"
+                      :value="currency"
+                    >
+                      {{ currency }}
+                    </SelectItem>
+                  </SelectContent>
+                </Select>
+                <FormDescription>
+                  Currency for this expense
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            </FormField>
+          </div>
 
           <!-- Reference (optional) -->
           <FormField v-slot="{ componentField }" name="reference">

From 3ffb3bf983679f8c914b85dc0b9f0220c749858b Mon Sep 17 00:00:00 2001
From: Padreug <padreug@aiolabs.dev>
Date: Thu, 25 Jun 2026 22:21:55 +0200
Subject: [PATCH 2/4] feat(libra): mention the "Other" account on the income
 account step

Append the same "Other" account guidance to the income form's Step 1
(libra.income.selectAccount) that the expense form already shows, for
consistency. Updated across en / fr / es locales.
---
 src/i18n/locales/en.ts | 2 +-
 src/i18n/locales/es.ts | 2 +-
 src/i18n/locales/fr.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index cacfb8c..8abe3bf 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -202,7 +202,7 @@ const messages: LocaleMessages = {
     income: {
       title: 'Add Income',
       description: 'Submit income for the organization',
-      selectAccount: 'Select the revenue account',
+      selectAccount: 'Select the revenue account. Use the "Other" account if you\'re not sure.',
       submitIncome: 'Submit Income',
       notAvailable: 'Income submission is not yet available. This feature is coming soon.',
     },
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index 898352b..34fadb0 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -202,7 +202,7 @@ const messages: LocaleMessages = {
     income: {
       title: 'A\u00f1adir ingreso',
       description: 'Enviar un ingreso para la organizaci\u00f3n',
-      selectAccount: 'Seleccionar la cuenta de ingresos',
+      selectAccount: 'Seleccionar la cuenta de ingresos. Use la cuenta "Other" si no está seguro.',
       submitIncome: 'Enviar ingreso',
       notAvailable: 'El registro de ingresos a\u00fan no est\u00e1 disponible. Esta funci\u00f3n llegar\u00e1 pronto.',
     },
diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts
index 9638e69..0d7cdfb 100644
--- a/src/i18n/locales/fr.ts
+++ b/src/i18n/locales/fr.ts
@@ -202,7 +202,7 @@ const messages: LocaleMessages = {
     income: {
       title: 'Ajouter un revenu',
       description: 'Soumettre un revenu pour l\u2019organisation',
-      selectAccount: 'S\u00e9lectionner le compte de revenus',
+      selectAccount: 'S\u00e9lectionner le compte de revenus. Utilisez le compte "Other" si vous n\'\u00eates pas s\u00fbr.',
       submitIncome: 'Soumettre le revenu',
       notAvailable: 'La saisie de revenus n\u2019est pas encore disponible. Cette fonctionnalit\u00e9 arrive bient\u00f4t.',
     },

From 87f86647e7a6959bc2d1c73d77a7ff10268f996d Mon Sep 17 00:00:00 2001
From: Padreug <padreug@aiolabs.dev>
Date: Thu, 25 Jun 2026 22:37:29 +0200
Subject: [PATCH 3/4] feat(libra): match income Description field to the
 expense form

Fold the description guidance into the placeholder and drop the
separate FormDescription helper line, so the income Description field
mirrors the expense form's structure.
---
 src/accounting-app/views/AddIncome.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/accounting-app/views/AddIncome.vue b/src/accounting-app/views/AddIncome.vue
index 2c3254b..59df255 100644
--- a/src/accounting-app/views/AddIncome.vue
+++ b/src/accounting-app/views/AddIncome.vue
@@ -96,12 +96,11 @@
                   <FormLabel>Description *</FormLabel>
                   <FormControl>
                     <Textarea
-                      placeholder="e.g., Workshop fee, Donation, Service revenue"
+                      placeholder="A detailed description of the income source, and what it was for (event/project/etc)..."
                       v-bind="componentField"
                       rows="3"
                     />
                   </FormControl>
-                  <FormDescription>Describe the source of this income</FormDescription>
                   <FormMessage />
                 </FormItem>
               </FormField>

From 8a9ea269de2fc58ce6c67bb01989e41ac5e56cfa Mon Sep 17 00:00:00 2001
From: Padreug <padreug@aiolabs.dev>
Date: Thu, 25 Jun 2026 22:39:51 +0200
Subject: [PATCH 4/4] feat(libra): trim amount/currency/reference helper text

Remove the "Amount in selected currency" and "Currency for this
income/expense" helper lines on both forms, drop the Reference helper
line, and mark the field as "Reference (optional)" in the label
instead. Also drops the now-unused FormDescription import from the
income form.
---
 src/accounting-app/views/AddIncome.vue         |  6 +-----
 src/modules/expenses/components/AddExpense.vue | 11 +----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/accounting-app/views/AddIncome.vue b/src/accounting-app/views/AddIncome.vue
index 59df255..a3d044f 100644
--- a/src/accounting-app/views/AddIncome.vue
+++ b/src/accounting-app/views/AddIncome.vue
@@ -118,7 +118,6 @@
                         step="0.01"
                       />
                     </FormControl>
-                    <FormDescription>Amount in selected currency</FormDescription>
                     <FormMessage />
                   </FormItem>
                 </FormField>
@@ -138,7 +137,6 @@
                         </SelectItem>
                       </SelectContent>
                     </Select>
-                    <FormDescription>Currency for this income</FormDescription>
                     <FormMessage />
                   </FormItem>
                 </FormField>
@@ -146,11 +144,10 @@
 
               <FormField v-slot="{ componentField }" name="reference">
                 <FormItem>
-                  <FormLabel>Reference</FormLabel>
+                  <FormLabel>Reference (optional)</FormLabel>
                   <FormControl>
                     <Input placeholder="e.g., Invoice #123, Receipt #456" v-bind="componentField" />
                   </FormControl>
-                  <FormDescription>Optional reference number or note</FormDescription>
                   <FormMessage />
                 </FormItem>
               </FormField>
@@ -202,7 +199,6 @@ import { Textarea } from '@/components/ui/textarea'
 import { Badge } from '@/components/ui/badge'
 import {
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
diff --git a/src/modules/expenses/components/AddExpense.vue b/src/modules/expenses/components/AddExpense.vue
index 37be23d..f49d24e 100644
--- a/src/modules/expenses/components/AddExpense.vue
+++ b/src/modules/expenses/components/AddExpense.vue
@@ -128,9 +128,6 @@
                     step="0.01"
                   />
                 </FormControl>
-                <FormDescription>
-                  Amount in selected currency
-                </FormDescription>
                 <FormMessage />
               </FormItem>
             </FormField>
@@ -155,9 +152,6 @@
                     </SelectItem>
                   </SelectContent>
                 </Select>
-                <FormDescription>
-                  Currency for this expense
-                </FormDescription>
                 <FormMessage />
               </FormItem>
             </FormField>
@@ -166,16 +160,13 @@
           <!-- Reference (optional) -->
           <FormField v-slot="{ componentField }" name="reference">
             <FormItem>
-              <FormLabel>Reference</FormLabel>
+              <FormLabel>Reference (optional)</FormLabel>
               <FormControl>
                 <Input
                   placeholder="e.g., Invoice #123, Receipt #456"
                   v-bind="componentField"
                 />
               </FormControl>
-              <FormDescription>
-                Optional reference number or note
-              </FormDescription>
               <FormMessage />
             </FormItem>
           </FormField>