From aa358aa974ed1b4e46decbee6593677ee4c8ab1e Mon Sep 17 00:00:00 2001
From: Daniel Subiabre <daniel.subiabre@platoniq.net>
Date: Mon, 20 Jul 2026 14:47:43 +0200
Subject: [PATCH] fix: lost positioning in merge resolution

---
 .../project/edit/BudgetModal.svelte           | 21 +++++++------------
 .../project/edit/RewardsModal.svelte          | 20 +++++++-----------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/project/edit/BudgetModal.svelte b/src/components/project/edit/BudgetModal.svelte
index efe01004..41a217b9 100644
--- a/src/components/project/edit/BudgetModal.svelte
+++ b/src/components/project/edit/BudgetModal.svelte
@@ -130,16 +130,12 @@
                 {$t("system.validation.missingRequiredFields")}
             </Toast>
         {/if}
-        {#snippet header()}
-            <h2 class="text-xl font-bold text-black">
-                {$t("pages.project.edit.budget.modal.title")}
-            </h2>
-            <p
-                class="text-content line-clamp-1 overflow-hidden text-base font-normal text-ellipsis"
-            >
-                {$t("pages.project.edit.budget.modal.description")}
-            </p>
-        {/snippet}
+        <h2 class="text-xl font-bold text-black">
+            {$t("pages.project.edit.budget.modal.title")}
+        </h2>
+        <p class="text-content line-clamp-1 overflow-hidden text-base font-normal text-ellipsis">
+            {$t("pages.project.edit.budget.modal.description")}
+        </p>
         <div class="flex flex-col gap-4 pt-2">
             <TextInput
                 bind:value={selectedBudgetTitle}
@@ -177,8 +173,7 @@
                 onBlur={() => (formTouched = true)}
             />
         </div>
-
-        {#snippet footer()}
+        <div class="flex items-center justify-end gap-4">
             {#if budgetItem !== null && onDelete}
                 <Button kind="secondary" onclick={() => (openDeleteModal = true)} class="w-fit">
                     {$t("common.remove")}
@@ -192,6 +187,6 @@
             <Button onclick={() => handleSaveOrCreate()} disabled={!isFormValid} class="w-fit">
                 {$t("common.continue")}
             </Button>
-        {/snippet}
+        </div>
     </div>
 </Modal>
diff --git a/src/components/project/edit/RewardsModal.svelte b/src/components/project/edit/RewardsModal.svelte
index 1c3cb3d4..84bc6217 100644
--- a/src/components/project/edit/RewardsModal.svelte
+++ b/src/components/project/edit/RewardsModal.svelte
@@ -120,16 +120,12 @@
                 {$t("system.validation.missingRequiredFields")}
             </Toast>
         {/if}
-        {#snippet header()}
-            <h2 class="text-xl font-bold text-black">
-                {$t("pages.project.edit.rewards.modal.title")}
-            </h2>
-            <p
-                class="text-content line-clamp-1 overflow-hidden text-base font-normal text-ellipsis"
-            >
-                {$t("pages.project.edit.rewards.modal.description")}
-            </p>
-        {/snippet}
+        <h2 class="text-xl font-bold text-black">
+            {$t("pages.project.edit.rewards.modal.title")}
+        </h2>
+        <p class="text-content line-clamp-1 overflow-hidden text-base font-normal text-ellipsis">
+            {$t("pages.project.edit.rewards.modal.description")}
+        </p>
         <div class="flex flex-col gap-4 pt-2">
             <TextInput
                 bind:value={title}
@@ -160,7 +156,7 @@
                 <RewardItemsSelector bind:value={rewardCount} bind:unlimited />
             </div>
         </div>
-        {#snippet footer()}
+        <div class="flex items-center justify-end gap-4">
             {#if reward !== null && onDelete}
                 <Button kind="secondary" onclick={() => (openDeleteModal = true)} class="w-fit">
                     {$t("common.remove")}
@@ -174,6 +170,6 @@
             <Button onclick={() => handleSaveOrCreate()} disabled={!isFormValid} class="w-fit">
                 {$t("common.continue")}
             </Button>
-        {/snippet}
+        </div>
     </div>
 </Modal>