Do not depend on the text search for next transition

hypha/apply/funds/views.py

@@ -1284,13 +1284,6 @@ class BaseSubmissionEditView(UpdateView):
 
     model = ApplicationSubmission
 
-    @property
-    def transitions(self):
-        transitions = self.object.get_available_user_status_transitions(
-            self.request.user
-        )
-        return {transition.name: transition for transition in transitions}
-
     def render_preview(self, request: HttpRequest, form: BaseModelForm) -> HttpResponse:
         """Gets a rendered preview of a form
 
@@ -1363,7 +1356,6 @@ def form_valid(self, form: BaseModelForm) -> HttpResponse:
         Returns:
             An `HttpResponse` depending on the actions taken in the edit view
         """
-
         self.object.form_data = form.cleaned_data
 
         is_draft = self.object.status == DRAFT_STATE
@@ -1394,6 +1386,7 @@ def form_valid(self, form: BaseModelForm) -> HttpResponse:
                 user=self.request.user,
                 source=self.object,
             )
+
         elif revision and not self.object.status == DRAFT_STATE:
             messenger(
                 MESSAGES.APPLICANT_EDIT,
@@ -1403,18 +1396,25 @@ def form_valid(self, form: BaseModelForm) -> HttpResponse:
                 related=revision,
             )
 
-        action = set(self.request.POST.keys()) & set(self.transitions.keys())
-        try:
-            transition = self.transitions[action.pop()]
-        except KeyError:
-            pass
-        else:
+        # Get the transition corresponding to the object's current phase name
+        transitions = self.object.get_available_user_status_transitions(
+            self.request.user
+        )
+        transition = next(
+            (t for t in transitions if t.source == self.object.phase.name),
+            None,
+        )
+        if transition:
+            # Only notify for initial submission or drafts
+            notify = (
+                not (revision or submitting_proposal)
+                or self.object.status == DRAFT_STATE
+            )
             self.object.perform_transition(
                 transition.target,
                 self.request.user,
                 request=self.request,
-                notify=not (revision or submitting_proposal)
-                or self.object.status == DRAFT_STATE,  # Use the other notification
+                notify=notify,
             )
 
         # Required for django-file-form: delete temporary files for the new files