Merge v4.9.1

This should get merged after !21 (merged) and !26 (closed)

hypha/apply/activity/adapters/activity_feed.py

@@ -48,7 +48,7 @@ class ActivityAdapter(AdapterBase):
             "Lead changed from {old_lead} to {source.lead}"
         ),
         MESSAGES.SEND_FOR_APPROVAL: _("Requested approval"),
-        MESSAGES.APPROVE_PAF: _("PAF assigned to {user}"),
+        MESSAGES.APPROVE_PAF: "handle_paf_assignment",
         MESSAGES.APPROVE_PROJECT: _("Approved"),
         MESSAGES.REQUEST_PROJECT_CHANGE: _(
             'Requested changes for acceptance: "{comment}"'
@@ -105,7 +105,6 @@ class ActivityAdapter(AdapterBase):
             MESSAGES.APPROVE_CONTRACT,
             MESSAGES.UPLOAD_CONTRACT,
             MESSAGES.SUBMIT_CONTRACT_DOCUMENTS,
-            MESSAGES.UPDATE_INVOICE_STATUS,
             MESSAGES.DELETE_INVOICE,
             MESSAGES.CREATE_INVOICE,
         ]:
@@ -122,6 +121,7 @@ class ActivityAdapter(AdapterBase):
             invoice = kwargs.get("invoice", None)
             if invoice and not is_invoice_public_transition(invoice):
                 return {"visibility": TEAM}
+            return {"visibility": APPLICANT}
         return {}
 
     def reviewers_updated(self, added=None, removed=None, **kwargs):
@@ -168,6 +168,20 @@ class ActivityAdapter(AdapterBase):
             title=submissions_text
         )
 
+    def handle_paf_assignment(self, source, paf_approvals, **kwargs):
+        if hasattr(paf_approvals, "__iter__"):  # paf_approvals has to be iterable
+            users = ", ".join(
+                [
+                    paf_approval.user.full_name
+                    if paf_approval.user.full_name
+                    else paf_approval.user.username
+                    for paf_approval in paf_approvals
+                ]
+            )
+            users_sentence = " and".join(users.rsplit(",", 1))
+            return _("PAF assigned to {}").format(users_sentence)
+        return None
+
     def handle_transition(self, old_phase, source, **kwargs):
         submission = source
         base_message = _("Progressed from {old_display} to {new_display}")