From 1eab0204b0fcc93849b6798b70052102ed8070f0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 12 Apr 2022 09:34:52 +0200
Subject: [PATCH] MOBILE-3833 forum: Remove duplicated due date message in
 3.11+

---
 .../mod/forum/components/index/index.ts       |  3 ++-
 src/addons/mod/forum/services/forum-helper.ts | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 849453c42..db1c36d17 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -345,8 +345,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         }
 
         const forum = this.forum;
+        const showDueDateMessage = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
         this.description = forum.intro || this.description;
-        this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum);
+        this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum, showDueDateMessage);
         this.descriptionNote = Translate.instant('addon.mod_forum.numdiscussions', {
             numdiscussions: forum.numdiscussions,
         });
diff --git a/src/addons/mod/forum/services/forum-helper.ts b/src/addons/mod/forum/services/forum-helper.ts
index 47c2bd0cc..a9c26c9f5 100644
--- a/src/addons/mod/forum/services/forum-helper.ts
+++ b/src/addons/mod/forum/services/forum-helper.ts
@@ -278,23 +278,26 @@ export class AddonModForumHelperProvider {
      * Returns the availability message of the given forum.
      *
      * @param forum Forum instance.
+     * @param getDueDateMessage Whether to get due date message. If false, only cutoff date message will be returned.
      * @return Message or null if the forum has no cut-off or due date.
      */
-    getAvailabilityMessage(forum: AddonModForumData): string | null {
+    getAvailabilityMessage(forum: AddonModForumData, getDueDateMessage = true): string | null {
         if (this.isCutoffDateReached(forum)) {
             return Translate.instant('addon.mod_forum.cutoffdatereached');
         }
 
-        if (this.isDueDateReached(forum)) {
-            const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
+        if (getDueDateMessage) {
+            if (this.isDueDateReached(forum)) {
+                const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
 
-            return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate });
-        }
+                return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate });
+            }
 
-        if ((forum.duedate ?? 0) > 0) {
-            const dueDate = CoreTimeUtils.userDate(forum.duedate! * 1000);
+            if (forum.duedate && forum.duedate > 0) {
+                const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
 
-            return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate });
+                return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate });
+            }
         }
 
         return null;