From 502e6b96bf07571c4ab63c022061c00733ed0f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20K=20Moln=C3=A1r?= <mocsa>
Date: Thu, 16 Apr 2026 18:24:20 +0200
Subject: [PATCH 1/4] Add transaction by reference

---
 frontend/src/api/validators.ts      |   4 +-
 frontend/src/modals/AddEntry.svelte | 101 +++++++++++++++++++---------
 src/fava/translations/messages.pot  |  16 +++--
 3 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/frontend/src/api/validators.ts b/frontend/src/api/validators.ts
index 52cfefeff..a8c919b1e 100644
--- a/frontend/src/api/validators.ts
+++ b/frontend/src/api/validators.ts
@@ -1,6 +1,6 @@
 import { account_hierarchy_validator } from "../charts/hierarchy.ts";
 import { chart_validator } from "../charts/index.ts";
-import { entryBaseValidator } from "../entries/index.ts";
+import { entryValidator } from "../entries/index.ts";
 import type { ValidationT } from "../lib/validation.ts";
 import {
   array,
@@ -136,7 +136,7 @@ export const commodities_validator = array(
 export type Commodities = ValidationT<typeof commodities_validator>;
 
 export const context_validator = object({
-  entry: entryBaseValidator,
+  entry: entryValidator,
   balances_before: optional(record(array(string))),
   balances_after: optional(record(array(string))),
 });
diff --git a/frontend/src/modals/AddEntry.svelte b/frontend/src/modals/AddEntry.svelte
index ca47cd73b..4a4b48464 100644
--- a/frontend/src/modals/AddEntry.svelte
+++ b/frontend/src/modals/AddEntry.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
-  import { save_entries } from "../api/index.ts";
+  import { get_context, save_entries } from "../api/index.ts";
   import { Balance, Note, Transaction } from "../entries/index.ts";
   import Entry from "../entry-forms/Entry.svelte";
   import { todayAsString } from "../format.ts";
   import { _ } from "../i18n.ts";
+  import type { Result } from "../lib/result.ts";
+  import { Err } from "../lib/result.ts";
+  import type { ValidationError } from "../lib/validation.ts";
   import { router } from "../router.ts";
   import { addEntryContinue } from "../stores/editor.ts";
   import { hash } from "../stores/url.ts";
@@ -20,6 +23,7 @@
   let entry: Transaction | Balance | Note = $state.raw(
     Transaction.empty(todayAsString()),
   );
+  let error: ValidationError | null = $state(null);
 
   async function submit(event: SubmitEvent) {
     event.preventDefault();
@@ -34,38 +38,75 @@
     }
   }
 
-  let shown = $derived($hash === "add-transaction");
+  let shown = $derived($hash.startsWith("add-transaction"));
+  let entry_hash = $derived(
+    $hash.startsWith("add-transaction-from") ? $hash.slice(21) : "",
+  );
+  $effect(() => {
+    async function fetchAndSet() {
+      if (entry_hash) {
+        const data = await get_context({ entry_hash });
+        let fetchedEntry = data.entry;
+        let result: Result<Transaction | Balance | Note, ValidationError>;
+        if (fetchedEntry.t === "Transaction") {
+          result = Transaction.validator(fetchedEntry);
+        } else if (fetchedEntry.t === "Balance") {
+          result = Balance.validator(fetchedEntry);
+        } else if (fetchedEntry.t === "Note") {
+          result = Note.validator(fetchedEntry);
+        } else {
+          result = new Err({
+            name: "ValidationError",
+            message: `This entry type is not supported.`,
+          });
+        }
+
+        if (result.is_ok) {
+          entry = result.value;
+        } else {
+          error = result.error;
+        }
+      }
+    }
+    fetchAndSet().catch(() => {
+      error = { name: "ValidationError", message: "Call to server failed." };
+    });
+  });
 </script>
 
 <ModalBase {shown} focus=".payee input">
-  <form onsubmit={submit} class="flex-column">
-    <h3>
-      {_("Add")}
-      {#each entryTypes as [Cls, displayName] (displayName)}
-        <button
-          type="button"
-          class:muted={!(entry instanceof Cls)}
-          onclick={() => {
-            // when switching between entry types, keep the date.
-            entry = Cls.empty(entry.date);
-          }}
-        >
-          {displayName}
-        </button>
-        <!-- eslint-disable-next-line svelte/no-useless-mustaches -->
-        {" "}
-      {/each}
-    </h3>
-    <Entry bind:entry />
-    <div class="flex-row">
-      <span class="spacer"></span>
-      <label>
-        <input type="checkbox" bind:checked={$addEntryContinue} />
-        <span>{_("continue")}</span>
-      </label>
-      <button type="submit">{_("Save")}</button>
-    </div>
-  </form>
+  {#if error}
+    <p>{_("Error loading entry. Error message:")} {error.message}</p>
+  {:else}
+    <form onsubmit={submit} class="flex-column">
+      <h3>
+        {_("Add")}
+        {#each entryTypes as [Cls, displayName] (displayName)}
+          <button
+            type="button"
+            class:muted={!(entry instanceof Cls)}
+            onclick={() => {
+              // when switching between entry types, keep the date.
+              entry = Cls.empty(entry.date);
+            }}
+          >
+            {displayName}
+          </button>
+          <!-- eslint-disable-next-line svelte/no-useless-mustaches -->
+          {" "}
+        {/each}
+      </h3>
+      <Entry bind:entry />
+      <div class="flex-row">
+        <span class="spacer"></span>
+        <label>
+          <input type="checkbox" bind:checked={$addEntryContinue} />
+          <span>{_("continue")}</span>
+        </label>
+        <button type="submit">{_("Save")}</button>
+      </div>
+    </form>
+  {/if}
 </ModalBase>
 
 <style>
diff --git a/src/fava/translations/messages.pot b/src/fava/translations/messages.pot
index 3c2635e45..8e2fb3b4a 100644
--- a/src/fava/translations/messages.pot
+++ b/src/fava/translations/messages.pot
@@ -49,7 +49,7 @@ msgid "Saving…"
 msgstr ""
 
 #: frontend/src/editor/SaveButton.svelte:14
-#: frontend/src/modals/AddEntry.svelte:66
+#: frontend/src/modals/AddEntry.svelte:116
 #: frontend/src/reports/import/Extract.svelte:115
 msgid "Save"
 msgstr ""
@@ -79,7 +79,7 @@ msgid "Add metadata"
 msgstr ""
 
 #: frontend/src/entry-forms/Balance.svelte:28
-#: frontend/src/modals/AddEntry.svelte:15
+#: frontend/src/modals/AddEntry.svelte:18
 #: frontend/src/reports/journal/JournalHeaders.svelte:56
 #: frontend/src/reports/statistics/UpdateActivity.svelte:39
 msgid "Balance"
@@ -106,7 +106,7 @@ msgid "Value"
 msgstr ""
 
 #: frontend/src/entry-forms/Note.svelte:27
-#: frontend/src/modals/AddEntry.svelte:16
+#: frontend/src/modals/AddEntry.svelte:19
 msgid "Note"
 msgstr ""
 
@@ -151,15 +151,19 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:14
+#: frontend/src/modals/AddEntry.svelte:17
 msgid "Transaction"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:43
+#: frontend/src/modals/AddEntry.svelte:87
+msgid "Error loading entry. Error message:"
+msgstr ""
+
+#: frontend/src/modals/AddEntry.svelte:91
 msgid "Add"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:64
+#: frontend/src/modals/AddEntry.svelte:114
 msgid "continue"
 msgstr ""
 

From 3b4a56489ef38e36673b854f6a7ae55d3a5c5c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20K=20Moln=C3=A1r?= <mocsa>
Date: Thu, 16 Apr 2026 18:24:20 +0200
Subject: [PATCH 2/4] Add transaction by reference

---
 frontend/src/modals/AddEntry.svelte | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/frontend/src/modals/AddEntry.svelte b/frontend/src/modals/AddEntry.svelte
index 4a4b48464..3f0803e2c 100644
--- a/frontend/src/modals/AddEntry.svelte
+++ b/frontend/src/modals/AddEntry.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { get_context, save_entries } from "../api/index.ts";
   import { get_context, save_entries } from "../api/index.ts";
   import { Balance, Note, Transaction } from "../entries/index.ts";
   import Entry from "../entry-forms/Entry.svelte";
@@ -7,6 +8,9 @@
   import type { Result } from "../lib/result.ts";
   import { Err } from "../lib/result.ts";
   import type { ValidationError } from "../lib/validation.ts";
+  import type { Result } from "../lib/result.ts";
+  import { Err } from "../lib/result.ts";
+  import type { ValidationError } from "../lib/validation.ts";
   import { router } from "../router.ts";
   import { addEntryContinue } from "../stores/editor.ts";
   import { hash } from "../stores/url.ts";
@@ -24,6 +28,7 @@
     Transaction.empty(todayAsString()),
   );
   let error: ValidationError | null = $state(null);
+  let error: ValidationError | null = $state(null);
 
   async function submit(event: SubmitEvent) {
     event.preventDefault();
@@ -49,10 +54,13 @@
         let fetchedEntry = data.entry;
         let result: Result<Transaction | Balance | Note, ValidationError>;
         if (fetchedEntry.t === "Transaction") {
+          fetchedEntry = fetchedEntry.set("date", todayAsString());
           result = Transaction.validator(fetchedEntry);
         } else if (fetchedEntry.t === "Balance") {
+          fetchedEntry = fetchedEntry.set("date", todayAsString());
           result = Balance.validator(fetchedEntry);
         } else if (fetchedEntry.t === "Note") {
+          fetchedEntry = fetchedEntry.set("date", todayAsString());
           result = Note.validator(fetchedEntry);
         } else {
           result = new Err({
@@ -107,6 +115,38 @@
       </div>
     </form>
   {/if}
+  {#if error}
+    <p>{_("Error loading entry. Error message:")} {error.message}</p>
+  {:else}
+    <form onsubmit={submit} class="flex-column">
+      <h3>
+        {_("Add")}
+        {#each entryTypes as [Cls, displayName] (displayName)}
+          <button
+            type="button"
+            class:muted={!(entry instanceof Cls)}
+            onclick={() => {
+              // when switching between entry types, keep the date.
+              entry = Cls.empty(entry.date);
+            }}
+          >
+            {displayName}
+          </button>
+          <!-- eslint-disable-next-line svelte/no-useless-mustaches -->
+          {" "}
+        {/each}
+      </h3>
+      <Entry bind:entry />
+      <div class="flex-row">
+        <span class="spacer"></span>
+        <label>
+          <input type="checkbox" bind:checked={$addEntryContinue} />
+          <span>{_("continue")}</span>
+        </label>
+        <button type="submit">{_("Save")}</button>
+      </div>
+    </form>
+  {/if}
 </ModalBase>
 
 <style>

From 35b06cab6af9a50a679969639decb039e5b9d59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20K=20Moln=C3=A1r?= <mocsa>
Date: Wed, 29 Apr 2026 18:41:12 +0200
Subject: [PATCH 3/4] Fix double merge

---
 frontend/src/modals/AddEntry.svelte | 37 -----------------------------
 1 file changed, 37 deletions(-)

diff --git a/frontend/src/modals/AddEntry.svelte b/frontend/src/modals/AddEntry.svelte
index 3f0803e2c..85b1c3e2b 100644
--- a/frontend/src/modals/AddEntry.svelte
+++ b/frontend/src/modals/AddEntry.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { get_context, save_entries } from "../api/index.ts";
   import { get_context, save_entries } from "../api/index.ts";
   import { Balance, Note, Transaction } from "../entries/index.ts";
   import Entry from "../entry-forms/Entry.svelte";
@@ -8,9 +7,6 @@
   import type { Result } from "../lib/result.ts";
   import { Err } from "../lib/result.ts";
   import type { ValidationError } from "../lib/validation.ts";
-  import type { Result } from "../lib/result.ts";
-  import { Err } from "../lib/result.ts";
-  import type { ValidationError } from "../lib/validation.ts";
   import { router } from "../router.ts";
   import { addEntryContinue } from "../stores/editor.ts";
   import { hash } from "../stores/url.ts";
@@ -28,7 +24,6 @@
     Transaction.empty(todayAsString()),
   );
   let error: ValidationError | null = $state(null);
-  let error: ValidationError | null = $state(null);
 
   async function submit(event: SubmitEvent) {
     event.preventDefault();
@@ -115,38 +110,6 @@
       </div>
     </form>
   {/if}
-  {#if error}
-    <p>{_("Error loading entry. Error message:")} {error.message}</p>
-  {:else}
-    <form onsubmit={submit} class="flex-column">
-      <h3>
-        {_("Add")}
-        {#each entryTypes as [Cls, displayName] (displayName)}
-          <button
-            type="button"
-            class:muted={!(entry instanceof Cls)}
-            onclick={() => {
-              // when switching between entry types, keep the date.
-              entry = Cls.empty(entry.date);
-            }}
-          >
-            {displayName}
-          </button>
-          <!-- eslint-disable-next-line svelte/no-useless-mustaches -->
-          {" "}
-        {/each}
-      </h3>
-      <Entry bind:entry />
-      <div class="flex-row">
-        <span class="spacer"></span>
-        <label>
-          <input type="checkbox" bind:checked={$addEntryContinue} />
-          <span>{_("continue")}</span>
-        </label>
-        <button type="submit">{_("Save")}</button>
-      </div>
-    </form>
-  {/if}
 </ModalBase>
 
 <style>

From f82f95170ec8ba6f24fb287962fc23ede063d351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20K=20Moln=C3=A1r?= <mocsa>
Date: Sun, 21 Jun 2026 12:42:58 +0200
Subject: [PATCH 4/4] Duplicate transaction logic simplification

---
 frontend/src/modals/AddEntry.svelte | 19 +++++--------------
 src/fava/translations/messages.pot  | 14 +++++++-------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/frontend/src/modals/AddEntry.svelte b/frontend/src/modals/AddEntry.svelte
index 85b1c3e2b..080427eeb 100644
--- a/frontend/src/modals/AddEntry.svelte
+++ b/frontend/src/modals/AddEntry.svelte
@@ -4,8 +4,6 @@
   import Entry from "../entry-forms/Entry.svelte";
   import { todayAsString } from "../format.ts";
   import { _ } from "../i18n.ts";
-  import type { Result } from "../lib/result.ts";
-  import { Err } from "../lib/result.ts";
   import type { ValidationError } from "../lib/validation.ts";
   import { router } from "../router.ts";
   import { addEntryContinue } from "../stores/editor.ts";
@@ -47,27 +45,20 @@
       if (entry_hash) {
         const data = await get_context({ entry_hash });
         let fetchedEntry = data.entry;
-        let result: Result<Transaction | Balance | Note, ValidationError>;
         if (fetchedEntry.t === "Transaction") {
           fetchedEntry = fetchedEntry.set("date", todayAsString());
-          result = Transaction.validator(fetchedEntry);
+          entry = fetchedEntry;
         } else if (fetchedEntry.t === "Balance") {
           fetchedEntry = fetchedEntry.set("date", todayAsString());
-          result = Balance.validator(fetchedEntry);
+          entry = fetchedEntry;
         } else if (fetchedEntry.t === "Note") {
           fetchedEntry = fetchedEntry.set("date", todayAsString());
-          result = Note.validator(fetchedEntry);
+          entry = fetchedEntry;
         } else {
-          result = new Err({
+          error = {
             name: "ValidationError",
             message: `This entry type is not supported.`,
-          });
-        }
-
-        if (result.is_ok) {
-          entry = result.value;
-        } else {
-          error = result.error;
+          };
         }
       }
     }
diff --git a/src/fava/translations/messages.pot b/src/fava/translations/messages.pot
index 8e2fb3b4a..19cf840c7 100644
--- a/src/fava/translations/messages.pot
+++ b/src/fava/translations/messages.pot
@@ -49,7 +49,7 @@ msgid "Saving…"
 msgstr ""
 
 #: frontend/src/editor/SaveButton.svelte:14
-#: frontend/src/modals/AddEntry.svelte:116
+#: frontend/src/modals/AddEntry.svelte:106
 #: frontend/src/reports/import/Extract.svelte:115
 msgid "Save"
 msgstr ""
@@ -79,7 +79,7 @@ msgid "Add metadata"
 msgstr ""
 
 #: frontend/src/entry-forms/Balance.svelte:28
-#: frontend/src/modals/AddEntry.svelte:18
+#: frontend/src/modals/AddEntry.svelte:16
 #: frontend/src/reports/journal/JournalHeaders.svelte:56
 #: frontend/src/reports/statistics/UpdateActivity.svelte:39
 msgid "Balance"
@@ -106,7 +106,7 @@ msgid "Value"
 msgstr ""
 
 #: frontend/src/entry-forms/Note.svelte:27
-#: frontend/src/modals/AddEntry.svelte:19
+#: frontend/src/modals/AddEntry.svelte:17
 msgid "Note"
 msgstr ""
 
@@ -151,19 +151,19 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:17
+#: frontend/src/modals/AddEntry.svelte:15
 msgid "Transaction"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:87
+#: frontend/src/modals/AddEntry.svelte:77
 msgid "Error loading entry. Error message:"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:91
+#: frontend/src/modals/AddEntry.svelte:81
 msgid "Add"
 msgstr ""
 
-#: frontend/src/modals/AddEntry.svelte:114
+#: frontend/src/modals/AddEntry.svelte:104
 msgid "continue"
 msgstr ""