From 7cd53c1484482c6c41d6ebd8c87db2631d007692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Fri, 27 Feb 2026 17:04:49 -0400
Subject: [PATCH 1/2] FOUR-29531 The screen does not open when a user belongs
 to a self-service group

---
 ProcessMaker/Events/ActivityAssigned.php               | 10 ++++++++++
 .../HandleActivityAssignedInterstitialRedirect.php     |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/ProcessMaker/Events/ActivityAssigned.php b/ProcessMaker/Events/ActivityAssigned.php
index 75c51c5fde..c9a379d9bf 100644
--- a/ProcessMaker/Events/ActivityAssigned.php
+++ b/ProcessMaker/Events/ActivityAssigned.php
@@ -54,6 +54,16 @@ public function broadcastOn()
     /**
      * Return the process request.
      *
+     * @return \ProcessMaker\Models\ProcessRequest
+     */
+    public function getProcessRequest()
+    {
+        return $this->processRequest;
+    }
+
+    /**
+     * Return the process request token.
+     *
      * @return \ProcessMaker\Models\ProcessRequestToken
      */
     public function getProcessRequestToken()
diff --git a/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php b/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
index 328ca09cf6..3cf6fbadd2 100644
--- a/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
+++ b/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
@@ -2,6 +2,7 @@
 
 namespace ProcessMaker\Listeners;
 
+use Auth;
 use ProcessMaker\Events\ActivityAssigned;
 
 class HandleActivityAssignedInterstitialRedirect extends HandleRedirectListener
@@ -33,6 +34,7 @@ public function handle(ActivityAssigned $event): void
                 'nodeId' => $event->getProcessRequestToken()->element_id,
                 'userId' => $event->getProcessRequestToken()->user_id,
                 'allowInterstitial' => $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'],
+                'userCanClaim' => $event->getProcessRequest()->canUserClaimASelfServiceTask(Auth::user()),
             ]
         );
     }

From 33a83b3d8270641e1177f9d916acb3b4f90a2942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Mon, 2 Mar 2026 09:35:53 -0400
Subject: [PATCH 2/2] FOUR-29531 The screen does not open when a user belongs
 to a self-service group - Fix issue in unit test reported by CircleCI

---
 .../Listeners/HandleActivityAssignedInterstitialRedirect.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php b/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
index 3cf6fbadd2..0cf691509d 100644
--- a/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
+++ b/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
@@ -26,6 +26,9 @@ public function handle(ActivityAssigned $event): void
                     ->getAttribute('process_request_id'),
             ]);
         }
+
+        $user = Auth::user();
+
         $this->setRedirectTo($request,
             'redirectToTask',
             [
@@ -34,7 +37,7 @@ public function handle(ActivityAssigned $event): void
                 'nodeId' => $event->getProcessRequestToken()->element_id,
                 'userId' => $event->getProcessRequestToken()->user_id,
                 'allowInterstitial' => $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'],
-                'userCanClaim' => $event->getProcessRequest()->canUserClaimASelfServiceTask(Auth::user()),
+                'userCanClaim' => !is_null($user) ? $event->getProcessRequest()->canUserClaimASelfServiceTask($user) : false,
             ]
         );
     }