From f20c8f752e40ffaee6b9290d24220a06de373ce0 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 24 Mar 2026 11:42:08 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Add=20=E2=80=A6=20to=20buttons=20text=20whe?=
 =?UTF-8?q?n=20clicked=20instead=20of=20hardcoded=20Submitting...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hypha/apply/funds/templates/funds/application_base.html | 1 +
 hypha/static_src/javascript/application-form.js         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html
index ac42620817..b9c118f4dd 100644
--- a/hypha/apply/funds/templates/funds/application_base.html
+++ b/hypha/apply/funds/templates/funds/application_base.html
@@ -100,6 +100,7 @@ <h4>
                         <button
                             class="w-full sm:w-auto btn btn-primary"
                             type="submit"
+                            name="submit"
                             disabled
                         >
                             {% trans "Submit for review" %}
diff --git a/hypha/static_src/javascript/application-form.js b/hypha/static_src/javascript/application-form.js
index ed3b4f368d..047c30eeeb 100644
--- a/hypha/static_src/javascript/application-form.js
+++ b/hypha/static_src/javascript/application-form.js
@@ -55,7 +55,7 @@
         button.setAttribute("disabled", "disabled");
         if (button.textContent) {
           button.dataset.originalText = button.textContent;
-          button.textContent = "Submitting...";
+          button.textContent = button.textContent.trim() + "…";
         }
       });
     }, 0);

From 0eec425dc73718d0ba346a2c428454aed56cd246 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 24 Mar 2026 11:47:41 +0100
Subject: [PATCH 2/2] Only update the button clicked.

---
 hypha/static_src/javascript/application-form.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hypha/static_src/javascript/application-form.js b/hypha/static_src/javascript/application-form.js
index 047c30eeeb..7825010e87 100644
--- a/hypha/static_src/javascript/application-form.js
+++ b/hypha/static_src/javascript/application-form.js
@@ -47,17 +47,23 @@
   }
 
   // Block multiple form submits.
+  let clickedButton = null;
+  submitButtons.forEach(function (button) {
+    button.addEventListener("click", function () {
+      clickedButton = button;
+    });
+  });
+
   form.addEventListener("submit", function () {
     // Use setTimeout with 0 delay to ensure form submission begins
     // before the buttons are disabled, allowing their values to be included
     setTimeout(function () {
       submitButtons.forEach(function (button) {
         button.setAttribute("disabled", "disabled");
-        if (button.textContent) {
-          button.dataset.originalText = button.textContent;
-          button.textContent = button.textContent.trim() + "…";
-        }
       });
+      if (clickedButton && clickedButton.textContent) {
+        clickedButton.textContent = clickedButton.textContent.trim() + "…";
+      }
     }, 0);
   });