From 5cd20b8710cb0c97fab3ceb871145e5f4e90d04f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 6 Feb 2024 08:05:36 +0100
Subject: [PATCH] MOBILE-4499 local-notifications: Fix cancelling site events

---
 src/core/services/local-notifications.ts | 7 ++++++-
 src/theme/theme.base.scss                | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/services/local-notifications.ts b/src/core/services/local-notifications.ts
index 95d4b852f..9fd4145f7 100644
--- a/src/core/services/local-notifications.ts
+++ b/src/core/services/local-notifications.ts
@@ -315,7 +315,12 @@ export class CoreLocalNotificationsProvider {
      * @returns Promise resolved with the notifications.
      */
     protected getAllScheduled(): Promise<ILocalNotification[]> {
-        return this.queueRunner.run('allScheduled', () => LocalNotifications.getAllScheduled());
+        return this.queueRunner.run('allScheduled', () => new Promise((resolve) => {
+            // LocalNotifications.getAllScheduled is broken, use the Cordova plugin directly.
+            const plugin = this.getCordovaPlugin();
+
+            plugin ? plugin.getScheduled(notifications => resolve(notifications)) : resolve([]);
+        }));
     }
 
     /**
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 0e57efaeb..b9691d992 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -940,7 +940,7 @@ ion-card {
         display: flex;
         flex-direction: row;
         justify-content: flex-end;
-        @include margin(0, 8px, 8px, 8px);
+        margin: 0 8px 8px 8px;
 
         ion-button {
             text-transform: none;