From afbea45fd05877ee6e128557073582abddd9a96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 10:23:49 +0200
Subject: [PATCH 01/11] MOBILE-4270 travis: Update travis xcode version

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0cd12911..ed465252f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
+    - $HOME/Library/Caches/Homebrew
 
 before_install:
   - nvm install
@@ -34,8 +35,7 @@ script:
 
 jobs:
   include:
-  - stage: build
-    name: "Build Android"
+  - name: "Build Android"
     if: env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank)
     language: android
     android:
@@ -63,13 +63,14 @@ jobs:
         - libsecret-1-dev
         - php5-cli
         - php5-common
-  - stage: build
-    name: "Build iOS"
+  - name: "Build iOS"
     language: node_js
     if: env(BUILD_IOS) = 1 AND (env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank))
     os: osx
-    osx_image: xcode13.1
+    osx_image: xcode14.2
     addons:
       homebrew:
         packages:
         - jq
+    before_cache:
+      - brew cleanup

From 9f850816be8d7fb8a3b8ee2dfd6d1efa6a9bddea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 11:22:12 +0200
Subject: [PATCH 02/11] MOBILE-4270 editor: Update lang strings to match
 TinyMCE

---
 scripts/langindex.json                             | 14 +++++++-------
 .../core-editor-rich-text-editor.html              |  2 +-
 src/core/features/editor/lang.json                 |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 4f883c941..be036f607 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1692,20 +1692,20 @@
   "core.downloading": "local_moodlemobileapp",
   "core.edit": "moodle",
   "core.editor.autosavesucceeded": "editor_atto",
-  "core.editor.bold": "atto_bold/pluginname",
+  "core.editor.bold": "editor",
   "core.editor.clear": "atto_clear/pluginname",
   "core.editor.h3": "atto_title",
   "core.editor.h4": "atto_title",
   "core.editor.h5": "atto_title",
   "core.editor.hidetoolbar": "local_moodlemobileapp",
-  "core.editor.italic": "atto_italic/pluginname",
-  "core.editor.orderedlist": "atto_orderedlist/pluginname",
-  "core.editor.p": "atto_title",
-  "core.editor.strike": "atto_strike/pluginname",
+  "core.editor.italic": "editor",
+  "core.editor.orderedlist": "editor",
+  "core.editor.p": "editor_tinymce/advanced:paragraph",
+  "core.editor.strikethrough": "editor",
   "core.editor.textrecovered": "editor_atto",
   "core.editor.toggle": "local_moodlemobileapp",
-  "core.editor.underline": "atto_underline/pluginname",
-  "core.editor.unorderedlist": "atto_unorderedlist/pluginname",
+  "core.editor.underline": "editor",
+  "core.editor.unorderedlist": "editor",
   "core.emptysplit": "local_moodlemobileapp",
   "core.endingtime": "local_moodlemobileapp",
   "core.endonesteptour": "tool_usertours",
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index acddfb540..2d260dbd3 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -45,7 +45,7 @@
             </button>
         </ion-slide>
         <ion-slide>
-            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.strike" [title]="'core.editor.strike' | translate"
+            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.strike" [title]="'core.editor.strikethrough' | translate"
                 (click)="buttonAction($event, 'strikethrough', 'strike')" (keyup)="buttonAction($event, 'strikethrough', 'strike')"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)" tabindex="0">
                 <ion-icon name="fas-strikethrough" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/editor/lang.json b/src/core/features/editor/lang.json
index 508c6ddb0..9ea5a4454 100644
--- a/src/core/features/editor/lang.json
+++ b/src/core/features/editor/lang.json
@@ -9,9 +9,9 @@
     "italic": "Italic",
     "orderedlist": "Ordered list",
     "p": "Paragraph",
-    "strike": "Strike through",
+    "strikethrough": "Strikethrough",
     "textrecovered": "A draft version of this text was automatically restored.",
     "toggle": "Toggle editor",
     "underline": "Underline",
     "unorderedlist": "Unordered list"
-}
\ No newline at end of file
+}

From 013a55a5a40c7723949aebf6778e1c11dd85b7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 12:11:19 +0200
Subject: [PATCH 03/11] MOBILE-4270 lang: Solve error details not being shown

---
 scripts/langindex.json          | 2 +-
 src/core/services/utils/text.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index be036f607..ff66ad49d 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2310,7 +2310,7 @@
   "core.selectagroup": "moodle",
   "core.send": "message",
   "core.sending": "chat",
-  "core.serverconnection": "error",
+  "core.serverconnection": "local_moodlemobileapp",
   "core.settings.about": "local_moodlemobileapp",
   "core.settings.accessstatement": "access",
   "core.settings.appsettings": "local_moodlemobileapp",
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index d5e478100..23596a41f 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -538,7 +538,7 @@ export class CoreTextUtilsProvider {
      * @returns Error message, undefined if not found.
      */
     getErrorMessageFromError(error?: CoreAnyError): string | undefined {
-        if (typeof error == 'string') {
+        if (typeof error === 'string') {
             return error;
         }
 

From 5c9347555394c444356d8bea196c88ccfc59ddc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 12:11:30 +0200
Subject: [PATCH 04/11] MOBILE-4270 lang: Update lang strings

---
 moodle.config.json                                   |  1 +
 scripts/langindex.json                               |  2 +-
 src/addons/mod/bigbluebuttonbn/lang.json             | 10 +++++-----
 .../bigbluebuttonbn/tests/behat/basic_usage.feature  | 12 ++++++------
 src/addons/mod/data/lang.json                        |  4 ++--
 src/addons/mod/forum/lang.json                       |  4 ++--
 src/addons/mod/quiz/lang.json                        |  2 +-
 src/core/features/editor/lang.json                   |  4 ++--
 src/core/features/login/lang.json                    |  4 ++--
 src/core/features/login/tests/behat/signup.feature   |  8 ++++----
 src/core/features/user/lang.json                     |  4 ++--
 src/core/lang.json                                   |  4 ++--
 12 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index 50aaf93a5..b521642cd 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -57,6 +57,7 @@
         "sr-cr": "Српски",
         "sr-lt": "Srpski",
         "sv": "Svenska",
+        "szl": "Ślōnski",
         "tg": "Тоҷикӣ",
         "tr": "Türkçe",
         "uk": "Українська",
diff --git a/scripts/langindex.json b/scripts/langindex.json
index ff66ad49d..65f618eaa 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2268,7 +2268,7 @@
   "core.reminders.atthetime": "local_moodlemobileapp",
   "core.reminders.custom": "local_moodlemobileapp",
   "core.reminders.customreminder": "local_moodlemobileapp",
-  "core.reminders.delete": "moodle",
+  "core.reminders.delete": "local_moodlemobileapp",
   "core.reminders.reminderset": "local_moodlemobileapp",
   "core.reminders.reminderunset": "local_moodlemobileapp",
   "core.reminders.setareminder": "local_moodlemobileapp",
diff --git a/src/addons/mod/bigbluebuttonbn/lang.json b/src/addons/mod/bigbluebuttonbn/lang.json
index abead21d5..8db55ba47 100644
--- a/src/addons/mod/bigbluebuttonbn/lang.json
+++ b/src/addons/mod/bigbluebuttonbn/lang.json
@@ -10,12 +10,12 @@
     "view_groups_selection_warning": "There is a room for each group and you have access to more than one. Be sure to select the correct one.",
     "view_message_conference_in_progress": "The session is in progress.",
     "view_message_conference_room_ready": "This room is ready. You can join the session now.",
-    "view_message_moderator": "moderator",
-    "view_message_moderators": "moderators",
+    "view_message_moderator": "Moderator",
+    "view_message_moderators": "Moderators",
     "view_message_norecordings": "There are no recordings available.",
-    "view_message_session_started_at": "This session started at",
-    "view_message_viewer": "viewer",
-    "view_message_viewers": "viewers",
+    "view_message_session_started_at": "Session started at",
+    "view_message_viewer": "Viewer",
+    "view_message_viewers": "Viewers",
     "view_nojoin": "You do not have a role that is allowed to join this session.",
     "view_section_title_recordings": "Recordings"
 }
diff --git a/src/addons/mod/bigbluebuttonbn/tests/behat/basic_usage.feature b/src/addons/mod/bigbluebuttonbn/tests/behat/basic_usage.feature
index 1e2175676..856d5e698 100755
--- a/src/addons/mod/bigbluebuttonbn/tests/behat/basic_usage.feature
+++ b/src/addons/mod/bigbluebuttonbn/tests/behat/basic_usage.feature
@@ -53,8 +53,8 @@ Feature: Test basic usage of BBB activity in app
 
     Given I wait "10" seconds
     Then I should find "The session is in progress." in the app
-    And I should find "1" near "viewer" in the app
-    And I should find "0" near "moderator" in the app
+    And I should find "1" near "Viewer" in the app
+    And I should find "0" near "Moderator" in the app
 
   Scenario: Join meeting (moderator)
     Given the following "activities" exist:
@@ -69,8 +69,8 @@ Feature: Test basic usage of BBB activity in app
 
     Given I wait "10" seconds
     Then I should find "The session is in progress." in the app
-    And I should find "1" near "moderator" in the app
-    And I should find "0" near "viewer" in the app
+    And I should find "1" near "Moderator" in the app
+    And I should find "0" near "Viewer" in the app
 
   Scenario: Wait for moderator
     Given the following "activities" exist:
@@ -91,8 +91,8 @@ Feature: Test basic usage of BBB activity in app
     And I press "Close" in the app
     And I pull to refresh in the app
     Then I should find "The session is in progress." in the app
-    And I should find "1" near "moderator" in the app
-    And I should find "0" near "viewer" in the app
+    And I should find "1" near "Moderator" in the app
+    And I should find "0" near "Viewer" in the app
     And I should be able to press "Join session" in the app
 
     When I close all opened windows
diff --git a/src/addons/mod/data/lang.json b/src/addons/mod/data/lang.json
index d15f18e32..3ffdfdbce 100644
--- a/src/addons/mod/data/lang.json
+++ b/src/addons/mod/data/lang.json
@@ -13,14 +13,14 @@
     "disapprove": "Undo approval",
     "edittagsnotsupported": "Sorry, editing tags is not supported by the app.",
     "emptyaddform": "You did not fill out any fields!",
-    "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
+    "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries to complete this activity.",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
     "errorapproving": "Error approving or unapproving entry.",
     "errordeleting": "Error deleting entry.",
     "errormustsupplyvalue": "You must supply a value here.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
-    "foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
+    "foundrecords": "Found {{$a.num}} out of {{$a.max}} records. <a href=\"{{$a.reseturl}}\">Clear all</a>",
     "gettinglocation": "Getting location",
     "latlongboth": "Both latitude and longitude are required.",
     "locationnotenabled": "Location is not enabled",
diff --git a/src/addons/mod/forum/lang.json b/src/addons/mod/forum/lang.json
index b3146a6a7..46277f2df 100644
--- a/src/addons/mod/forum/lang.json
+++ b/src/addons/mod/forum/lang.json
@@ -49,11 +49,11 @@
     "pinupdated": "The pin option has been updated.",
     "postaddedsuccess": "Your post was successfully added.",
     "postingroup": "Posting in group \"{{groupname}}\".",
-    "postisprivatereply": "This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers.",
+    "postisprivatereply": "This is a private reply. (Teachers and other users with the capability to view private replies can also see it.)",
     "posttoforum": "Post to forum",
     "posttomygroups": "Post a copy to all groups",
     "privatereply": "Reply privately",
-    "qandanotify": "This is a question and answer forum. In order to see other responses to these questions, you must first post your answer",
+    "qandanotify": "This is a question and answer forum. To see other replies, you must first post your reply.",
     "re": "Re:",
     "refreshposts": "Refresh posts",
     "removefromfavourites": "Unstar this discussion",
diff --git a/src/addons/mod/quiz/lang.json b/src/addons/mod/quiz/lang.json
index a1db1a409..d62d1d3c0 100644
--- a/src/addons/mod/quiz/lang.json
+++ b/src/addons/mod/quiz/lang.json
@@ -10,7 +10,7 @@
     "clearchoice": "Clear my choice",
     "comment": "Comment",
     "completedon": "Completed on",
-    "confirmclose": "Once you submit, you will no longer be able to change your answers for this attempt.",
+    "confirmclose": "Once you submit your answers, you won’t be able to change them.",
     "confirmcontinueoffline": "This attempt has not been synchronised since {{$a}}. If you have continued this attempt in another device since then, you may lose data.",
     "confirmleavequizonerror": "An error occurred while saving the answers. Are you sure you want to leave the quiz?",
     "confirmstart": "Your attempt will have a time limit of {{$a}}. When you start, the timer will begin to count down and cannot be paused. You must finish your attempt before it expires. Are you sure you wish to start now?",
diff --git a/src/core/features/editor/lang.json b/src/core/features/editor/lang.json
index 9ea5a4454..06ed4f8ee 100644
--- a/src/core/features/editor/lang.json
+++ b/src/core/features/editor/lang.json
@@ -7,11 +7,11 @@
     "h5": "Heading (small)",
     "hidetoolbar": "Hide toolbar",
     "italic": "Italic",
-    "orderedlist": "Ordered list",
+    "orderedlist": "Ordered List",
     "p": "Paragraph",
     "strikethrough": "Strikethrough",
     "textrecovered": "A draft version of this text was automatically restored.",
     "toggle": "Toggle editor",
     "underline": "Underline",
-    "unorderedlist": "Unordered list"
+    "unorderedlist": "Bulleted List"
 }
diff --git a/src/core/features/login/lang.json b/src/core/features/login/lang.json
index 01c5f519f..2be25d83d 100644
--- a/src/core/features/login/lang.json
+++ b/src/core/features/login/lang.json
@@ -19,7 +19,7 @@
     "credentialsdescription": "Please provide your username and password to log in.",
     "credentialshelp": "If you have problems logging in, try again later or contact your school or learning provider.",
     "credentialssupportsubject": "Need help logging in",
-    "emailconfirmsent": "<p>An email should have been sent to your address at <b>{{$a}}</b></p><p>It contains easy instructions to complete your registration.</p>",
+    "emailconfirmsent": "<p>An email should have been sent to your address at <b>{{$a}}</b></p>\n   <p>It contains easy instructions to complete your registration.</p>\n   <p>If you continue to have difficulty, contact the site administrator.</p>",
     "emailconfirmsentnoemail": "<p>An email should have been sent to your address.</p><p>It contains easy instructions to complete your registration.</p>",
     "emailconfirmsentsuccess": "Confirmation email sent successfully",
     "emailnotmatch": "Emails do not match",
@@ -71,7 +71,7 @@
     "loginsteps": "For full access to this site, you first need to create an account.",
     "missingemail": "Missing email address",
     "missingfirstname": "Missing given name",
-    "missinglastname": "Missing surname",
+    "missinglastname": "Missing last name",
     "mobileservicesnotenabled": "Mobile services are not enabled on the site.",
     "mustconfirm": "You need to confirm your account",
     "newaccount": "New account",
diff --git a/src/core/features/login/tests/behat/signup.feature b/src/core/features/login/tests/behat/signup.feature
index caf9e1be6..29723bf84 100755
--- a/src/core/features/login/tests/behat/signup.feature
+++ b/src/core/features/login/tests/behat/signup.feature
@@ -40,7 +40,7 @@ Feature: Test signup in app
     And I should find "Password required" in the app
     And I should find "Missing email address" in the app
     And I should find "Missing given name" in the app
-    And I should find "Missing surname" in the app
+    And I should find "Missing last name" in the app
 
     When I set the following fields to these values in the app:
       | Username | u1 |
@@ -48,7 +48,7 @@ Feature: Test signup in app
       | Email address | u1@u1.com |
       | Email (again) | u2@u1.com |
       | First name | User |
-      | Surname | Test |
+      | Last name | Test |
       | City/town | Barcelona |
       | Country | Spain |
     Then I should find "Emails do not match" in the app
@@ -98,7 +98,7 @@ Feature: Test signup in app
       | Email address | u1@u1.com |
       | Email (again) | u1@u1.com |
       | First name | User |
-      | Surname | Test |
+      | Last name | Test |
       | City/town | Barcelona |
       | Country | Spain |
     And I press "Create my new account" in the app
@@ -147,7 +147,7 @@ Feature: Test signup in app
       | Email address | u1@u1.com |
       | Email (again) | u1@u1.com |
       | First name | User |
-      | Surname | Test |
+      | Last name | Test |
       | City/town | Barcelona |
       | Country | Spain |
     And I press "Create my new account" in the app
diff --git a/src/core/features/user/lang.json b/src/core/features/user/lang.json
index 027f190f4..5cb9ff365 100644
--- a/src/core/features/user/lang.json
+++ b/src/core/features/user/lang.json
@@ -1,6 +1,5 @@
 {
     "address": "Address",
-    "useraccount": "User account",
     "city": "City/town",
     "completeprofile": "Complete profile",
     "completeprofilehelp": "If you have problems completing your profile, try again later or contact your school or learning provider.",
@@ -20,7 +19,7 @@
     "firstname": "First name",
     "interests": "Interests",
     "lastcourseaccess": "Last access to course",
-    "lastname": "Surname",
+    "lastname": "Last name",
     "manager": "Manager",
     "newpicture": "New picture",
     "noparticipants": "No participants found for this course",
@@ -35,6 +34,7 @@
     "supportmessagesent": "Your message has been sent.",
     "supportsubject": "[App] {{subject}}",
     "teacher": "Non-editing teacher",
+    "useraccount": "User account",
     "userwithid": "User with ID {{id}}",
     "webpage": "Web page"
 }
diff --git a/src/core/lang.json b/src/core/lang.json
index 6897372a9..fc5ff75b5 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -174,8 +174,8 @@
     "minutes": "minutes",
     "misc": "Miscellaneous",
     "mod_assign": "Assignment",
-    "mod_book": "Book",
     "mod_bigbluebuttonbn": "BigBlueButton",
+    "mod_book": "Book",
     "mod_chat": "Chat",
     "mod_choice": "Choice",
     "mod_data": "Database",
@@ -187,7 +187,7 @@
     "mod_glossary": "Glossary",
     "mod_h5pactivity": "H5P",
     "mod_imscp": "IMS content package",
-    "mod_label": "Text and media",
+    "mod_label": "Text and media area",
     "mod_lesson": "Lesson",
     "mod_lti": "External tool",
     "mod_page": "Page",

From f39bfa0710ce1c6276ed75f7288dc3d8e4f9019d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 12:27:26 +0200
Subject: [PATCH 05/11] MOBILE-4270 messages: Remove nonexistent contrast as
 ion toolbar color

---
 src/addons/messages/pages/discussion/discussion.html | 2 +-
 src/addons/mod/chat/pages/chat/chat.html             | 2 +-
 src/core/features/comments/pages/viewer/viewer.html  | 2 +-
 src/theme/theme.base.scss                            | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 57ad7cd7d..2e9ec079a 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -103,7 +103,7 @@
     </ion-fab>
 </ion-content>
 <ion-footer class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
-    <ion-toolbar [color]="footerType == 'message' ? 'contrast' : 'light'">
+    <ion-toolbar [color]="footerType == 'message' ? null : 'light'">
         <p *ngIf="footerType == 'unable'" class="ion-text-center ion-margin-horizontal">
             {{ 'addon.messages.unabletomessage' | translate }}
         </p>
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index a35f2d33a..4cbfff287 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -93,7 +93,7 @@
     </core-loading>
 </ion-content>
 <ion-footer class="footer-adjustable">
-    <ion-toolbar [color]="isOnline && polling && loaded ? 'contrast' : 'light'">
+    <ion-toolbar [color]="isOnline && polling && loaded ? null : 'light'">
         <p class="ion-text-center" *ngIf="!isOnline">
             {{ 'addon.mod_chat.mustbeonlinetosendmessages' | translate }}
         </p>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index 4dc735805..b941f87e2 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -64,7 +64,7 @@
     </core-loading>
 </ion-content>
 <ion-footer class="footer-adjustable" *ngIf="commentsLoaded && canAddComments">
-    <ion-toolbar color="contrast">
+    <ion-toolbar>
         <core-send-message-form [sendDisabled]="sending" [message]="newComment" (onSubmit)="addComment($event)"
             [placeholder]="'core.comments.addcomment' | translate">
         </core-send-message-form>
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 1a8e8cd89..7ad370c8c 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -253,10 +253,6 @@ ion-tabs.hide-header ion-header {
     display: none;
 }
 
-ion-footer ion-toolbar.ion-color-contrast {
-    background-color: var(--contrast-background);
-}
-
 ion-footer {
     background-color: var(--contrast-background);
 }

From ac92ed0c17086d0b954cfd5c96440aa2ceae36b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 12:42:16 +0200
Subject: [PATCH 06/11] MOBILE-4270 styles: Set popover min width on iOS as
 Android

---
 src/addons/messages/pages/discussion/discussion.scss | 1 +
 src/theme/theme.light.scss                           | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index f3a030dc3..0c82d4a87 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -44,6 +44,7 @@
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 flex-shrink: 1;
+                display: block;
             }
 
             ion-icon {
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 1fe1969b7..1302c3a55 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -228,6 +228,10 @@ html {
         }
     }
 
+    ion-popover.ios {
+        --min-width: 250px;
+    }
+
     ion-toast {
         --color: var(--ion-color-step-50);
         --button-color: var(--primary);

From 4ab33b87842f4dea55a64e23a48b8a60c999ba91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2023 12:58:25 +0200
Subject: [PATCH 07/11] MOBILE-4270 calendar: Show offline message bellow the
 title

---
 src/addons/calendar/pages/event/event.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 2697b2c1a..f41b9804d 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -31,14 +31,6 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="eventLoaded">
-        <!-- There is data to be synchronized -->
-        <ion-card class="core-warning-card" *ngIf="hasOffline || (event && event.deleted)">
-            <ion-item>
-                <ion-icon name="fas-triangle-exclamation" slot="start" aria-hidden="true"></ion-icon>
-                <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendarevent' | translate} }}</ion-label>
-            </ion-item>
-        </ion-card>
-
         <ion-list *ngIf="event">
             <ion-item class="ion-text-wrap addon-calendar-event" collapsible [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                 <core-mod-icon *ngIf="event.moduleIcon" [modicon]="event.moduleIcon" [showAlt]="false" [modname]="event.modulename"
@@ -58,6 +50,13 @@
                     </h1>
                 </ion-label>
             </ion-item>
+            <!-- There is data to be synchronized -->
+            <ion-card class="core-warning-card" *ngIf="hasOffline || event.deleted">
+                <ion-item>
+                    <ion-icon name="fas-triangle-exclamation" slot="start" aria-hidden="true"></ion-icon>
+                    <ion-label>{{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendarevent' | translate} }}</ion-label>
+                </ion-item>
+            </ion-card>
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">{{ 'addon.calendar.when' | translate }}</p>

From 2bfc9c73ccc7408c53d2b586f8343ddfcdd79c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 May 2023 10:30:54 +0200
Subject: [PATCH 08/11] MOBILE-4270 wiki: Fix subwiki ordering

---
 src/addons/mod/wiki/components/index/index.ts | 53 ++++++++++---------
 .../subwiki-picker/subwiki-picker.ts          |  4 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 38780e1bb..ee1f0721e 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -885,7 +885,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         await Promise.all(this.loadedSubwikis.map(async (subwiki) => {
             let groupLabel = '';
 
-            if (subwiki.groupid == 0 && subwiki.userid == 0) {
+            if (subwiki.groupid === 0 && subwiki.userid === 0) {
                 // Add 'All participants' subwiki if needed at the start.
                 if (!allParticipants) {
                     subwikiList.unshift({
@@ -899,7 +899,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     allParticipants = true;
                 }
             } else {
-                if (subwiki.groupid != 0 && userGroups.length > 0) {
+                if (subwiki.groupid !== 0 && userGroups.length > 0) {
                     // Get groupLabel if it has groupId.
                     const group = userGroups.find(group => group.id == subwiki.groupid);
                     groupLabel = group?.name ?? '';
@@ -907,7 +907,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     groupLabel = Translate.instant('addon.mod_wiki.notingroup');
                 }
 
-                if (subwiki.userid != 0) {
+                if (subwiki.userid !== 0) {
                     if (!multiLevelList && subwiki.groupid != 0) {
                         multiLevelList = true;
                     }
@@ -953,8 +953,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         showMyGroupsLabel: boolean,
         multiLevelList: boolean,
     ): void {
-        subwikiList.sort((a, b) => a.groupid - b.groupid);
-
         this.groupWiki = showMyGroupsLabel;
         this.subwikiData.count = subwikiList.length;
 
@@ -1036,34 +1034,39 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 grouping.subwikis.push(subwiki);
             });
         } else if (showMyGroupsLabel) {
-            const noGrouping: AddonModWikiSubwikiListGrouping = { label: '', subwikis: [] };
-            const myGroupsGrouping: AddonModWikiSubwikiListGrouping = { label: Translate.instant('core.mygroups'), subwikis: [] };
-            const otherGroupsGrouping: AddonModWikiSubwikiListGrouping = {
-                label: Translate.instant('core.othergroups'),
-                subwikis: [],
-            };
+            const noGroupSubwikis: AddonModWikiSubwikiListSubwiki[] = [];
+            const myGroupsSubwikis: AddonModWikiSubwikiListSubwiki[] = [];
+            const otherGroupsSubwikis: AddonModWikiSubwikiListSubwiki[] = [];
 
-            // As we loop over each subwiki, add it to the current group
+            // As we loop over each subwiki, add it to the current group.
             subwikiList.forEach((subwiki) => {
                 // Add the subwiki to the currently active grouping.
-                if (subwiki.canedit === undefined) {
-                    noGrouping.subwikis.push(subwiki);
+                if (subwiki.groupid === 0 && subwiki.userid === 0) {
+                    // All participants
+                    noGroupSubwikis.push(subwiki);
                 } else if (subwiki.canedit) {
-                    myGroupsGrouping.subwikis.push(subwiki);
+                    myGroupsSubwikis.push(subwiki);
                 } else {
-                    otherGroupsGrouping.subwikis.push(subwiki);
+                    otherGroupsSubwikis.push(subwiki);
                 }
             });
 
-            // Add each grouping to the subwikis
-            if (noGrouping.subwikis.length > 0) {
-                this.subwikiData.subwikis.push(noGrouping);
-            }
-            if (myGroupsGrouping.subwikis.length > 0) {
-                this.subwikiData.subwikis.push(myGroupsGrouping);
-            }
-            if (otherGroupsGrouping.subwikis.length > 0) {
-                this.subwikiData.subwikis.push(otherGroupsGrouping);
+            if (myGroupsSubwikis.length > 0 && otherGroupsSubwikis.length > 0) {
+                // Add each grouping to the subwikis.
+                if (noGroupSubwikis.length > 0) {
+                    this.subwikiData.subwikis.push({ label: '', subwikis: noGroupSubwikis });
+                }
+
+                if (myGroupsSubwikis.length > 0) {
+                    this.subwikiData.subwikis.push({ label: Translate.instant('core.mygroups'), subwikis: myGroupsSubwikis });
+                }
+
+                if (otherGroupsSubwikis.length > 0) {
+                    this.subwikiData.subwikis.push({ label: Translate.instant('core.othergroups'), subwikis: otherGroupsSubwikis });
+                }
+            } else {
+                // Mix it again since it does not have groups and other groups.
+                this.subwikiData.subwikis.push({ label: '', subwikis: subwikiList });
             }
         } else {
             this.subwikiData.subwikis.push({ label: '', subwikis: subwikiList });
diff --git a/src/addons/mod/wiki/components/subwiki-picker/subwiki-picker.ts b/src/addons/mod/wiki/components/subwiki-picker/subwiki-picker.ts
index fcef85719..ffbbb93e8 100644
--- a/src/addons/mod/wiki/components/subwiki-picker/subwiki-picker.ts
+++ b/src/addons/mod/wiki/components/subwiki-picker/subwiki-picker.ts
@@ -38,10 +38,10 @@ export class AddonModWikiSubwikiPickerComponent {
     isSubwikiSelected(subwiki: AddonModWikiSubwiki): boolean {
 
         if (subwiki.id > 0 && this.currentSubwiki.id > 0) {
-            return subwiki.id == this.currentSubwiki.id;
+            return subwiki.id === this.currentSubwiki.id;
         }
 
-        return subwiki.userid == this.currentSubwiki.userid && subwiki.groupid == this.currentSubwiki.groupid;
+        return subwiki.userid === this.currentSubwiki.userid && subwiki.groupid === this.currentSubwiki.groupid;
     }
 
     /**

From 8d101d35ace483149cb5636b16ff8c03787830f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 May 2023 13:21:01 +0200
Subject: [PATCH 09/11] MOBILE-4270 popover: Add ion-content to popovers to
 enable scrolling

---
 .../components/actionsmenu/actionsmenu.html   | 21 +++--
 .../discussion-options-menu.html              | 80 +++++++++---------
 .../post-options-menu/post-options-menu.html  | 47 ++++++-----
 .../addon-mod-glossary-mode-picker.html       | 14 ++--
 .../addon-mod-wiki-subwiki-picker.html        | 40 ++++-----
 .../core-context-menu-popover.html            | 63 +++++++-------
 .../core-courses-course-options-menu.html     | 82 ++++++++++---------
 7 files changed, 184 insertions(+), 163 deletions(-)

diff --git a/src/addons/mod/data/components/actionsmenu/actionsmenu.html b/src/addons/mod/data/components/actionsmenu/actionsmenu.html
index 177470dcd..242b68f1c 100644
--- a/src/addons/mod/data/components/actionsmenu/actionsmenu.html
+++ b/src/addons/mod/data/components/actionsmenu/actionsmenu.html
@@ -1,9 +1,12 @@
-<ion-list>
-    <ion-item button class="ion-text-wrap" (click)="onItemClick(item)" *ngFor="let item of items" detail="false"
-        [attr.aria-label]="item.text | translate">
-        <ion-label>
-            <p class="item-heading">{{ item.text | translate }}</p>
-        </ion-label>
-        <ion-icon [name]="item.icon" slot="end" aria-hidden="true"></ion-icon>
-    </ion-item>
-</ion-list>
+<ion-content>
+    <ion-list>
+        <ion-item button class="ion-text-wrap" (click)="onItemClick(item)" *ngFor="let item of items" detail="false"
+            [attr.aria-label]="item.text | translate">
+            <ion-label>
+                <p class="item-heading">{{ item.text | translate }}</p>
+            </ion-label>
+            <ion-icon [name]="item.icon" slot="end" aria-hidden="true"></ion-icon>
+        </ion-item>
+    </ion-list>
+
+</ion-content>
diff --git a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
index b609ed6f5..4736dcd70 100644
--- a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
+++ b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
@@ -1,38 +1,42 @@
-<ion-item button class="ion-text-wrap" (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked" detail="false">
-    <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.lockdiscussion' | translate }}</p>
-    </ion-label>
-</ion-item>
-<ion-item button class="ion-text-wrap" (click)="setLockState(false)" *ngIf="discussion.canlock && discussion.locked" detail="false">
-    <ion-icon name="fas-unlock" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.unlockdiscussion' | translate }}</p>
-    </ion-label>
-</ion-item>
-<ion-item button class="ion-text-wrap" (click)="setPinState(true)" *ngIf="canPin && !discussion.pinned" detail="false">
-    <ion-icon name="fas-map-pin" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.pindiscussion' | translate }}</p>
-    </ion-label>
-</ion-item>
-<ion-item button class="ion-text-wrap" (click)="setPinState(false)" *ngIf="canPin && discussion.pinned" detail="false">
-    <ion-icon name="fas-map-pin" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.unpindiscussion' | translate }}</p>
-    </ion-label>
-</ion-item>
-<ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(true)" *ngIf="discussion.canfavourite && !discussion.starred"
-    detail="false">
-    <ion-icon name="fas-star" slot="start" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.addtofavourites' | translate }}</p>
-    </ion-label>
-</ion-item>
-<ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(false)" *ngIf="discussion.canfavourite && discussion.starred"
-    detail="false">
-    <ion-icon name="fas-star" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
-    <ion-label>
-        <p class="item-heading">{{ 'addon.mod_forum.removefromfavourites' | translate }}</p>
-    </ion-label>
-</ion-item>
+<ion-content>
+    <ion-list>
+        <ion-item button class="ion-text-wrap" (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked" detail="false">
+            <ion-icon name="fas-lock" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.lockdiscussion' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="setLockState(false)" *ngIf="discussion.canlock && discussion.locked" detail="false">
+            <ion-icon name="fas-unlock" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.unlockdiscussion' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="setPinState(true)" *ngIf="canPin && !discussion.pinned" detail="false">
+            <ion-icon name="fas-map-pin" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.pindiscussion' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="setPinState(false)" *ngIf="canPin && discussion.pinned" detail="false">
+            <ion-icon name="fas-map-pin" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.unpindiscussion' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(true)" *ngIf="discussion.canfavourite && !discussion.starred"
+            detail="false">
+            <ion-icon name="fas-star" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.addtofavourites' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(false)" *ngIf="discussion.canfavourite && discussion.starred"
+            detail="false">
+            <ion-icon name="fas-star" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.mod_forum.removefromfavourites' | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
+</ion-content>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index ffef01cb8..c4362e55f 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -1,21 +1,26 @@
-<core-loading [hideUntil]="loaded" [fullscreen]="false">
-    <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || canEdit" detail="false">
-        <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'addon.mod_forum.edit' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || canDelete" detail="false">
-        <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
-            <p class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false" [showBrowserWarning]="false">
-        <ion-icon name="fas-up-right-from-square" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
-        </ion-label>
-    </ion-item>
-</core-loading>
+<ion-content>
+    <core-loading [hideUntil]="loaded" [fullscreen]="false">
+        <ion-list>
+            <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || canEdit" detail="false">
+                <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'addon.mod_forum.edit' | translate }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || canDelete" detail="false">
+                <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
+                    <p class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
+                </ion-label>
+            </ion-item>
+            <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false"
+                [showBrowserWarning]="false">
+                <ion-icon name="fas-up-right-from-square" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>
+                    <p class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
+                </ion-label>
+            </ion-item>
+        </ion-list>
+    </core-loading>
+</ion-content>
diff --git a/src/addons/mod/glossary/components/mode-picker/addon-mod-glossary-mode-picker.html b/src/addons/mod/glossary/components/mode-picker/addon-mod-glossary-mode-picker.html
index 747140252..881d44938 100644
--- a/src/addons/mod/glossary/components/mode-picker/addon-mod-glossary-mode-picker.html
+++ b/src/addons/mod/glossary/components/mode-picker/addon-mod-glossary-mode-picker.html
@@ -1,6 +1,8 @@
-<ion-radio-group [(ngModel)]="selectedMode" (ionChange)="modePicked()">
-    <ion-item class="ion-text-wrap" *ngFor="let mode of modes">
-        <ion-label>{{ mode.langkey | translate }}</ion-label>
-        <ion-radio slot="end" [value]="mode.key"></ion-radio>
-    </ion-item>
-</ion-radio-group>
+<ion-content>
+    <ion-radio-group [(ngModel)]="selectedMode" (ionChange)="modePicked()">
+        <ion-item class="ion-text-wrap" *ngFor="let mode of modes">
+            <ion-label>{{ mode.langkey | translate }}</ion-label>
+            <ion-radio slot="end" [value]="mode.key"></ion-radio>
+        </ion-item>
+    </ion-radio-group>
+</ion-content>
diff --git a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
index 7d7f5f0d0..4844903d8 100644
--- a/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
+++ b/src/addons/mod/wiki/components/subwiki-picker/addon-mod-wiki-subwiki-picker.html
@@ -1,19 +1,21 @@
-<ion-list>
-    <ng-container *ngFor="let group of subwikis">
-        <ion-item-divider *ngIf="group.label">
-            <ion-label>
-                <core-format-text [text]="group.label" contextLevel="course" [contextInstanceId]="courseId" [wsNotFiltered]="true"
-                    class="item-heading">
-                </core-format-text>
-            </ion-label>
-        </ion-item-divider>
-        <ion-item class="ion-text-wrap" *ngFor="let subwiki of group.subwikis" (click)="openSubwiki(subwiki)" button
-            [attr.aria-current]="isSubwikiSelected(subwiki) ? 'page' : 'false'" detail="false">
-            <ion-label>
-                <core-format-text [text]="subwiki.name" contextLevel="course" [contextInstanceId]="courseId" [wsNotFiltered]="true">
-                </core-format-text>
-            </ion-label>
-            <ion-icon *ngIf="isSubwikiSelected(subwiki)" name="fas-check" slot="end" aria-hidden="true"></ion-icon>
-        </ion-item>
-    </ng-container>
-</ion-list>
+<ion-content>
+    <ion-list>
+        <ng-container *ngFor="let group of subwikis">
+            <ion-item-divider *ngIf="group.label">
+                <ion-label>
+                    <core-format-text [text]="group.label" contextLevel="course" [contextInstanceId]="courseId" [wsNotFiltered]="true"
+                        class="item-heading">
+                    </core-format-text>
+                </ion-label>
+            </ion-item-divider>
+            <ion-item class="ion-text-wrap" *ngFor="let subwiki of group.subwikis" (click)="openSubwiki(subwiki)" button
+                [attr.aria-current]="isSubwikiSelected(subwiki) ? 'page' : 'false'" detail="false">
+                <ion-label>
+                    <core-format-text [text]="subwiki.name" contextLevel="course" [contextInstanceId]="courseId" [wsNotFiltered]="true">
+                    </core-format-text>
+                </ion-label>
+                <ion-icon *ngIf="isSubwikiSelected(subwiki)" name="fas-check" slot="end" aria-hidden="true"></ion-icon>
+            </ion-item>
+        </ng-container>
+    </ion-list>
+</ion-content>
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index c6cb35d5d..7ba6c7cd4 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -1,30 +1,33 @@
-<ion-list [id]="uniqueId" role="menu">
-    <ion-list-header *ngIf="title">
-        <ion-label>{{title}}</ion-label>
-    </ion-list-header>
-    <ion-item class="ion-text-wrap" *ngFor="let item of items" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin"
-        [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
-        [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)"
-        [showBrowserWarning]="item.showBrowserWarning">
-        <ion-label>
-            <p class="item-heading">
-                <core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text>
-            </p>
-        </ion-label>
-        <ng-container *ngIf="(item.href || item.action) && item.iconAction">
-            <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
-                [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
-            </ion-icon>
-            <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end" [attr.aria-label]="'core.loading' | translate">
-            </ion-spinner>
-            <ion-toggle *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)" slot="end">
-            </ion-toggle>
-        </ng-container>
-        <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
-            <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
-            <span class="sr-only" *ngIf="item.badgeA11yText">
-                {{ item.badgeA11yText | translate: {$a : item.badge } }}
-            </span>
-        </ion-badge>
-    </ion-item>
-</ion-list>
+<ion-content>
+    <ion-list [id]="uniqueId" role="menu">
+        <ion-list-header *ngIf="title">
+            <ion-label>{{title}}</ion-label>
+        </ion-list-header>
+        <ion-item class="ion-text-wrap" *ngFor="let item of items" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin"
+            [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
+            [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)"
+            [showBrowserWarning]="item.showBrowserWarning">
+            <ion-label>
+                <p class="item-heading">
+                    <core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text>
+                </p>
+            </ion-label>
+            <ng-container *ngIf="(item.href || item.action) && item.iconAction">
+                <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="item.iconAction"
+                    [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
+                </ion-icon>
+                <ion-spinner *ngIf="item.iconAction == 'spinner'" slot="end" [attr.aria-label]="'core.loading' | translate">
+                </ion-spinner>
+                <ion-toggle *ngIf="item.iconAction == 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)"
+                    slot="end">
+                </ion-toggle>
+            </ng-container>
+            <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
+                <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
+                <span class="sr-only" *ngIf="item.badgeA11yText">
+                    {{ item.badgeA11yText | translate: {$a : item.badge } }}
+                </span>
+            </ion-badge>
+        </ion-item>
+    </ion-list>
+</ion-content>
diff --git a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
index bcd038c96..17633d581 100644
--- a/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
+++ b/src/core/features/courses/components/course-options-menu/core-courses-course-options-menu.html
@@ -1,40 +1,42 @@
-<ion-list>
-    <ion-item button class="ion-text-wrap" (click)="action('download')" *ngIf="downloadCourseEnabled" detail="false">
-        <ion-icon *ngIf="!prefetch.loading" [name]="prefetch.icon" slot="start" aria-hidden="true"></ion-icon>
-        <ion-spinner *ngIf="prefetch.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
-        <ion-label>
-            <p class="item-heading">{{ prefetch.statusTranslatable | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="action('delete')" detail="false"
-        *ngIf="prefetch.status == 'downloaded' || prefetch.status == 'outdated'">
-        <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'addon.storagemanager.deletedata' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="action('hide')" *ngIf="!course.hidden" detail="false">
-        <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'core.courses.hidecourse' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="action('show')" *ngIf="course.hidden" detail="false">
-        <ion-icon name="fas-eye-slash" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'core.courses.show' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="action('favourite')" *ngIf="!course.isfavourite" detail="false">
-        <ion-icon name="fas-star" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'core.courses.addtofavourites' | translate }}</p>
-        </ion-label>
-    </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="action('unfavourite')" *ngIf="course.isfavourite" detail="false">
-        <ion-icon name="far-star" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>
-            <p class="item-heading">{{ 'core.courses.removefromfavourites' | translate }}</p>
-        </ion-label>
-    </ion-item>
-</ion-list>
+<ion-content>
+    <ion-list>
+        <ion-item button class="ion-text-wrap" (click)="action('download')" *ngIf="downloadCourseEnabled" detail="false">
+            <ion-icon *ngIf="!prefetch.loading" [name]="prefetch.icon" slot="start" aria-hidden="true"></ion-icon>
+            <ion-spinner *ngIf="prefetch.loading" slot="start" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
+            <ion-label>
+                <p class="item-heading">{{ prefetch.statusTranslatable | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="action('delete')" detail="false"
+            *ngIf="prefetch.status == 'downloaded' || prefetch.status == 'outdated'">
+            <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'addon.storagemanager.deletedata' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="action('hide')" *ngIf="!course.hidden" detail="false">
+            <ion-icon name="fas-eye" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.hidecourse' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="action('show')" *ngIf="course.hidden" detail="false">
+            <ion-icon name="fas-eye-slash" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.show' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="action('favourite')" *ngIf="!course.isfavourite" detail="false">
+            <ion-icon name="fas-star" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.addtofavourites' | translate }}</p>
+            </ion-label>
+        </ion-item>
+        <ion-item button class="ion-text-wrap" (click)="action('unfavourite')" *ngIf="course.isfavourite" detail="false">
+            <ion-icon name="far-star" slot="start" aria-hidden="true"></ion-icon>
+            <ion-label>
+                <p class="item-heading">{{ 'core.courses.removefromfavourites' | translate }}</p>
+            </ion-label>
+        </ion-item>
+    </ion-list>
+</ion-content>

From 96a121f3dbe3747552c86f0c9e79f8df2ce7d641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 May 2023 12:22:58 +0200
Subject: [PATCH 10/11] MOBILE-4270 behat: Specify failed field to be set on
 error

---
 local_moodleappbehat/tests/behat/behat_app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local_moodleappbehat/tests/behat/behat_app.php b/local_moodleappbehat/tests/behat/behat_app.php
index 67776a49f..326986838 100644
--- a/local_moodleappbehat/tests/behat/behat_app.php
+++ b/local_moodleappbehat/tests/behat/behat_app.php
@@ -765,7 +765,7 @@ class behat_app extends behat_app_helper {
             $result = $this->runtime_js("setField('$field', '$value')");
 
             if ($result !== 'OK') {
-                throw new DriverException('Error setting field - ' . $result);
+                throw new DriverException('Error setting field "' . $field . '" - ' . $result);
             }
 
             return true;

From 8113ea5f29f0c65b96f6746006b0143f02387454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 May 2023 12:41:59 +0200
Subject: [PATCH 11/11] MOBILE-4270 feedback: Avoid division by zero on
 doughnut charts

---
 src/addons/mod/feedback/components/index/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/addons/mod/feedback/components/index/index.ts b/src/addons/mod/feedback/components/index/index.ts
index 2f877c17a..e9e4defce 100644
--- a/src/addons/mod/feedback/components/index/index.ts
+++ b/src/addons/mod/feedback/components/index/index.ts
@@ -334,15 +334,16 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
                     return label;
                 });
 
-                item.chartData = parsedData.map((dataItem) => <number> dataItem.answercount);
+                item.chartData = parsedData.map((dataItem) => Number(dataItem.answercount));
 
-                if (item.typ == 'multichoicerated') {
+                if (item.typ === 'multichoicerated') {
                     item.average = parsedData.reduce((prev, current) => prev + Number(current.avg), 0.0);
                 }
 
                 const subtype = item.presentation.charAt(0);
 
-                const single = subtype != 'c';
+                // Display bar chart if there are no answers to avoid division by 0 error.
+                const single = subtype !== 'c' && item.chartData.some((count) => count > 0);
                 item.chartType = single ? 'doughnut' : 'bar';
                 item.templateName = 'chart';
                 break;