From bd41c5d064986e0c49da5a54489166b731ec6387 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2024 08:51:26 +0100
Subject: [PATCH 1/2] MOBILE-4653 notifications: Fix opening notification
 action

The siteId parameter is mandatory for actions, but in notiifcations it wasn't supplied. This worked fine before, but after the refactor done in MOBILE-4028 it no longer worked
---
 src/addons/notifications/pages/notification/notification.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/notifications/pages/notification/notification.html b/src/addons/notifications/pages/notification/notification.html
index 48c8d4e9d..20810a578 100644
--- a/src/addons/notifications/pages/notification/notification.html
+++ b/src/addons/notifications/pages/notification/notification.html
@@ -49,7 +49,7 @@
 
         <div collapsible-footer appearOnBottom *ngIf="loaded && actions && actions.length > 0" slot="fixed">
             <div class="list-item-limited-width adaptable-buttons-row">
-                <ion-button expand="block" (click)="action.action()" *ngFor="let action of actions">
+                <ion-button expand="block" (click)="action.action(action.sites[0])" *ngFor="let action of actions">
                     <ion-icon slot="start" name="{{action.icon}}" aria-hidden="true" />
                     {{ action.message | translate }}
                 </ion-button>

From b29f76d2ba30c863c3b68f18b1804024a4b1be0c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2024 09:18:19 +0100
Subject: [PATCH 2/2] MOBILE-4653 core: Improve detection of Workplace sites

---
 src/core/services/sites.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index f3a713209..d052b9338 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -807,7 +807,9 @@ export class CoreSitesProvider {
      * @returns Either VALID_VERSION, WORKPLACE_APP or MOODLE_APP.
      */
     protected validateWorkplaceVersion(info: CoreSiteInfoResponse): number {
-        const isWorkplace = !!info.functions && info.functions.some((func) => func.name == 'tool_program_get_user_programs');
+        const isWorkplace = !!info.functions && info.functions.some((func) =>
+            func.name === 'tool_program_get_user_programs' ||
+            func.name === 'tool_catalogue_get_user_catalogue');
 
         const isWPEnabled = this.isWorkplaceEnabled();