From a76b18a127eae468da955252bcb9e4d01f6d27d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 09:46:57 +0100
Subject: [PATCH 01/17] MOBILE-3947 chore: Remove old ionic migration

---
 .github/workflows/migration.yml | 18 --------------
 ionic-migration.json            | 43 ---------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 .github/workflows/migration.yml
 delete mode 100644 ionic-migration.json

diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml
deleted file mode 100644
index 360a4361b..000000000
--- a/.github/workflows/migration.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Migration checks
-
-on: workflow_dispatch
-
-jobs:
-  checks:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v3
-      with:
-        node-version-file: '.nvmrc'
-    - run: npm ci --no-audit
-    - run: result=$(find src -type f -iname '*.html' -exec sh -c 'cat {} | tr "\n" " " | grep -Eo "class=\"[^\"]+\"[^>]+class=\"" ' \; | wc -l); test $result -eq 0
-    - run: npm install -D @ionic/v4-migration-tslint
-    - run: npx tslint -c ionic-migration.json -p tsconfig.json
diff --git a/ionic-migration.json b/ionic-migration.json
deleted file mode 100644
index 8da798098..000000000
--- a/ionic-migration.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "rulesDirectory": ["@ionic/v4-migration-tslint/rules"],
-  "rules": {
-    "ion-action-sheet-method-create-parameters-renamed": true,
-    "ion-alert-method-create-parameters-renamed": true,
-    "ion-back-button-not-added-by-default": { "options": [true], "severity": "warning" },
-    "ion-button-attributes-renamed": true,
-    "ion-button-is-now-an-element": true,
-    "ion-buttons-attributes-renamed": true,
-    "ion-col-attributes-renamed": true,
-    "ion-datetime-capitalization-changed": true,
-    "ion-fab-attributes-renamed": true,
-    "ion-fab-button-is-now-an-element": true,
-    "ion-fab-fixed-content": true,
-    "ion-icon-attribute-is-active-removed": true,
-    "ion-item-attributes-renamed": true,
-    "ion-item-divider-ion-label-required": true,
-    "ion-item-ion-label-required": true,
-    "ion-item-is-now-an-element": true,
-    "ion-item-option-is-now-an-element": true,
-    "ion-item-option-method-get-sliding-percent-renamed": true,
-    "ion-item-options-attribute-values-renamed": true,
-    "ion-label-attributes-renamed": true,
-    "ion-list-header-ion-label-required": true,
-    "ion-loading-method-create-parameters-renamed": true,
-    "ion-menu-events-renamed": true,
-    "ion-menu-toggle-is-now-an-element": true,
-    "ion-navbar-is-now-ion-toolbar": true,
-    "ion-option-is-now-ion-select-option": true,
-    "ion-overlay-method-create-should-use-await": true,
-    "ion-overlay-method-present-should-use-await": { "options": [true], "severity": "warning" },
-    "ion-radio-attributes-renamed": true,
-    "ion-radio-group-is-now-an-element": true,
-    "ion-radio-slot-required": true,
-    "ion-range-attributes-renamed": true,
-    "ion-segment-button-ion-label-required": true,
-    "ion-spinner-attribute-values-renamed": true,
-    "ion-tabs-refactored": { "options": [true], "severity": "warning" },
-    "ion-text-is-now-an-element": true
-  }
-}
-
-

From 8265f0fbe1ba168271fae4c337c2ba6ae3a290ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 11:28:14 +0100
Subject: [PATCH 02/17] MOBILE-3947 chore: Remove unneeded optional chaining on
 HTML

---
 src/addons/mod/assign/pages/index/index.html  |  2 +-
 .../bigbluebuttonbn/pages/index/index.html    |  2 +-
 src/addons/mod/book/pages/index/index.html    |  2 +-
 src/addons/mod/chat/pages/index/index.html    |  2 +-
 src/addons/mod/choice/pages/index/index.html  |  2 +-
 .../mod/feedback/pages/index/index.html       |  2 +-
 src/addons/mod/folder/pages/index/index.html  |  2 +-
 .../mod/glossary/pages/index/index.html       |  2 +-
 src/addons/mod/imscp/pages/index/index.html   |  2 +-
 src/addons/mod/lesson/pages/index/index.html  |  2 +-
 .../mod/lesson/pages/player/player.html       | 34 +++++++++----------
 src/addons/mod/page/pages/index/index.html    |  2 +-
 src/addons/mod/quiz/pages/index/index.html    |  2 +-
 .../mod/resource/pages/index/index.html       |  2 +-
 src/addons/mod/scorm/pages/index/index.html   |  2 +-
 src/addons/mod/url/pages/index/index.html     |  2 +-
 src/addons/mod/wiki/pages/index/index.html    |  2 +-
 17 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html
index 2d3f9be93..0ee3bc5a8 100644
--- a/src/addons/mod/assign/pages/index/index.html
+++ b/src/addons/mod/assign/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/bigbluebuttonbn/pages/index/index.html b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
index 273ff5994..506ef400b 100644
--- a/src/addons/mod/bigbluebuttonbn/pages/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html
index 5e55e1db3..5b58f63cc 100644
--- a/src/addons/mod/book/pages/index/index.html
+++ b/src/addons/mod/book/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/chat/pages/index/index.html b/src/addons/mod/chat/pages/index/index.html
index 5f2cec7ce..8516625cf 100644
--- a/src/addons/mod/chat/pages/index/index.html
+++ b/src/addons/mod/chat/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/choice/pages/index/index.html b/src/addons/mod/choice/pages/index/index.html
index 82d3899af..b1837e151 100644
--- a/src/addons/mod/choice/pages/index/index.html
+++ b/src/addons/mod/choice/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/feedback/pages/index/index.html b/src/addons/mod/feedback/pages/index/index.html
index 091b40c1c..a0ca034af 100644
--- a/src/addons/mod/feedback/pages/index/index.html
+++ b/src/addons/mod/feedback/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html
index cfafeebb9..0082579ce 100644
--- a/src/addons/mod/folder/pages/index/index.html
+++ b/src/addons/mod/folder/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/glossary/pages/index/index.html b/src/addons/mod/glossary/pages/index/index.html
index 501b8f25d..486a6fe89 100644
--- a/src/addons/mod/glossary/pages/index/index.html
+++ b/src/addons/mod/glossary/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/imscp/pages/index/index.html b/src/addons/mod/imscp/pages/index/index.html
index 12b3a7f08..1ecc39a45 100644
--- a/src/addons/mod/imscp/pages/index/index.html
+++ b/src/addons/mod/imscp/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/lesson/pages/index/index.html b/src/addons/mod/lesson/pages/index/index.html
index f83508304..2b4c25520 100644
--- a/src/addons/mod/lesson/pages/index/index.html
+++ b/src/addons/mod/lesson/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index 00187eb49..a351a1109 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
@@ -63,7 +63,7 @@
                     <ion-item-divider class="ion-text-wrap" *ngIf="pageContent">
                         <ion-label>
                             <h2>
-                                <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="pageContent"
+                                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"
                                     contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                                 </core-format-text>
                             </h2>
@@ -87,8 +87,8 @@
                             <ion-item *ngIf="question.textarea">
                                 <ion-label class="sr-only">{{ 'core.content' | translate }}</ion-label>
                                 <core-rich-text-editor placeholder="{{ 'addon.mod_lesson.youranswer' | translate }}"
-                                    [control]="question.control" [component]="component" [componentId]="lesson?.coursemodule"
-                                    [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                    [control]="question.control" [component]="component" [componentId]="lesson.coursemodule"
+                                    [autoSave]="true" contextLevel="module" [contextInstanceId]="lesson.coursemodule"
                                     elementId="answer_editor">
                                 </core-rich-text-editor>
                             </ion-item>
@@ -96,8 +96,8 @@
                                 <ion-label>
                                     <p class="item-heading">{{ 'addon.mod_lesson.youranswer' | translate }}</p>
                                     <p>
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule"
-                                            [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule"
+                                            [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson.coursemodule"
                                             [courseId]="courseId">
                                         </core-format-text>
                                     </p>
@@ -112,7 +112,7 @@
                                 <ion-item class="ion-text-wrap" *ngFor="let option of question.options">
                                     <ion-label>
                                         <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text"
-                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                            contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </ion-label>
                                     <ion-radio slot="end" [id]="option.id" [value]="option.value" [disabled]="option.disabled">
@@ -124,8 +124,8 @@
                             <ng-container *ngIf="question.multi">
                                 <ion-item class="ion-text-wrap" *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="option.text"
-                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text"
+                                            contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </ion-label>
                                     <ion-checkbox [id]="option.id" [formControlName]="option.name" slot="end"></ion-checkbox>
@@ -138,8 +138,8 @@
                             <ion-item class="ion-text-wrap" *ngFor="let row of question.rows">
                                 <ion-label>
                                     <p>
-                                        <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="row.text"
-                                            contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="row.text"
+                                            contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                                         </core-format-text>
                                     </p>
                                 </ion-label>
@@ -173,7 +173,7 @@
                         </ion-col>
                     </ion-row>
                 </ion-grid>
-                <ion-item class="ion-text-wrap" *ngIf="lesson?.progressbar && !canManage && pageData">
+                <ion-item class="ion-text-wrap" *ngIf="lesson.progressbar && !canManage && pageData">
                     <ion-label>
                         <span id="addon-mod_lesson-{{cmId}}-progress">
                             {{ 'addon.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}
@@ -182,7 +182,7 @@
                         </core-progress-bar>
                     </ion-label>
                 </ion-item>
-                <ion-card class="core-info-card" *ngIf="lesson?.progressbar && canManage">
+                <ion-card class="core-info-card" *ngIf="lesson.progressbar && canManage">
                     <ion-item class="ion-text-wrap">
                         <ion-icon name="fas-circle-info" slot="start" aria-hidden="true"></ion-icon>
                         <ion-label>{{ 'addon.mod_lesson.progressbarteacherwarning2' | translate }}</ion-label>
@@ -253,14 +253,14 @@
                 <!-- If activity link was successfully formatted, render the button. -->
                 <ion-button *ngIf="activityLink && activityLink.formatted" expand="block" fill="outline" [href]="activityLink.href"
                     core-link [capture]="true" class="ion-text-wrap ion-margin button-no-uppercase">
-                    <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                    <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"
                         [courseId]="courseId">
                     </core-format-text>
                 </ion-button>
                 <ion-item class="ion-text-wrap" *ngIf="activityLink && !activityLink.formatted">
                     <!-- Activity link wasn't formatted, render the original link. -->
                     <ion-label>
-                        <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
+                        <core-format-text [text]="activityLink.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"
                             [courseId]="courseId">
                         </core-format-text>
                     </ion-label>
@@ -275,8 +275,8 @@
                 <ion-item class="ion-text-wrap" *ngIf="!processData.reviewmode || review">
                     <ion-label>
                         <div *ngIf="!processData.reviewmode">
-                            <core-format-text [component]="component" [componentId]="lesson?.coursemodule" [text]="processData.feedback"
-                                contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
+                            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="processData.feedback"
+                                contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
                             </core-format-text>
                         </div>
                         <div *ngIf="review">
diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html
index 8cc1affc1..013f28a4d 100644
--- a/src/addons/mod/page/pages/index/index.html
+++ b/src/addons/mod/page/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html
index 83bd934c9..5691e4137 100644
--- a/src/addons/mod/quiz/pages/index/index.html
+++ b/src/addons/mod/quiz/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index 8413a0de5..be5afe998 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/scorm/pages/index/index.html b/src/addons/mod/scorm/pages/index/index.html
index 54f781209..1e5f18cd5 100644
--- a/src/addons/mod/scorm/pages/index/index.html
+++ b/src/addons/mod/scorm/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html
index 5de9e34ee..7d4b31ae6 100644
--- a/src/addons/mod/url/pages/index/index.html
+++ b/src/addons/mod/url/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id"></core-format-text>
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             </h1>
         </ion-title>
 
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index c11fb730c..1289bc186 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>

From a81f93822fd141915d835aed4c5e639573175c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 13:32:19 +0100
Subject: [PATCH 03/17] MOBILE-3947 chore: Change import to use on Sass

---
 .../components/onlineusers/onlineusers.scss   |  2 +-
 .../recentactivity/recentactivity.scss        |  2 +-
 .../recentlyaccesseditems.scss                |  2 +-
 .../timeline/components/events/events.scss    |  2 +-
 src/addons/calendar/calendar-common.scss      |  2 +-
 .../components/calendar/calendar.scss         |  2 +-
 .../calendar/components/filter/filter.scss    |  2 +-
 src/addons/messages/messages-common.scss      |  2 +-
 .../messages/pages/discussion/discussion.scss |  3 +-
 .../messages/pages/discussion/discussion.ts   |  2 +-
 src/addons/mod/chat/pages/chat/chat.scss      |  2 --
 src/addons/mod/chat/pages/chat/chat.ts        |  2 +-
 .../session-messages/session-messages.scss    |  2 --
 .../session-messages/session-messages.ts      |  2 +-
 src/addons/mod/data/data-forms.scss           |  2 +-
 src/addons/mod/data/data.scss                 |  2 +-
 .../mod/forum/components/index/index.scss     |  2 +-
 .../mod/forum/components/post/post.scss       |  2 +-
 .../pages/new-discussion/new-discussion.scss  |  2 +-
 .../attempt-results/attempt-results.scss      |  2 +-
 .../lesson/pages/user-retake/user-retake.scss |  2 +-
 .../mod/resource/components/index/index.scss  |  2 +-
 .../mod/scorm/components/index/index.scss     |  2 +-
 .../mod/wiki/components/index/index.scss      |  2 +-
 src/addons/notifications/notifications.scss   |  2 +-
 src/addons/notifications/pages/list/list.scss |  2 +-
 .../pages/notification/notification.scss      |  2 +-
 .../component/ddimageortext.scss              |  2 +-
 .../ddimageortext/component/ddimageortext.ts  |  2 +-
 src/addons/qtype/ddwtos/component/ddwtos.scss |  2 +-
 src/addons/qtype/ddwtos/component/ddwtos.ts   |  2 +-
 .../pages/course-storage/course-storage.scss  |  2 +-
 .../checkbox/component/checkbox.scss          |  2 +-
 src/core/components/combobox/combobox.scss    |  2 +-
 .../context-menu/context-menu-popover.scss    |  2 +-
 .../components/course-image/course-image.scss |  2 +-
 src/core/components/empty-box/empty-box.scss  |  2 +-
 src/core/components/loading/loading.scss      |  2 +-
 .../mark-required/mark-required.scss          |  2 +-
 src/core/components/message/message.scss      |  2 +-
 src/core/components/mod-icon/mod-icon.scss    |  2 +-
 .../navigation-bar/navigation-bar.scss        |  2 +-
 .../components/progress-bar/progress-bar.scss |  2 +-
 .../refresh-button-modal.scss                 |  2 +-
 .../components/sheet-modal/sheet-modal.scss   |  2 +-
 .../show-password/show-password.scss          |  2 +-
 .../components/split-view/split-view.scss     |  2 +-
 src/core/components/tabs/tabs.scss            |  2 +-
 .../components/user-avatar/user-avatar.scss   |  2 +-
 .../side-blocks-button.scss                   |  2 +-
 .../components/side-blocks/side-blocks.scss   |  2 +-
 .../comments/pages/viewer/viewer.scss         |  2 --
 .../features/comments/pages/viewer/viewer.ts  |  2 +-
 .../components/course-index/course-index.scss |  2 +-
 .../module-info/course-module-info.scss       |  2 +-
 .../module-navigation/module-navigation.scss  |  2 +-
 .../module-summary/module-summary.scss        |  2 +-
 .../course/components/module/module.scss      |  2 +-
 .../pages/course-summary/course-summary.scss  |  2 +-
 .../features/course/pages/index/index.scss    |  2 +-
 .../pages/module-preview/module-preview.scss  |  2 +-
 .../course-list-item/course-list-item.scss    |  2 +-
 .../rich-text-editor/rich-text-editor.scss    |  2 +-
 .../features/grades/pages/course/course.scss  |  2 +-
 .../site-onboarding/site-onboarding.scss      |  2 +-
 src/core/features/login/login.scss            |  2 +-
 src/core/features/login/pages/site/site.scss  |  2 +-
 .../components/user-menu/user-menu.scss       |  2 +-
 .../features/mainmenu/pages/menu/menu.scss    |  2 +-
 src/core/features/question/question.scss      |  2 +-
 .../reminders/components/date/date.scss       |  2 +-
 .../report-column/report-column.scss          |  2 +-
 .../report-detail/report-detail.scss          |  2 +-
 .../report-summary/report-summary.scss        |  2 +-
 .../features/sitehome/pages/index/index.scss  |  2 +-
 .../features/tag/components/list/list.scss    |  2 +-
 src/theme/components/discussion.scss          |  2 +-
 src/theme/components/format-text.scss         | 18 ++++++------
 src/theme/theme.scss                          | 28 +++++++++----------
 79 files changed, 97 insertions(+), 104 deletions(-)

diff --git a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
index 1de16d878..678e73a3f 100644
--- a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
+++ b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 :host {
     --core-avatar-size: 30px;
 
diff --git a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
index a72a303fb..14537fe1c 100644
--- a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
+++ b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host .core-block-content ::ng-deep {
     .activitydate, .activityhead {
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
index 77fad00dd..9f161779f 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-horizontal-scroll div.core-horizontal-scroll-item {
diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss
index 07634e1d5..68e7378f5 100644
--- a/src/addons/block/timeline/components/events/events.scss
+++ b/src/addons/block/timeline/components/events/events.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 h3 {
     font-weight: bold;
diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss
index 3746e7872..8b3f5108f 100644
--- a/src/addons/calendar/calendar-common.scss
+++ b/src/addons/calendar/calendar-common.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
 
diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss
index 0df183e40..f3d27322f 100644
--- a/src/addons/calendar/components/calendar/calendar.scss
+++ b/src/addons/calendar/components/calendar/calendar.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --addon-calendar-blank-day-background-color: var(--light);
diff --git a/src/addons/calendar/components/filter/filter.scss b/src/addons/calendar/components/filter/filter.scss
index 29e652dd0..dd51360a8 100644
--- a/src/addons/calendar/components/filter/filter.scss
+++ b/src/addons/calendar/components/filter/filter.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     ion-item {
diff --git a/src/addons/messages/messages-common.scss b/src/addons/messages/messages-common.scss
index 255a9a156..da75d7348 100644
--- a/src/addons/messages/messages-common.scss
+++ b/src/addons/messages/messages-common.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .addon-messages-conversation-item,
diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss
index 0c82d4a87..2de83952c 100644
--- a/src/addons/messages/pages/discussion/discussion.scss
+++ b/src/addons/messages/pages/discussion/discussion.scss
@@ -1,5 +1,4 @@
-@import "~theme/components/discussion.scss";
-@import "~theme/globals.scss";
+@use "theme/globals" as *;
 
 :host {
 
diff --git a/src/addons/messages/pages/discussion/discussion.ts b/src/addons/messages/pages/discussion/discussion.ts
index 74e817bc7..6f36ec0f9 100644
--- a/src/addons/messages/pages/discussion/discussion.ts
+++ b/src/addons/messages/pages/discussion/discussion.ts
@@ -51,7 +51,7 @@ import { CoreDom } from '@singletons/dom';
 @Component({
     selector: 'page-addon-messages-discussion',
     templateUrl: 'discussion.html',
-    styleUrls: ['discussion.scss'],
+    styleUrls: ['../../../../theme/components/discussion.scss', 'discussion.scss'],
 })
 export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterViewInit {
 
diff --git a/src/addons/mod/chat/pages/chat/chat.scss b/src/addons/mod/chat/pages/chat/chat.scss
index 79a0b6be9..2ee6b3c8c 100644
--- a/src/addons/mod/chat/pages/chat/chat.scss
+++ b/src/addons/mod/chat/pages/chat/chat.scss
@@ -1,5 +1,3 @@
-@import "~theme/components/discussion.scss";
-
 :host {
     .addon-mod_chat-notice {
         margin-top: 8px;
diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts
index e1c168c10..bbba13c00 100644
--- a/src/addons/mod/chat/pages/chat/chat.ts
+++ b/src/addons/mod/chat/pages/chat/chat.ts
@@ -37,7 +37,7 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 @Component({
     selector: 'page-addon-mod-chat-chat',
     templateUrl: 'chat.html',
-    styleUrls: ['chat.scss'],
+    styleUrls: ['../../../../../theme/components/discussion.scss', 'chat.scss'],
 })
 export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
 
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.scss b/src/addons/mod/chat/pages/session-messages/session-messages.scss
index 79a0b6be9..2ee6b3c8c 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.scss
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.scss
@@ -1,5 +1,3 @@
-@import "~theme/components/discussion.scss";
-
 :host {
     .addon-mod_chat-notice {
         margin-top: 8px;
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.ts b/src/addons/mod/chat/pages/session-messages/session-messages.ts
index fa94740e1..8401d485d 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.ts
@@ -31,7 +31,7 @@ import { CoreTime } from '@singletons/time';
 @Component({
     selector: 'page-addon-mod-chat-session-messages',
     templateUrl: 'session-messages.html',
-    styleUrls: ['session-messages.scss'],
+    styleUrls: ['../../../../../theme/components/discussion.scss', 'session-messages.scss'],
 })
 export class AddonModChatSessionMessagesPage implements OnInit {
 
diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss
index 1ee47a8c0..92f6ff9fa 100644
--- a/src/addons/mod/data/data-forms.scss
+++ b/src/addons/mod/data/data-forms.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 // Edit and search modal.
 :host {
diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss
index b844da080..d96d7035c 100644
--- a/src/addons/mod/data/data.scss
+++ b/src/addons/mod/data/data.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 /// @prop - The padding for the grid column
 $grid-column-padding:        var(--ion-grid-column-padding, 5px) !default;
diff --git a/src/addons/mod/forum/components/index/index.scss b/src/addons/mod/forum/components/index/index.scss
index c89233e8f..be5046279 100644
--- a/src/addons/mod/forum/components/index/index.scss
+++ b/src/addons/mod/forum/components/index/index.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
 
diff --git a/src/addons/mod/forum/components/post/post.scss b/src/addons/mod/forum/components/post/post.scss
index b4a5b0092..4dfb6f53a 100644
--- a/src/addons/mod/forum/components/post/post.scss
+++ b/src/addons/mod/forum/components/post/post.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host .addon-mod_forum-post {
     background-color: var(--ion-item-background);
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.scss b/src/addons/mod/forum/pages/new-discussion/new-discussion.scss
index 9ddfaed1c..92b171fe7 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.scss
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .addon-forum-group-info {
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
index 09e782178..a9021111d 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-warning-item {
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.scss b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
index 8c364a127..7ff927840 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.scss
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .button-disabled {
diff --git a/src/addons/mod/resource/components/index/index.scss b/src/addons/mod/resource/components/index/index.scss
index 9874efd46..88b63eec0 100644
--- a/src/addons/mod/resource/components/index/index.scss
+++ b/src/addons/mod/resource/components/index/index.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .addon-mod_resource-outdated {
diff --git a/src/addons/mod/scorm/components/index/index.scss b/src/addons/mod/scorm/components/index/index.scss
index f8fc150a1..2bda23817 100644
--- a/src/addons/mod/scorm/components/index/index.scss
+++ b/src/addons/mod/scorm/components/index/index.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .addon-mod_scorm-attempt-summary ion-item > p {
diff --git a/src/addons/mod/wiki/components/index/index.scss b/src/addons/mod/wiki/components/index/index.scss
index 9bbc1c0ed..e2a7ffaac 100644
--- a/src/addons/mod/wiki/components/index/index.scss
+++ b/src/addons/mod/wiki/components/index/index.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 $addon-mod-wiki-toc-level-padding:    12px !default;
 
diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss
index 60caa6312..9dc8d2b0b 100644
--- a/src/addons/notifications/notifications.scss
+++ b/src/addons/notifications/notifications.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --extra-icon-size: 16px;
diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/pages/list/list.scss
index cc83595d1..a5e92ddc2 100644
--- a/src/addons/notifications/pages/list/list.scss
+++ b/src/addons/notifications/pages/list/list.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 ion-item {
     ion-label {
diff --git a/src/addons/notifications/pages/notification/notification.scss b/src/addons/notifications/pages/notification/notification.scss
index 7b0943218..c1c58d5ab 100644
--- a/src/addons/notifications/pages/notification/notification.scss
+++ b/src/addons/notifications/pages/notification/notification.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
 
diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.scss b/src/addons/qtype/ddimageortext/component/ddimageortext.scss
index dfb6f7f01..de99dcda6 100644
--- a/src/addons/qtype/ddimageortext/component/ddimageortext.scss
+++ b/src/addons/qtype/ddimageortext/component/ddimageortext.scss
@@ -1,4 +1,4 @@
-@import "~core/features/question/question";
+@use "theme/globals" as *;
 
 // Style ddimageortext content a bit. Almost all these styles are copied from Moodle.
 :host {
diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.ts b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
index 6550c2c38..2fbf0b746 100644
--- a/src/addons/qtype/ddimageortext/component/ddimageortext.ts
+++ b/src/addons/qtype/ddimageortext/component/ddimageortext.ts
@@ -24,7 +24,7 @@ import { AddonQtypeDdImageOrTextQuestion } from '../classes/ddimageortext';
 @Component({
     selector: 'addon-qtype-ddimageortext',
     templateUrl: 'addon-qtype-ddimageortext.html',
-    styleUrls: ['ddimageortext.scss'],
+    styleUrls: ['../../../../core/features/question/question.scss', 'ddimageortext.scss'],
 })
 export class AddonQtypeDdImageOrTextComponent
     extends CoreQuestionBaseComponent<AddonModQuizDdImageOrTextQuestionData>
diff --git a/src/addons/qtype/ddwtos/component/ddwtos.scss b/src/addons/qtype/ddwtos/component/ddwtos.scss
index 9c7bed139..557fc3f76 100644
--- a/src/addons/qtype/ddwtos/component/ddwtos.scss
+++ b/src/addons/qtype/ddwtos/component/ddwtos.scss
@@ -1,4 +1,4 @@
-@import "~core/features/question/question";
+@use "theme/globals" as *;
 
 // Style ddwtos content a bit. Almost all these styles are copied from Moodle.
 .addon-qtype-ddwtos-container {
diff --git a/src/addons/qtype/ddwtos/component/ddwtos.ts b/src/addons/qtype/ddwtos/component/ddwtos.ts
index 3d76a2747..c3f8631d5 100644
--- a/src/addons/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addons/qtype/ddwtos/component/ddwtos.ts
@@ -25,7 +25,7 @@ import { AddonQtypeDdwtosQuestion } from '../classes/ddwtos';
 @Component({
     selector: 'addon-qtype-ddwtos',
     templateUrl: 'addon-qtype-ddwtos.html',
-    styleUrls: ['ddwtos.scss'],
+    styleUrls: ['../../../../core/features/question/question.scss', 'ddwtos.scss'],
 })
 export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent<AddonModQuizDdwtosQuestionData> implements OnDestroy {
 
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss
index becd7cebb..640d75a3e 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.scss
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --course-storage-max-activity-height: 120px;
diff --git a/src/addons/userprofilefield/checkbox/component/checkbox.scss b/src/addons/userprofilefield/checkbox/component/checkbox.scss
index 7306a701f..1fe09f21c 100644
--- a/src/addons/userprofilefield/checkbox/component/checkbox.scss
+++ b/src/addons/userprofilefield/checkbox/component/checkbox.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --text-overflow: initial;
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 3afd8c316..80c9379ad 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     max-width: 100%;
diff --git a/src/core/components/context-menu/context-menu-popover.scss b/src/core/components/context-menu/context-menu-popover.scss
index 6461e72ef..128643a79 100644
--- a/src/core/components/context-menu/context-menu-popover.scss
+++ b/src/core/components/context-menu/context-menu-popover.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 ion-list {
     padding: 0;
diff --git a/src/core/components/course-image/course-image.scss b/src/core/components/course-image/course-image.scss
index 5bd16990d..c530efbd0 100644
--- a/src/core/components/course-image/course-image.scss
+++ b/src/core/components/course-image/course-image.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --core-image-radius: var(--core-courseimage-radius);
diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss
index 86fe96d48..7c57385ea 100644
--- a/src/core/components/empty-box/empty-box.scss
+++ b/src/core/components/empty-box/empty-box.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --image-size: 120px;
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index ff665fdf2..6b2b08ffe 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 @mixin inline() {
     &:not(.core-loading-loaded) {
diff --git a/src/core/components/mark-required/mark-required.scss b/src/core/components/mark-required/mark-required.scss
index 1c05a77f4..51535396a 100644
--- a/src/core/components/mark-required/mark-required.scss
+++ b/src/core/components/mark-required/mark-required.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-input-required-asterisk {
diff --git a/src/core/components/message/message.scss b/src/core/components/message/message.scss
index 3ece454ac..f179df22d 100644
--- a/src/core/components/message/message.scss
+++ b/src/core/components/message/message.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --message-background: var(--core-messages-message-bg);
diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss
index 0be4daed3..37913a25e 100644
--- a/src/core/components/mod-icon/mod-icon.scss
+++ b/src/core/components/mod-icon/mod-icon.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     display: inline-block;
diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss
index 6579ff761..bdc0220d6 100644
--- a/src/core/components/navigation-bar/navigation-bar.scss
+++ b/src/core/components/navigation-bar/navigation-bar.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --height: var(--core-navigation-max-height);
diff --git a/src/core/components/progress-bar/progress-bar.scss b/src/core/components/progress-bar/progress-bar.scss
index 0246fad88..7937c4595 100644
--- a/src/core/components/progress-bar/progress-bar.scss
+++ b/src/core/components/progress-bar/progress-bar.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     display: flex;
diff --git a/src/core/components/refresh-button-modal/refresh-button-modal.scss b/src/core/components/refresh-button-modal/refresh-button-modal.scss
index 5541fba16..93102a126 100644
--- a/src/core/components/refresh-button-modal/refresh-button-modal.scss
+++ b/src/core/components/refresh-button-modal/refresh-button-modal.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     ion-chip {
diff --git a/src/core/components/sheet-modal/sheet-modal.scss b/src/core/components/sheet-modal/sheet-modal.scss
index a03fd57e8..b1170cfcd 100644
--- a/src/core/components/sheet-modal/sheet-modal.scss
+++ b/src/core/components/sheet-modal/sheet-modal.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --backdrop-opacity: var(--ion-backdrop-opacity, 0.4);
diff --git a/src/core/components/show-password/show-password.scss b/src/core/components/show-password/show-password.scss
index 07280df85..c866c89cd 100644
--- a/src/core/components/show-password/show-password.scss
+++ b/src/core/components/show-password/show-password.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     display: contents;
diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index ab8692946..1024e55a1 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --menu-min-width: 270px;
diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss
index 26eebb6a9..66a57c342 100644
--- a/src/core/components/tabs/tabs.scss
+++ b/src/core/components/tabs/tabs.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --tabs-background: var(--core-tabs-background);
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index 2b6e28aa9..1ffc913c8 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -1,4 +1,4 @@
-@import '~theme/globals.scss';
+@use "theme/globals" as *;
 
 :host {
     position: relative;
diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
index f8f4f8250..cd1537e63 100644
--- a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
+++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     @include position(50%, 0px, null, null);
diff --git a/src/core/features/block/components/side-blocks/side-blocks.scss b/src/core/features/block/components/side-blocks/side-blocks.scss
index fc2f730f2..17669c03e 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.scss
+++ b/src/core/features/block/components/side-blocks/side-blocks.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host ::ng-deep core-block {
     @include media-breakpoint-up(md) {
diff --git a/src/core/features/comments/pages/viewer/viewer.scss b/src/core/features/comments/pages/viewer/viewer.scss
index cf231da48..e8297c249 100644
--- a/src/core/features/comments/pages/viewer/viewer.scss
+++ b/src/core/features/comments/pages/viewer/viewer.scss
@@ -1,5 +1,3 @@
-@import "~theme/components/discussion.scss";
-
 ion-badge {
     margin: 8px auto;
 }
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index ba750924b..f1401ecb6 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -51,7 +51,7 @@ import { CoreAnimations } from '@components/animations';
     selector: 'page-core-comments-viewer',
     templateUrl: 'viewer.html',
     animations: [CoreAnimations.SLIDE_IN_OUT],
-    styleUrls: ['viewer.scss'],
+    styleUrls: ['../../../../../theme/components/discussion.scss', 'viewer.scss'],
 })
 export class CoreCommentsViewerPage implements OnInit, OnDestroy {
 
diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss
index 2c169c852..2b2aa5de0 100644
--- a/src/core/features/course/components/course-index/course-index.scss
+++ b/src/core/features/course/components/course-index/course-index.scss
@@ -1,4 +1,4 @@
-@import '~theme/globals.scss';
+@use "theme/globals" as *;
 core-progress-bar {
     --bar-margin: 8px 0 4px 0;
     --line-height: 20px;
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 389a72714..013704204 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -1,4 +1,4 @@
-@import '~theme/globals.scss';
+@use "theme/globals" as *;
 
 :host {
     display: block;
diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss
index 95d039bfb..8e4d48343 100644
--- a/src/core/features/course/components/module-navigation/module-navigation.scss
+++ b/src/core/features/course/components/module-navigation/module-navigation.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --height: var(--core-navigation-max-height);
diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss
index e524c4757..3594fb7eb 100644
--- a/src/core/features/course/components/module-summary/module-summary.scss
+++ b/src/core/features/course/components/module-summary/module-summary.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host ::ng-deep ion-item[collapsible] ion-label {
     margin-top: 12px;
diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss
index 3e96dbc1f..8bed4a7a9 100644
--- a/src/core/features/course/components/module/module.scss
+++ b/src/core/features/course/components/module/module.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --horizontal-margin: 12px;
diff --git a/src/core/features/course/pages/course-summary/course-summary.scss b/src/core/features/course/pages/course-summary/course-summary.scss
index 03c882ad9..b26938458 100644
--- a/src/core/features/course/pages/course-summary/course-summary.scss
+++ b/src/core/features/course/pages/course-summary/course-summary.scss
@@ -1,4 +1,4 @@
-@import '~theme/globals.scss';
+@use "theme/globals" as *;
 
 :host {
     --thumb-height: 180px;
diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss
index 216c0eb75..32907c9a4 100644
--- a/src/core/features/course/pages/index/index.scss
+++ b/src/core/features/course/pages/index/index.scss
@@ -1,4 +1,4 @@
-@import '~theme/globals.scss';
+@use "theme/globals" as *;
 
 :host {
     .core-format-progress-list {
diff --git a/src/core/features/course/pages/module-preview/module-preview.scss b/src/core/features/course/pages/module-preview/module-preview.scss
index 1481b21b3..5e34beb75 100644
--- a/src/core/features/course/pages/module-preview/module-preview.scss
+++ b/src/core/features/course/pages/module-preview/module-preview.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 .core-module-availabilityinfo {
     background: var(--light);
diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss
index 31cbcadc2..6ede3c36d 100644
--- a/src/core/features/courses/components/course-list-item/course-list-item.scss
+++ b/src/core/features/courses/components/course-list-item/course-list-item.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     @for $i from 0 to length($core-course-image-background) {
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index b009050e0..150441cdf 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 :host {
     --placeholder-color: var(--ion-placeholder-color);
     --toobar-background: var(--white);
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 388f624e4..3e1cd42bc 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --header-background: var(--white);
diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.scss b/src/core/features/login/components/site-onboarding/site-onboarding.scss
index 084eee0f2..a03301739 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.scss
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-login-onboarding-step {
diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss
index 785732e0a..1c9514390 100644
--- a/src/core/features/login/login.scss
+++ b/src/core/features/login/login.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     ion-content,
diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss
index ddb292de2..8bf0224bf 100644
--- a/src/core/features/login/pages/site/site.scss
+++ b/src/core/features/login/pages/site/site.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --list-item-max-width: 600px;
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
index a42d797cd..0c871f3f0 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.scss
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-user-menu-preferences {
diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss
index 637457cc4..d72dfe76c 100644
--- a/src/core/features/mainmenu/pages/menu/menu.scss
+++ b/src/core/features/mainmenu/pages/menu/menu.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     ion-tabs {
diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss
index 7c94d2f05..4ae53140a 100644
--- a/src/core/features/question/question.scss
+++ b/src/core/features/question/question.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host ::ng-deep {
     .core-question-answer-correct {
diff --git a/src/core/features/reminders/components/date/date.scss b/src/core/features/reminders/components/date/date.scss
index 8d16930b4..7b32f1d09 100644
--- a/src/core/features/reminders/components/date/date.scss
+++ b/src/core/features/reminders/components/date/date.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     display: flex;
diff --git a/src/core/features/reportbuilder/components/report-column/report-column.scss b/src/core/features/reportbuilder/components/report-column/report-column.scss
index 65df0f953..31767c74f 100644
--- a/src/core/features/reportbuilder/components/report-column/report-column.scss
+++ b/src/core/features/reportbuilder/components/report-column/report-column.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --rotate-expandable: rotate(180deg);
diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.scss b/src/core/features/reportbuilder/components/report-detail/report-detail.scss
index 1f9dcd143..02f8bd52a 100644
--- a/src/core/features/reportbuilder/components/report-detail/report-detail.scss
+++ b/src/core/features/reportbuilder/components/report-detail/report-detail.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     --header-background: var(--white);
diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.scss b/src/core/features/reportbuilder/components/report-summary/report-summary.scss
index 32bb1fe4e..1512f8e33 100644
--- a/src/core/features/reportbuilder/components/report-summary/report-summary.scss
+++ b/src/core/features/reportbuilder/components/report-summary/report-summary.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 .filters-info {
     padding-bottom: 1rem;
diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss
index 8a8e71e12..9c849123b 100644
--- a/src/core/features/sitehome/pages/index/index.scss
+++ b/src/core/features/sitehome/pages/index/index.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 ion-item ion-icon {
     display: inline-block;
diff --git a/src/core/features/tag/components/list/list.scss b/src/core/features/tag/components/list/list.scss
index 1f8205861..861b4a9c4 100644
--- a/src/core/features/tag/components/list/list.scss
+++ b/src/core/features/tag/components/list/list.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     line-height: 1.6;
diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss
index fcb653a9d..c2cc72133 100644
--- a/src/theme/components/discussion.scss
+++ b/src/theme/components/discussion.scss
@@ -1,4 +1,4 @@
-@import "~theme/globals.scss";
+@use "theme/globals" as *;
 
 :host-context(.ios) {
     ion-footer .toolbar:last-child {
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index bf2f2d4cd..2b937a7d8 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -1,6 +1,6 @@
 /** Format Text - Show more styles. */
 /** Styles of elements inside the directive should be placed in format-text.scss */
-@import "~theme/globals";
+@use "theme/globals.variables" as global;
 
 core-format-text {
     --core-format-text-background: var(--background, var(--ion-item-background));
@@ -42,7 +42,7 @@ core-format-text {
             }
         }
 
-        @if ($core-format-text-never-shorten) {
+        @if (global.$core-format-text-never-shorten) {
             &.collapsible-enabled {
                 --display-toggle: none !important;
                 --collapsible-height: auto !important;
@@ -200,7 +200,7 @@ core-format-text {
 
     .embed-responsive-1by1 {
         &::before {
-            padding-top: percentage(1 / 1);
+            padding-top: percentage(1);
         }
     }
 
@@ -474,7 +474,7 @@ core-rich-text-editor .core-rte-editor {
         font-weight: 400;
     }
 
-    @each $color-name, $unused in $colors {
+    @each $color-name, $unused in global.$colors {
         .alert-#{$color-name} {
             --color-base: var(--#{$color-name});
             color: var(--#{$color-name}-shade);
@@ -504,7 +504,7 @@ core-rich-text-editor .core-rte-editor {
 
         &[disabled] ~ .form-check-label,
         &:disabled ~ .form-check-label {
-            color: $gray-600;
+            color: global.$gray-600;
         }
 
     }
@@ -549,7 +549,7 @@ core-rich-text-editor .core-rte-editor {
     .border-bottom-0 { border-bottom: 0 !important; }
     .border-left-0   { border-left: 0 !important; }
 
-    @each $color-name, $unused in $colors {
+    @each $color-name, $unused in global.$colors {
         .border-#{$color-name} {
             border-color: var(--#{$color-name}) !important;
         }
@@ -633,7 +633,7 @@ core-rich-text-editor .core-rte-editor {
     .font-italic         { font-style: italic !important; }
     .text-white { color: var(--white) !important; }
 
-    @each $color-name, $unused in $colors {
+    @each $color-name, $unused in global.$colors {
         .text-#{$color-name} {
             color: var(--#{$color-name});
         }
@@ -669,7 +669,7 @@ core-rich-text-editor .core-rte-editor {
         background-color: var(--danger);
     }
 
-    @each $color-name, $unused in $colors {
+    @each $color-name, $unused in global.$colors {
         .label-#{$color-name} {
             color: var(--#{$color-name}-contrast);
             background-color: var(--#{$color-name});
@@ -690,7 +690,7 @@ core-rich-text-editor .core-rte-editor {
         }
     }
 
-    @each $color-name, $unused in $colors {
+    @each $color-name, $unused in global.$colors {
         .btn.btn-#{$color-name} {
             --color-base: var(--#{$color-name});
             color: var(--#{$color-name}-shade);
diff --git a/src/theme/theme.scss b/src/theme/theme.scss
index 5baa55e42..af644c972 100644
--- a/src/theme/theme.scss
+++ b/src/theme/theme.scss
@@ -10,26 +10,26 @@
  */
 
 /* Global variables */
-@import "./globals.scss";
+@import "globals.scss";
 
 /* Application styles */
-@import "./theme.light.scss";
-@import "./theme.dark.scss";
-@import "./theme.custom.scss";
-@import "./theme.design-system.scss";
-@import "./theme.base.scss";
+@import "theme.light.scss";
+@import "theme.dark.scss";
+@import "theme.custom.scss";
+@import "theme.design-system.scss";
+@import "theme.base.scss";
 
 /* Components */
-@import "./components/collapsible-header.scss";
-@import "./components/collapsible-item.scss";
-@import "./components/format-text.scss";
-@import "./components/rubrics.scss";
-@import "./components/mod-label.scss";
+@import "components/collapsible-header.scss";
+@import "components/collapsible-item.scss";
+@import "components/format-text.scss";
+@import "components/rubrics.scss";
+@import "components/mod-label.scss";
 @import "../core/components/error-info/error-info.scss";
-@import "./components/videojs.scss";
+@import "components/videojs.scss";
 
 /* Some styles from 3rd party libraries. */
-@import "./bootstrap.scss";
+@import "bootstrap.scss";
 
 /* Core CSS required for Ionic components to work properly */
 @import "~@ionic/angular/css/core.css";
@@ -38,7 +38,7 @@
 @import "~@ionic/angular/css/normalize.css";
 @import "~@ionic/angular/css/structure.css";
 @import "~@ionic/angular/css/typography.css";
-@import '~@ionic/angular/css/display.css';
+@import "~@ionic/angular/css/display.css";
 
 /* Optional CSS utils that can be commented out */
 @import "~@ionic/angular/css/padding.css";

From 4ca0cf785aef0b55a9202f070453a55314f2b930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 16:16:51 +0100
Subject: [PATCH 04/17] MOBILE-3947 chore: Deprecation fixes

---
 .../rich-text-editor/rich-text-editor.ts          |  4 ++++
 src/core/services/lang.ts                         | 15 +++++++++------
 src/core/services/utils/utils.ts                  |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index fde9e250e..6df15894d 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -174,6 +174,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
         this.lastDraft = this.control?.value;
 
         // Use paragraph on enter.
+        // eslint-disable-next-line deprecation/deprecation
         document.execCommand('DefaultParagraphSeparator', false, 'p');
 
         this.maximizeEditorSize();
@@ -632,6 +633,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
      */
     protected executeCommand({ name: command, parameters }: EditorCommand): void {
         if (parameters == 'block') {
+            // eslint-disable-next-line deprecation/deprecation
             document.execCommand('formatBlock', false, '<' + command + '>');
 
             return;
@@ -641,6 +643,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
             this.toolbarStyles[parameters] = this.toolbarStyles[parameters] == 'true' ? 'false' : 'true';
         }
 
+        // eslint-disable-next-line deprecation/deprecation
         document.execCommand(command, false);
 
         // Modern browsers are using non a11y tags, so replace them.
@@ -1043,6 +1046,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
 
         if (text) {
             this.editorElement?.focus(); // Make sure the editor is focused.
+            // eslint-disable-next-line deprecation/deprecation
             document.execCommand('insertText', false, text);
         }
     }
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index f85eb43c8..78fd63355 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -349,12 +349,15 @@ export class CoreLangProvider {
     getTranslationTable(lang: string): Promise<Record<string, unknown>> {
         // Create a promise to convert the observable into a promise.
         return new Promise((resolve, reject): void => {
-            const observer = Translate.getTranslation(lang).subscribe((table) => {
-                resolve(table);
-                observer.unsubscribe();
-            }, (err) => {
-                reject(err);
-                observer.unsubscribe();
+            const observer = Translate.getTranslation(lang).subscribe({
+                next: (table) => {
+                    resolve(table);
+                    observer.unsubscribe();
+                },
+                error: (err) => {
+                    reject(err);
+                    observer.unsubscribe();
+                },
             });
         });
     }
diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts
index 147930bb8..16ccfe1f2 100644
--- a/src/core/services/utils/utils.ts
+++ b/src/core/services/utils/utils.ts
@@ -376,7 +376,7 @@ export class CoreUtilsProvider {
             virtualInput.innerHTML = text;
             virtualInput.select();
             virtualInput.setSelectionRange(0, 99999);
-            document.execCommand('copy');
+            document.execCommand('copy'); // eslint-disable-line deprecation/deprecation
         }
 
         // Show toast using ionicLoading.

From 9be60c9e83aa4098281852d05f460c55a00638ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 15:52:08 +0100
Subject: [PATCH 05/17] MOBILE-3947 chore: Fix eqeqeq on HTML

---
 .../myoverview/addon-block-myoverview.html    |  6 ++---
 .../calendar/pages/edit-event/edit-event.html |  6 ++---
 .../messages/pages/contacts-35/contacts.html  |  4 +--
 .../messages/pages/discussion/discussion.html | 14 +++++-----
 src/addons/messages/pages/search/search.html  |  2 +-
 .../mod/assign/components/index/index.ts      |  2 +-
 .../addon-mod-assign-submission.html          | 12 ++++-----
 src/addons/mod/chat/pages/chat/chat.html      |  8 +++---
 .../session-messages/session-messages.html    |  8 +++---
 .../action/addon-mod-data-action.html         | 26 +++++++++----------
 .../mod/feedback/pages/attempt/attempt.html   |  4 +--
 src/addons/mod/feedback/pages/form/form.html  | 20 +++++++-------
 .../mod/forum/components/index/index.html     |  2 +-
 .../mod/forum/components/post/post.html       |  2 +-
 .../forum/pages/discussion/discussion.html    | 10 +++----
 .../pages/new-discussion/new-discussion.html  |  2 +-
 .../pages/new-discussion/new-discussion.ts    |  1 -
 .../navigation-modal/navigation-modal.html    | 10 +++----
 .../index/addon-mod-resource-index.html       |  8 +++---
 .../mod/resource/pages/index/index.html       |  2 +-
 .../index/addon-mod-workshop-index.html       | 10 +++----
 .../mod/workshop/components/phase/phase.html  |  8 +++---
 .../mod/workshop/services/workshop-helper.ts  |  2 +-
 src/addons/notes/pages/list/list.html         |  4 +--
 src/addons/notes/pages/list/list.ts           |  2 +-
 .../privatefiles/pages/index/index.html       |  2 +-
 .../essay/component/addon-qtype-essay.html    |  2 +-
 .../components/combobox/core-combobox.html    |  6 ++---
 .../core-context-menu-popover.html            |  6 ++---
 .../core-infinite-loading.html                |  4 +--
 .../input-errors/core-input-errors.html       |  4 +--
 src/core/components/tabs/core-tabs.html       |  4 +--
 .../module-summary/module-summary.html        | 20 +++++++-------
 .../pages/course-summary/course-summary.html  |  2 +-
 .../core-courses-course-list-item.html        | 14 +++++-----
 .../core-courses-course-options-menu.html     |  2 +-
 .../features/grades/pages/course/course.html  |  2 +-
 .../grades/pages/courses/courses.html         |  2 +-
 src/core/features/login/pages/site/site.html  |  8 +++---
 .../features/mainmenu/pages/menu/menu.html    |  4 +--
 .../features/mainmenu/pages/more/more.html    |  8 +++---
 .../search-box/core-search-box.html           |  2 +-
 .../settings/pages/general/general.html       |  2 +-
 src/core/features/tag/pages/index/index.html  |  2 +-
 .../user/classes/support/support-config.ts    |  4 +--
 45 files changed, 137 insertions(+), 138 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 0c7735f12..90adc25e6 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -88,11 +88,11 @@
             </core-combobox>
         </ion-col>
         <ion-col size="auto" *ngIf="isLayoutSwitcherAvailable">
-            <ion-button *ngIf="layout == 'card'" fill="outline" (click)="toggleLayout('list')"
+            <ion-button *ngIf="layout === 'card'" fill="outline" (click)="toggleLayout('list')"
                 [attr.aria-label]="'addon.block_myoverview.aria:list' | translate">
                 <ion-icon slot="icon-only" name="fas-list" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-button *ngIf="layout == 'list'" fill="outline" (click)="toggleLayout('card')"
+            <ion-button *ngIf="layout === 'list'" fill="outline" (click)="toggleLayout('card')"
                 [attr.aria-label]="'addon.block_myoverview.aria:card' | translate">
                 <ion-icon slot="icon-only" name="fas-table-cells-large" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -123,7 +123,7 @@
 
     <!-- List of courses. -->
     <div class="safe-area-padding" *ngIf="hasCourses">
-        <ion-grid class="ion-no-padding" [class.core-no-grid]="layout != 'card'" [class.list-item-limited-width]="layout != 'card'">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="layout !== 'card'" [class.list-item-limited-width]="layout !== 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index a61fcb899..102ac07dc 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -51,7 +51,7 @@
             </ion-item>
 
             <!-- Category. -->
-            <ion-item class="ion-text-wrap" *ngIf="typeControl.value == 'category'">
+            <ion-item class="ion-text-wrap" *ngIf="typeControl.value === 'category'">
                 <ion-label>
                     <p class="item-heading" [core-mark-required]="true">{{ 'core.category' | translate }}</p>
                 </ion-label>
@@ -64,7 +64,7 @@
             </ion-item>
 
             <!-- Course. -->
-            <ion-item class="ion-text-wrap" *ngIf="typeControl.value == 'course'">
+            <ion-item class="ion-text-wrap" *ngIf="typeControl.value === 'course'">
                 <ion-label>
                     <p class="item-heading" [core-mark-required]="true">{{ 'core.course' | translate }}</p>
                 </ion-label>
@@ -75,7 +75,7 @@
             </ion-item>
 
             <!-- Group. -->
-            <ng-container *ngIf="typeControl.value == 'group'">
+            <ng-container *ngIf="typeControl.value === 'group'">
                 <!-- Select the course. -->
                 <ion-item class="ion-text-wrap">
                     <ion-label>
diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html
index 1e52521df..314a3b0d0 100644
--- a/src/addons/messages/pages/contacts-35/contacts.html
+++ b/src/addons/messages/pages/contacts-35/contacts.html
@@ -22,10 +22,10 @@
             autocorrect="off" spellcheck="false" lengthCheck="2" [disabled]="!loaded" searchArea="AddonMessagesContacts"></core-search-box>
 
         <core-loading [hideUntil]="loaded" [message]="loadingMessage">
-            <core-empty-box *ngIf="!hasContacts && searchString == ''" icon="fas-address-book"
+            <core-empty-box *ngIf="!hasContacts && searchString === ''" icon="fas-address-book"
                 [message]="'addon.messages.contactlistempty' | translate"></core-empty-box>
 
-            <core-empty-box *ngIf="!hasContacts && searchString != ''" icon="fas-address-book"
+            <core-empty-box *ngIf="!hasContacts && searchString !== ''" icon="fas-address-book"
                 [message]="'addon.messages.nousersfound' | translate"></core-empty-box>
 
             <ion-list *ngFor="let contactType of contactTypes" class="ion-no-margin">
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 775381ad4..0e402e14f 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -103,17 +103,17 @@
     </ion-fab>
 </ion-content>
 <ion-footer class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
-    <ion-toolbar [color]="footerType == 'message' ? null : 'light'">
-        <p *ngIf="footerType == 'unable'" class="ion-text-center ion-margin-horizontal">
+    <ion-toolbar [color]="footerType === 'message' ? null : 'light'">
+        <p *ngIf="footerType === 'unable'" class="ion-text-center ion-margin-horizontal">
             {{ 'addon.messages.unabletomessage' | translate }}
         </p>
-        <div *ngIf="footerType == 'blocked'" class="ion-padding-horizontal">
+        <div *ngIf="footerType === 'blocked'" class="ion-padding-horizontal">
             <p class="ion-text-center">{{ 'addon.messages.youhaveblockeduser' | translate }}</p>
             <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" (click)="unblockUser()">
                 {{ 'addon.messages.unblockuser' | translate }}
             </ion-button>
         </div>
-        <div *ngIf="footerType == 'requiresContact' && otherMember" class="ion-padding-horizontal">
+        <div *ngIf="footerType === 'requiresContact' && otherMember" class="ion-padding-horizontal">
             <p class="ion-text-center">
                 <strong>{{ 'addon.messages.isnotinyourcontacts' | translate: {$a: otherMember.fullname} }}</strong>
             </p>
@@ -122,7 +122,7 @@
                 {{ 'addon.messages.sendcontactrequest' | translate }}
             </ion-button>
         </div>
-        <div *ngIf="footerType == 'requestReceived' && otherMember" class="ion-padding-horizontal">
+        <div *ngIf="footerType === 'requestReceived' && otherMember" class="ion-padding-horizontal">
             <p class="ion-text-center">{{ 'addon.messages.userwouldliketocontactyou' | translate: {$a: otherMember.fullname} }}</p>
             <ion-button expand="block" class="ion-text-wrap ion-margin-bottom" (click)="confirmContactRequest()">
                 {{ 'addon.messages.acceptandaddcontact' | translate }}
@@ -131,13 +131,13 @@
                 {{ 'addon.messages.decline' | translate }}
             </ion-button>
         </div>
-        <div *ngIf="footerType == 'requestSent' || (footerType == 'message' && requestContactSent)" class="ion-padding-horizontal">
+        <div *ngIf="footerType === 'requestSent' || (footerType === 'message' && requestContactSent)" class="ion-padding-horizontal">
             <p class="ion-text-center"><strong>{{ 'addon.messages.contactrequestsent' | translate }}</strong></p>
             <p class="ion-text-center" *ngIf="otherMember">
                 {{ 'addon.messages.yourcontactrequestpending' | translate: {$a: otherMember.fullname} }}
             </p>
         </div>
-        <core-send-message-form *ngIf="footerType == 'message'" (onSubmit)="sendMessage($event)" [showKeyboard]="showKeyboard"
+        <core-send-message-form *ngIf="footerType === 'message'" (onSubmit)="sendMessage($event)" [showKeyboard]="showKeyboard"
             [placeholder]="'addon.messages.newmessage' | translate"></core-send-message-form>
     </ion-toolbar>
 </ion-footer>
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index afbf8b227..f55f879bd 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -68,7 +68,7 @@
         </ion-item>
 
         <!-- Load more button for contacts and non-contacts -->
-        <ng-container *ngIf="item.type != 'messages'">
+        <ng-container *ngIf="item.type !== 'messages'">
             <div class="ion-padding-horizontal" *ngIf="item.canLoadMore && !item.loadingMore">
                 <ion-button expand="block" fill="outline" (click)="search(query, item.type)">
                     {{ 'core.loadmore' | translate }}
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 638ba2215..e72b848c7 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -54,7 +54,7 @@ import { AddonModAssignSubmissionComponent } from '../submission/submission';
 })
 export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityComponent implements OnInit, OnDestroy {
 
-   @ViewChild(AddonModAssignSubmissionComponent) submissionComponent?: AddonModAssignSubmissionComponent;
+    @ViewChild(AddonModAssignSubmissionComponent) submissionComponent?: AddonModAssignSubmissionComponent;
 
     component = AddonModAssignProvider.COMPONENT;
     pluginName = 'assign';
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 2bd756e01..ac1208cd8 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -264,7 +264,7 @@
                 <ng-template>
                     <!-- Current grade if method is advanced. -->
                     <ion-item class="ion-text-wrap core-grading-summary"
-                        *ngIf="feedback?.gradefordisplay && (!isGrading || grade.method != 'simple')">
+                        *ngIf="feedback?.gradefordisplay && (!isGrading || grade.method !== 'simple')">
                         <ion-label>
                             <p class="item-heading">{{ 'addon.mod_assign.currentgrade' | translate }}</p>
                             <p>
@@ -280,7 +280,7 @@
                     <ng-container *ngIf="isGrading">
                         <!-- Numeric grade.
                         Use a text input because otherwise we cannot readthe value if it has an invalid character. -->
-                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && !grade.scale">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method === 'simple' && !grade.scale">
                             <ion-label position="stacked">
                                 <p class="item-heading">{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo!.grade} }}</p>
                             </ion-label>
@@ -291,7 +291,7 @@
                         </ion-item>
 
                         <!-- Grade using a scale. -->
-                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple' && grade.scale">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method === 'simple' && grade.scale">
                             <ion-label>
                                 <p class="item-heading">{{ 'addon.mod_assign.grade' | translate }}</p>
                             </ion-label>
@@ -323,13 +323,13 @@
                         <ion-item class="ion-text-wrap" *ngIf="gradeInfo && grade.unreleasedGrade !== undefined">
                             <ion-label>
                                 <p class="item-heading">{{ 'addon.mod_assign.currentassigngrade' | translate }}</p>
-                                <p *ngIf="grade.method != 'simple' || !grade.scale">{{ grade.unreleasedGrade}} / {{ gradeInfo.grade }}</p>
-                                <p *ngIf="grade.method == 'simple' && grade.scale">{{ grade.unreleasedGrade }}</p>
+                                <p *ngIf="grade.method !== 'simple' || !grade.scale">{{ grade.unreleasedGrade}} / {{ gradeInfo.grade }}</p>
+                                <p *ngIf="grade.method === 'simple' && grade.scale">{{ grade.unreleasedGrade }}</p>
                             </ion-label>
                         </ion-item>
 
                         <!-- Gradebook grade for simple grading. -->
-                        <ion-item class="ion-text-wrap" *ngIf="grade.method == 'simple'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.method === 'simple'">
                             <ion-label>
                                 <p class="item-heading">{{ 'addon.mod_assign.currentgrade' | translate }}</p>
                                 <p *ngIf="grade.gradebookGrade && !grade.scale">
diff --git a/src/addons/mod/chat/pages/chat/chat.html b/src/addons/mod/chat/pages/chat/chat.html
index 4cbfff287..281a4e325 100644
--- a/src/addons/mod/chat/pages/chat/chat.html
+++ b/src/addons/mod/chat/pages/chat/chat.html
@@ -26,7 +26,7 @@
                 </p>
 
                 <div class="ion-text-center addon-mod_chat-notice" *ngIf="message.special">
-                    <ion-badge class="ion-text-wrap" color="success" *ngIf="message.system && message.message == 'enter'">
+                    <ion-badge class="ion-text-wrap" color="success" *ngIf="message.system && message.message === 'enter'">
                         <span>
                             <ion-icon name="fas-right-to-bracket" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -34,7 +34,7 @@
                         </span>
                     </ion-badge>
 
-                    <ion-badge class="ion-text-wrap" color="danger" *ngIf="message.system && message.message == 'exit'">
+                    <ion-badge class="ion-text-wrap" color="danger" *ngIf="message.system && message.message === 'exit'">
                         <span>
                             <ion-icon name="fas-right-from-bracket" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -42,7 +42,7 @@
                         </span>
                     </ion-badge>
 
-                    <ion-badge class="ion-text-wrap" color="primary" *ngIf="message.beep == 'all'">
+                    <ion-badge class="ion-text-wrap" color="primary" *ngIf="message.beep === 'all'">
                         <span>
                             <ion-icon name="fas-bell" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -60,7 +60,7 @@
                     </ion-badge>
 
                     <ion-badge class="ion-text-wrap" color="light"
-                        *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
+                        *ngIf="message.userid === currentUserId && message.beep && message.beep !== 'all'">
                         <span>
                             <ion-icon name="fas-bell" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.html b/src/addons/mod/chat/pages/session-messages/session-messages.html
index dbcb5d29c..76a956b89 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.html
@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="ion-text-center addon-mod_chat-notice" *ngIf="message.special">
-                    <ion-badge class="ion-text-wrap" color="success" *ngIf="message.issystem && message.message == 'enter'">
+                    <ion-badge class="ion-text-wrap" color="success" *ngIf="message.issystem && message.message === 'enter'">
                         <span>
                             <ion-icon name="fas-right-to-bracket" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -29,7 +29,7 @@
                         </span>
                     </ion-badge>
 
-                    <ion-badge class="ion-text-wrap" color="danger" *ngIf="message.issystem && message.message == 'exit'">
+                    <ion-badge class="ion-text-wrap" color="danger" *ngIf="message.issystem && message.message === 'exit'">
                         <span>
                             <ion-icon name="fas-right-from-bracket" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -37,7 +37,7 @@
                         </span>
                     </ion-badge>
 
-                    <ion-badge class="ion-text-wrap" color="primary" *ngIf="message.beep == 'all'">
+                    <ion-badge class="ion-text-wrap" color="primary" *ngIf="message.beep === 'all'">
                         <span>
                             <ion-icon name="fas-bell" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
@@ -55,7 +55,7 @@
                     </ion-badge>
 
                     <ion-badge class="ion-text-wrap" color="light"
-                        *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
+                        *ngIf="message.userid === currentUserId && message.beep && message.beep !== 'all'">
                         <span>
                             <ion-icon name="fas-bell" aria-hidden="true"></ion-icon>
                             {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html
index f1506fd9c..2fca169f6 100644
--- a/src/addons/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addons/mod/data/components/action/addon-mod-data-action.html
@@ -1,49 +1,49 @@
-<ion-button size="small" *ngIf="action == 'actionsmenu'" fill="clear" (click)="actionsMenu($event)"
+<ion-button size="small" *ngIf="action === 'actionsmenu'" fill="clear" (click)="actionsMenu($event)"
     [attr.aria-label]="'addon.mod_data.actionsmenu' | translate">
     <ion-icon name="fas-ellipsis-vertical" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'more'" fill="clear" (click)="viewEntry()"
+<ion-button size="small" *ngIf="action === 'more'" fill="clear" (click)="viewEntry()"
     [attr.aria-label]="'addon.mod_data.showmore' | translate">
     <ion-icon name="fas-magnifying-glass-plus" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">
+<ion-button size="small" *ngIf="action === 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">
     <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'delete' && !entry.deleted" fill="clear" color="danger" (click)="deleteEntry()"
+<ion-button size="small" *ngIf="action === 'delete' && !entry.deleted" fill="clear" color="danger" (click)="deleteEntry()"
     [attr.aria-label]="'core.delete' | translate">
     <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'delete' && entry.deleted" fill="clear" color="danger" (click)="undoDelete()"
+<ion-button size="small" *ngIf="action === 'delete' && entry.deleted" fill="clear" color="danger" (click)="undoDelete()"
     [attr.aria-label]="'core.restore' | translate">
     <ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'approve'" fill="clear" (click)="approveEntry()"
+<ion-button size="small" *ngIf="action === 'approve'" fill="clear" (click)="approveEntry()"
     [attr.aria-label]="'addon.mod_data.approve' | translate">
     <ion-icon name="fas-thumbs-up" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<ion-button size="small" *ngIf="action == 'disapprove'" fill="clear" (click)="disapproveEntry()"
+<ion-button size="small" *ngIf="action === 'disapprove'" fill="clear" (click)="disapproveEntry()"
     [attr.aria-label]="'addon.mod_data.disapprove' | translate">
     <ion-icon name="far-thumbs-down" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
-<core-comments *ngIf="action == 'comments' && mode == 'list'" contextLevel="module" [instanceId]="database.coursemodule"
+<core-comments *ngIf="action === 'comments' && mode === 'list'" contextLevel="module" [instanceId]="database.coursemodule"
     component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="database.course">
 </core-comments>
 
-<span *ngIf="action == 'timeadded'">{{ entry.timecreated * 1000 | coreFormatDate }}</span>
-<span *ngIf="action == 'timemodified'">{{ entry.timemodified * 1000 | coreFormatDate }}</span>
+<span *ngIf="action === 'timeadded'">{{ entry.timecreated * 1000 | coreFormatDate }}</span>
+<span *ngIf="action === 'timemodified'">{{ entry.timemodified * 1000 | coreFormatDate }}</span>
 
-<core-user-avatar *ngIf="action == 'userpicture'" [user]="entry" slot="start" [courseId]="database.course" [userId]="entry.userid"
+<core-user-avatar *ngIf="action === 'userpicture'" [user]="entry" slot="start" [courseId]="database.course" [userId]="entry.userid"
     [profileUrl]="userPicture"></core-user-avatar>
 
-<a *ngIf="action == 'user' && entry" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">
+<a *ngIf="action === 'user' && entry" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">
     {{entry.fullname}}
 </a>
 
-<core-tag-list *ngIf="tagsEnabled && action == 'tags' && entry" [tags]="entry.tags"></core-tag-list>
+<core-tag-list *ngIf="tagsEnabled && action === 'tags' && entry" [tags]="entry.tags"></core-tag-list>
diff --git a/src/addons/mod/feedback/pages/attempt/attempt.html b/src/addons/mod/feedback/pages/attempt/attempt.html
index 0a110f49b..a8d28e106 100644
--- a/src/addons/mod/feedback/pages/attempt/attempt.html
+++ b/src/addons/mod/feedback/pages/attempt/attempt.html
@@ -30,8 +30,8 @@
             </ion-item>
             <ng-container *ngIf="items && items.length">
                 <ng-container *ngFor="let item of items">
-                    <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
-                    <ion-item class="ion-text-wrap" *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
+                    <core-spacer *ngIf="item.typ === 'pagebreak'"></core-spacer>
+                    <ion-item class="ion-text-wrap" *ngIf="item.typ !== 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
                         <ion-label>
                             <p class="item-heading" *ngIf="item.name" [core-mark-required]="item.required">
                                 <span *ngIf="feedback!.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html
index 5b417b796..4f55ac59e 100644
--- a/src/addons/mod/feedback/pages/form/form.html
+++ b/src/addons/mod/feedback/pages/form/form.html
@@ -23,8 +23,8 @@
                     </ion-label>
                 </ion-item>
                 <ng-container *ngFor="let item of items">
-                    <core-spacer *ngIf="item.typ == 'pagebreak'"></core-spacer>
-                    <ng-container *ngIf="item.typ != 'pagebreak'">
+                    <core-spacer *ngIf="item.typ === 'pagebreak'"></core-spacer>
+                    <ng-container *ngIf="item.typ !== 'pagebreak'">
                         <ion-item class="ion-text-wrap addon-mod_feedback-item" [color]="item.dependitem > 0 ? 'light' : ''"
                             [class.core-danger-item]="item.isEmpty || item.hasError">
                             <ion-label [position]="item.hasTextInput ? 'stacked' : undefined">
@@ -35,18 +35,18 @@
                                     </core-format-text>
                                     <span *ngIf="item.postfix" class="addon-mod_feedback-postfix">{{item.postfix}}</span>
                                 </p>
-                                <p *ngIf="item.templateName == 'label'">
+                                <p *ngIf="item.templateName === 'label'">
                                     <core-format-text [component]="component" [componentId]="cmId" [text]="item.presentation"
                                         contextLevel="module" [contextInstanceId]="cmId" [wsNotFiltered]="true" [courseId]="courseId">
                                     </core-format-text>
                                 </p>
                             </ion-label>
 
-                            <ion-input *ngIf="item.templateName == 'textfield'" type="text" [(ngModel)]="item.value" autocorrect="off"
+                            <ion-input *ngIf="item.templateName === 'textfield'" type="text" [(ngModel)]="item.value" autocorrect="off"
                                 name="{{item.typ}}_{{item.id}}" maxlength="{{item.length}}" [required]="item.required">
                             </ion-input>
 
-                            <ng-container *ngIf="item.templateName == 'numeric'">
+                            <ng-container *ngIf="item.templateName === 'numeric'">
                                 <ion-input type="number" [(ngModel)]="item.value" name="{{item.typ}}_{{item.id}}"
                                     [required]="item.required">
                                 </ion-input>
@@ -56,11 +56,11 @@
                                 </ion-text>
                             </ng-container>
 
-                            <ion-textarea *ngIf="item.templateName == 'textarea'" [required]="item.required" name="{{item.typ}}_{{item.id}}"
+                            <ion-textarea *ngIf="item.templateName === 'textarea'" [required]="item.required" name="{{item.typ}}_{{item.id}}"
                                 [(ngModel)]="item.value">
                             </ion-textarea>
 
-                            <ion-select *ngIf="item.templateName == 'multichoice-d'" [required]="item.required"
+                            <ion-select *ngIf="item.templateName === 'multichoice-d'" [required]="item.required"
                                 name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value" interface="action-sheet"
                                 [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: item.name}">
                                 <ion-select-option *ngFor="let option of item.choices" [value]="option.value">
@@ -71,7 +71,7 @@
                             </ion-select>
                         </ion-item>
 
-                        <ion-radio-group *ngIf="item.templateName == 'multichoice-r'" [(ngModel)]="item.value" [required]="item.required"
+                        <ion-radio-group *ngIf="item.templateName === 'multichoice-r'" [(ngModel)]="item.value" [required]="item.required"
                             name="{{item.typ}}_{{item.id}}">
                             <ion-item *ngFor="let option of item.choices">
                                 <ion-label>
@@ -83,7 +83,7 @@
                             </ion-item>
                         </ion-radio-group>
 
-                        <ng-container *ngIf="item.templateName == 'multichoice-c'">
+                        <ng-container *ngIf="item.templateName === 'multichoice-c'">
                             <ion-item *ngFor="let option of item.choices">
                                 <ion-label>
                                     <core-format-text [component]="component" [componentId]="cmId" [text]="option.label"
@@ -96,7 +96,7 @@
                             </ion-item>
                         </ng-container>
 
-                        <ng-container *ngIf="item.templateName == 'captcha'">
+                        <ng-container *ngIf="item.templateName === 'captcha'">
                             <core-recaptcha *ngIf="!preview && !offline" [publicKey]="item.captcha.recaptchapublickey" [model]="item"
                                 modelValueName="value">
                             </core-recaptcha>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 63fcc9497..6e926f3a1 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -18,7 +18,7 @@
 
     <core-loading [hideUntil]="!showLoading && discussions && discussions.loaded">
         <!-- Activity info. -->
-        <core-course-module-info [module]="module" [description]="forum && forum.type != 'single' && description" [component]="component"
+        <core-course-module-info [module]="module" [description]="forum && forum.type !== 'single' && description" [component]="component"
             [componentId]="componentId" [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings"
             (completionChanged)="onCompletionChange()">
             <ion-item class="ion-text-wrap">
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 3e3b2048f..df950ecdd 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -146,7 +146,7 @@
                     <ion-button expand="block" fill="outline" (click)="cancel()">{{ 'core.cancel' | translate }}</ion-button>
                 </ion-col>
                 <ion-col>
-                    <ion-button expand="block" (click)="send()" [disabled]="formData.subject == '' || formData.message == null">
+                    <ion-button expand="block" (click)="send()" [disabled]="formData.subject === '' || formData.message === null">
                         <span *ngIf="formData.isEditing">{{ 'core.savechanges' | translate }}</span>
                         <span *ngIf="!formData.isEditing">{{ 'addon.mod_forum.posttoforum' | translate }}</span>
                     </ion-button>
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 130547200..95385a60f 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -24,13 +24,13 @@
             [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event, true)">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'flat-oldest'" [priority]="500"
+        <core-context-menu-item [hidden]="sort === 'flat-oldest'" [priority]="500"
             [content]="'addon.mod_forum.modeflatoldestfirst' | translate" iconAction="fas-arrow-down" (action)="changeSort('flat-oldest')">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'flat-newest'" [priority]="450"
+        <core-context-menu-item [hidden]="sort === 'flat-newest'" [priority]="450"
             [content]="'addon.mod_forum.modeflatnewestfirst' | translate" iconAction="fas-arrow-up" (action)="changeSort('flat-newest')">
         </core-context-menu-item>
-        <core-context-menu-item [hidden]="sort == 'nested'" [priority]="400" [content]="'addon.mod_forum.modenested' | translate"
+        <core-context-menu-item [hidden]="sort === 'nested'" [priority]="400" [content]="'addon.mod_forum.modenested' | translate"
             iconAction="fas-right-left" (action)="changeSort('nested')">
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!discussion || !discussion.canlock || discussion.locked" [priority]="300"
@@ -102,7 +102,7 @@
             </addon-mod-forum-post>
         </div>
 
-        <ion-card *ngIf="sort != 'nested' && posts.length">
+        <ion-card *ngIf="sort !== 'nested' && posts.length">
             <ng-container *ngFor="let post of posts; first as first">
                 <core-spacer *ngIf="!first"></core-spacer>
                 <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component"
@@ -113,7 +113,7 @@
             </ng-container>
         </ion-card>
 
-        <ng-container *ngIf="sort == 'nested' && posts.length">
+        <ng-container *ngIf="sort === 'nested' && posts.length">
             <ng-container *ngFor="let post of posts">
                 <ng-container *ngTemplateOutlet="nestedPosts; context: {post: post}"></ng-container>
             </ng-container>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index 69721b8a6..ba0d4359d 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -84,7 +84,7 @@
                             <ion-button expand="block" fill="outline" (click)="discard()">{{ 'core.discard' | translate }}</ion-button>
                         </ion-col>
                         <ion-col>
-                            <ion-button expand="block" [disabled]="newDiscussion.subject == '' || newDiscussion.message == null"
+                            <ion-button expand="block" [disabled]="newDiscussion.subject === '' || newDiscussion.message === null"
                                 (click)="add()">
                                 {{ 'addon.mod_forum.posttoforum' | translate }}
                             </ion-button>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
index 3c4921173..4f3c43b73 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
@@ -266,7 +266,6 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
                         CoreSync.blockOperation(AddonModForumProvider.COMPONENT, this.syncId);
                     }
 
-                    // eslint-disable-next-line promise/no-nesting
                     return AddonModForumOffline.instance
                         .getNewDiscussion(this.forumId, this.timeCreated)
                         .then(async (discussion) => {
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
index eb7fd9ead..43d093486 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
@@ -28,17 +28,17 @@
 
                 <ion-icon *ngIf="question.type === 'description' || !question.questionnumber" name="fas-circle-info" slot="end"
                     aria-hidden="true"></ion-icon>
-                <ion-icon *ngIf="question.stateClass == 'core-question-requiresgrading'" name="fas-circle-question"
+                <ion-icon *ngIf="question.stateClass === 'core-question-requiresgrading'" name="fas-circle-question"
                     [attr.aria-label]="question.status" slot="end">
                 </ion-icon>
-                <ion-icon *ngIf="question.stateClass == 'core-question-correct'" name="fas-check" color="success"
+                <ion-icon *ngIf="question.stateClass === 'core-question-correct'" name="fas-check" color="success"
                     [attr.aria-label]="question.status" slot="end">
                 </ion-icon>
-                <ion-icon *ngIf="question.stateClass == 'core-question-partiallycorrect'" name="fas-square-check" color="warning"
+                <ion-icon *ngIf="question.stateClass === 'core-question-partiallycorrect'" name="fas-square-check" color="warning"
                     [attr.aria-label]="question.status" slot="end">
                 </ion-icon>
-                <ion-icon *ngIf="question.stateClass == 'core-question-incorrect' ||
-                    question.stateClass == 'core-question-notanswered'" name="fas-xmark" color="danger" [attr.aria-label]="question.status"
+                <ion-icon *ngIf="question.stateClass === 'core-question-incorrect' ||
+                    question.stateClass === 'core-question-notanswered'" name="fas-xmark" color="danger" [attr.aria-label]="question.status"
                     slot="end">
                 </ion-icon>
             </ion-item>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index e0701e66d..a190f2522 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -24,15 +24,15 @@
         </ion-item>
     </ion-card>
 
-    <ng-container *ngIf="mode == 'iframe'">
+    <ng-container *ngIf="mode === 'iframe'">
         <core-iframe [src]="src"></core-iframe>
     </ng-container>
 
-    <div *ngIf="mode == 'embedded'" class="ion-padding">
+    <div *ngIf="mode === 'embedded'" class="ion-padding">
         <core-format-text [text]="contentText" [filter]="false"></core-format-text>
     </div>
 
-    <ng-container *ngIf="mode == 'external'">
+    <ng-container *ngIf="mode === 'external'">
         <ion-list>
             <ion-item class="ion-text-wrap" *ngIf="type">
                 <ion-label>
@@ -84,7 +84,7 @@
     </ng-container>
 
     <div collapsible-footer appearOnBottom *ngIf="!showLoading" slot="fixed">
-        <div class="list-item-limited-width" *ngIf="mode == 'external'">
+        <div class="list-item-limited-width" *ngIf="mode === 'external'">
             <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" fill="outline"
                 (click)="open(openFileAction.OPEN_WITH)" class="ion-margin ion-text-wrap">
                 <ion-icon name="far-share-from-square" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html
index be5afe998..2509b760f 100644
--- a/src/addons/mod/resource/pages/index/index.html
+++ b/src/addons/mod/resource/pages/index/index.html
@@ -16,7 +16,7 @@
     </ion-toolbar>
 </ion-header>
 <ion-content class="limited-width">
-    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading || activityComponent?.mode == 'iframe'"
+    <ion-refresher slot="fixed" [disabled]="activityComponent?.showLoading || activityComponent?.mode === 'iframe'"
         (ionRefresh)="activityComponent?.doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 07801751f..18e47a08a 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -22,13 +22,13 @@
         <ng-container *ngIf="phases && phases[workshop.phase] && phases[workshop.phase].tasks &&
             phases[workshop.phase].tasks.length">
             <ion-item button class="ion-text-wrap" *ngFor="let task of phases[workshop.phase].tasks"
-                [class.item-dimmed]="task.code == 'submit' && !showSubmit" (click)="runTask(task)" detail="false">
-                <ion-icon slot="start" name="far-circle" *ngIf="task.completed == null"
+                [class.item-dimmed]="task.code === 'submit' && !showSubmit" (click)="runTask(task)" detail="false">
+                <ion-icon slot="start" name="far-circle" *ngIf="task.completed === null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
-                <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed == ''"
+                <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed === ''"
                     [attr.aria-label]="'addon.mod_workshop.taskfail' | translate">
                 </ion-icon>
-                <ion-icon slot="start" name="fas-circle-info" color="info" *ngIf="task.completed == 'info'"
+                <ion-icon slot="start" name="fas-circle-info" color="info" *ngIf="task.completed === 'info'"
                     [attr.aria-label]="'addon.mod_workshop.taskinfo' | translate">
                 </ion-icon>
                 <ion-icon slot="start" name="fas-circle-check" color="success" *ngIf="task.completed == '1'"
@@ -38,7 +38,7 @@
                     <p class="item-heading">{{task.title}}</p>
                     <p *ngIf="task.details" [innerHTML]="task.details"></p>
                 </ion-label>
-                <ion-icon slot="end" *ngIf="task.link && task.code != 'submit'" name="fas-up-right-from-square" aria-hidden="true">
+                <ion-icon slot="end" *ngIf="task.link && task.code !== 'submit'" name="fas-up-right-from-square" aria-hidden="true">
                 </ion-icon>
             </ion-item>
         </ng-container>
diff --git a/src/addons/mod/workshop/components/phase/phase.html b/src/addons/mod/workshop/components/phase/phase.html
index 5d4ffbf95..2635a752a 100644
--- a/src/addons/mod/workshop/components/phase/phase.html
+++ b/src/addons/mod/workshop/components/phase/phase.html
@@ -29,13 +29,13 @@
                 <ion-icon slot="end" name="fas-up-right-from-square" aria-hidden="true"></ion-icon>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngFor="let task of phase.tasks"
-                [class.item-dimmed]="phase.code != workshopPhase || (task.code == 'submit' && !showSubmit)" (click)="runTask(task)"
+                [class.item-dimmed]="phase.code !== workshopPhase || (task.code === 'submit' && !showSubmit)" (click)="runTask(task)"
                 detail="false" button>
                 <ion-icon slot="start" name="far-circle" *ngIf="task.completed == null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
-                <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed == ''"
+                <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed === ''"
                     [attr.aria-label]="'addon.mod_workshop.taskfail' | translate"></ion-icon>
-                <ion-icon slot="start" name="fas-circle-info" color="info" *ngIf="task.completed == 'info'"
+                <ion-icon slot="start" name="fas-circle-info" color="info" *ngIf="task.completed === 'info'"
                     [attr.aria-label]="'addon.mod_workshop.taskinfo' | translate"></ion-icon>
                 <ion-icon slot="start" name="fas-circle-check" color="success" *ngIf="task.completed == '1'"
                     [attr.aria-label]="'addon.mod_workshop.taskdone' | translate"></ion-icon>
@@ -43,7 +43,7 @@
                     <p class="item-heading ion-text-wrap">{{task.title}}</p>
                     <p *ngIf="task.details" [innerHTML]="task.details"></p>
                 </ion-label>
-                <ion-icon slot="end" *ngIf="task.link && task.code != 'submit'" name="fas-up-right-from-square" aria-hidden="true">
+                <ion-icon slot="end" *ngIf="task.link && task.code !== 'submit'" name="fas-up-right-from-square" aria-hidden="true">
                 </ion-icon>
             </ion-item>
         </ng-container>
diff --git a/src/addons/mod/workshop/services/workshop-helper.ts b/src/addons/mod/workshop/services/workshop-helper.ts
index 55eaa30b2..367148474 100644
--- a/src/addons/mod/workshop/services/workshop-helper.ts
+++ b/src/addons/mod/workshop/services/workshop-helper.ts
@@ -391,7 +391,7 @@ export class AddonModWorkshopHelperProvider {
         files: CoreFileEntry[],
         offline: false,
         siteId?: string,
-    ): Promise<number>
+    ): Promise<number>;
     uploadOrStoreAssessmentFiles(
         workshopId: number,
         assessmentId: number,
diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html
index 33eb17108..89204e975 100644
--- a/src/addons/notes/pages/list/list.html
+++ b/src/addons/notes/pages/list/list.html
@@ -86,8 +86,8 @@
                         [attr.aria-label]="'core.restore' | translate">
                         <ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
-                    <ion-button *ngIf="showDelete && !note.deleted && (type != 'personal' || note.usermodified == currentUserId)" slot="end"
-                        fill="clear" [@coreSlideInOut]="'fromRight'" color="danger" (click)="deleteNote($event, note)"
+                    <ion-button *ngIf="showDelete && !note.deleted && (type !== 'personal' || note.usermodified === currentUserId)"
+                        slot="end" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger" (click)="deleteNote($event, note)"
                         [attr.aria-label]="'core.delete' | translate">
                         <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
                     </ion-button>
diff --git a/src/addons/notes/pages/list/list.ts b/src/addons/notes/pages/list/list.ts
index 58bf0e68e..badf1372e 100644
--- a/src/addons/notes/pages/list/list.ts
+++ b/src/addons/notes/pages/list/list.ts
@@ -42,7 +42,7 @@ import { CoreTime } from '@singletons/time';
 })
 export class AddonNotesListPage implements OnInit, OnDestroy {
 
-     @ViewChild(IonContent) content?: IonContent;
+    @ViewChild(IonContent) content?: IonContent;
 
     courseId!: number;
     userId?: number;
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index 3ad05578f..8887aab00 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -51,7 +51,7 @@
     </core-loading>
 
     <!-- Upload a private file. -->
-    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="showUpload && root != 'site' && !path">
+    <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="showUpload && root !== 'site' && !path">
         <ion-fab-button (click)="uploadFile()" [attr.aria-label]="'core.fileuploader.uploadafile' | translate">
             <ion-icon name="fas-plus" aria-hidden="true"></ion-icon>
             <span class="sr-only">{{ 'core.fileuploader.uploadafile' | translate }}</span>
diff --git a/src/addons/qtype/essay/component/addon-qtype-essay.html b/src/addons/qtype/essay/component/addon-qtype-essay.html
index 26f95d1d9..4996c7b8b 100644
--- a/src/addons/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addons/qtype/essay/component/addon-qtype-essay.html
@@ -67,7 +67,7 @@
     <!-- Reviewing the question. -->
     <ng-container *ngIf="review">
         <!-- Answer to the question and attachments (reviewing). -->
-        <ion-item class="ion-text-wrap" *ngIf="question.answer || question.answer == ''">
+        <ion-item class="ion-text-wrap" *ngIf="question.answer || question.answer === ''">
             <ion-label>
                 <core-format-text [ngClass]='{"core-monospaced": question.isMonospaced}' [component]="component" [componentId]="componentId"
                     [text]="question.answer" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId">
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
index 6142c71c0..58a91cd47 100644
--- a/src/core/components/combobox/core-combobox.html
+++ b/src/core/components/combobox/core-combobox.html
@@ -1,16 +1,16 @@
-<ion-button (click)="openSelect($event)" *ngIf="interface != 'modal' && icon" [disabled]="disabled">
+<ion-button (click)="openSelect($event)" *ngIf="interface !== 'modal' && icon" [disabled]="disabled">
     <ion-icon [name]="icon" [attr.aria-label]="label" slot="start">
     </ion-icon>
     <div class="select-icon" role="presentation" aria-hidden="true">
         <div class="select-icon-inner"></div>
     </div>
 </ion-button>
-<ion-select *ngIf="interface != 'modal'" class="ion-text-start" [(ngModel)]="selection" (ngModelChange)="onValueChanged(selection)"
+<ion-select *ngIf="interface !== 'modal'" class="ion-text-start" [(ngModel)]="selection" (ngModelChange)="onValueChanged(selection)"
     [interface]="interface" [attr.aria-label]="label + ': ' + selection" [disabled]="disabled" [hidden]="!!icon">
     <ng-content></ng-content>
 </ion-select>
 
-<ion-button *ngIf="interface == 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
+<ion-button *ngIf="interface === 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
     [attr.aria-expanded]="expanded" (click)="openSelect()" [disabled]="disabled" expand="block" role="combobox">
     <ion-icon *ngIf="icon" [name]="icon" slot="start" aria-hidden="true"></ion-icon>
     <span class="sr-only" *ngIf="label">{{ label }}:</span>
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 7ba6c7cd4..960de7d6b 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -13,12 +13,12 @@
                 </p>
             </ion-label>
             <ng-container *ngIf="(item.href || item.action) && item.iconAction">
-                <ion-icon *ngIf="item.iconAction != 'spinner' && item.iconAction != 'toggle'" [name]="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 *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)"
+                <ion-toggle *ngIf="item.iconAction === 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)"
                     slot="end">
                 </ion-toggle>
             </ng-container>
diff --git a/src/core/components/infinite-loading/core-infinite-loading.html b/src/core/components/infinite-loading/core-infinite-loading.html
index 8cb69a24d..32b06f708 100644
--- a/src/core/components/infinite-loading/core-infinite-loading.html
+++ b/src/core/components/infinite-loading/core-infinite-loading.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="!loadingMore && position != 'top'">
+<ng-container *ngIf="!loadingMore && position !== 'top'">
     <div *ngIf="enabled || error" class="ion-padding-horizontal" #bottombutton>
         <ion-button *ngIf="!error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.loadmore' | translate }}
@@ -13,7 +13,7 @@
     <ion-infinite-scroll-content></ion-infinite-scroll-content>
 </ion-infinite-scroll>
 
-<ng-container *ngIf="!loadingMore && position == 'top'">
+<ng-container *ngIf="!loadingMore && position === 'top'">
     <div *ngIf="enabled || error" class="ion-padding-horizontal" #topbutton>
         <ion-button *ngIf="!error" expand="block" (click)="loadMore()" fill="outline">
             {{ 'core.loadmore' | translate }}
diff --git a/src/core/components/input-errors/core-input-errors.html b/src/core/components/input-errors/core-input-errors.html
index 6c1448d3b..9bee393c3 100644
--- a/src/core/components/input-errors/core-input-errors.html
+++ b/src/core/components/input-errors/core-input-errors.html
@@ -3,10 +3,10 @@
         <ng-container *ngFor="let error of errorKeys">
             <div *ngIf="control.hasError(error)" class="core-input-error">
                 <span *ngIf="errorMessages && errorMessages[error]">{{errorMessages[error]}}</span>
-                <span *ngIf="(!errorMessages || !errorMessages[error]) && error == 'max' && control.errors?.max">
+                <span *ngIf="(!errorMessages || !errorMessages[error]) && error === 'max' && control.errors?.max">
                     {{ 'core.login.invalidvaluemax' | translate:{$a: control.errors!.max.max} }}
                 </span>
-                <span *ngIf="(!errorMessages || !errorMessages[error]) && error == 'min' && control.errors?.min">
+                <span *ngIf="(!errorMessages || !errorMessages[error]) && error === 'min' && control.errors?.min">
                     {{ 'core.login.invalidvaluemin' | translate:{$a: control.errors!.min.min} }}
                 </span>
             </div>
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index 9ea65bded..301f51521 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -7,11 +7,11 @@
         </ion-button>
         <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
             <ng-container *ngFor="let tab of tabs">
-                <ion-slide *ngIf="tab.enabled" role="presentation" [id]="tab.id! + '-tab'" [class.selected]="selected == tab.id"
+                <ion-slide *ngIf="tab.enabled" role="presentation" [id]="tab.id! + '-tab'" [class.selected]="selected === tab.id"
                     class="{{tab.class}}">
                     <ion-tab-button (click)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown(tab.id, $event)"
                         (keyup)="tabAction.keyUp(tab.id, $event)" [layout]="layout" role="tab" [attr.aria-controls]="tab.id"
-                        [attr.aria-selected]="selected == tab.id" [tabindex]="selected == tab.id ? 0 : -1">
+                        [attr.aria-selected]="selected === tab.id" [tabindex]="selected === tab.id ? 0 : -1">
                         <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
                         <ion-label>
                             <h2>{{ tab.title | translate}}</h2>
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index c318637b8..aadf0701f 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -80,8 +80,8 @@
                             <p class="item-heading" *ngIf="grade.itemmodule">
                                 {{ 'core.grades.grade' | translate }}
                             </p>
-                            <p *ngIf="grade.grade && grade.grade != '-'" [innerHTML]="grade.grade"></p>
-                            <ion-badge *ngIf="!grade.grade || grade.grade == '-'" color="light">
+                            <p *ngIf="grade.grade && grade.grade !== '-'" [innerHTML]="grade.grade"></p>
+                            <ion-badge *ngIf="!grade.grade || grade.grade === '-'" color="light">
                                 {{ 'core.grades.notgraded' | translate }}
                             </ion-badge>
                         </ion-label>
@@ -92,48 +92,48 @@
                         </ion-icon>
                     </ion-item>
                     <div *ngIf="grade.expanded" [id]="'grade-'+grade.id">
-                        <ion-item class="ion-text-wrap" *ngIf="grade.weight?.length > 0 && grade.weight != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.weight?.length > 0 && grade.weight !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.weight' | translate}}</p>
                                 <p [innerHTML]="grade.weight"></p>
                             </ion-label>
                         </ion-item>
-                        <ion-item class="ion-text-wrap" *ngIf="grade.range?.length > 0 && grade.range != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.range?.length > 0 && grade.range !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.range' | translate}}</p>
                                 <p [innerHTML]="grade.range"></p>
                             </ion-label>
                         </ion-item>
 
-                        <ion-item class="ion-text-wrap" *ngIf="grade.percentage?.length > 0 && grade.percentage != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.percentage?.length > 0 && grade.percentage !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.percentage' | translate}}</p>
                                 <p [innerHTML]="grade.percentage"></p>
                             </ion-label>
                         </ion-item>
 
-                        <ion-item class="ion-text-wrap" *ngIf="grade.lettergrade?.length > 0 && grade.lettergrade != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.lettergrade?.length > 0 && grade.lettergrade !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.lettergrade' | translate}}</p>
                                 <p [innerHTML]="grade.lettergrade"></p>
                             </ion-label>
                         </ion-item>
 
-                        <ion-item class="ion-text-wrap" *ngIf="grade.rank?.length > 0 && grade.rank != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.rank?.length > 0 && grade.rank !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.rank' | translate}}</p>
                                 <p [innerHTML]="grade.rank"></p>
                             </ion-label>
                         </ion-item>
 
-                        <ion-item class="ion-text-wrap" *ngIf="grade.average?.length > 0 && grade.average != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.average?.length > 0 && grade.average !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.average' | translate}}</p>
                                 <p [innerHTML]="grade.average"></p>
                             </ion-label>
                         </ion-item>
 
-                        <ion-item class="ion-text-wrap" *ngIf="grade.feedback?.length > 0 && grade.feedback != '-'">
+                        <ion-item class="ion-text-wrap" *ngIf="grade.feedback?.length > 0 && grade.feedback !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.feedback' | translate}}</p>
                                 <p>
@@ -145,7 +145,7 @@
                         </ion-item>
 
                         <ion-item class="ion-text-wrap"
-                            *ngIf="grade.contributiontocoursetotal?.length > 0 && grade.contributiontocoursetotal != '-'">
+                            *ngIf="grade.contributiontocoursetotal?.length > 0 && grade.contributiontocoursetotal !== '-'">
                             <ion-label>
                                 <p class="item-heading">{{ 'core.grades.contributiontocoursetotal' | translate}}</p>
                                 <p [innerHTML]="grade.contributiontocoursetotal"></p>
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index b491d89a5..e7d2179b3 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -116,7 +116,7 @@
                                     <span class="core-customfieldseparator">: </span>
                                 </span>
                                 <span class="core-customfieldvalue">
-                                    <core-format-text [text]="field.value" [collapsible-item]="field.type == 'textarea'  ? '' : null"
+                                    <core-format-text [text]="field.value" [collapsible-item]="field.type === 'textarea'  ? '' : null"
                                         contextLevel="course" [contextInstanceId]="course.id">
                                     </core-format-text>
                                 </span>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 6838978d8..7f6f0fc00 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,14 +1,14 @@
-<ion-card [class.core-course-list-item]="layout == 'list' || layout == 'listwithenrol'"
-    [class.core-course-list-card]="layout == 'card' || layout == 'summarycard'" [class.item-dimmed]="course.hidden" (click)="openCourse()"
+<ion-card [class.core-course-list-item]="layout === 'list' || layout === 'listwithenrol'"
+    [class.core-course-list-card]="layout === 'card' || layout === 'summarycard'" [class.item-dimmed]="course.hidden" (click)="openCourse()"
     button [attr.aria-label]="course.displayname || course.fullname">
 
-    <div *ngIf="layout == 'card' || layout == 'summarycard'" class="core-course-thumb" [class.core-course-color-img]="course.courseimage">
+    <div *ngIf="layout === 'card' || layout === 'summarycard'" class="core-course-thumb" [class.core-course-color-img]="course.courseimage">
         <img *ngIf="course.courseimage" [src]="course.courseimage" core-external-content alt="" (error)="loadFallbackCourseIcon()" />
         <ion-icon *ngIf="!course.courseimage" name="fas-graduation-cap" class="course-icon" aria-hidden="true">
         </ion-icon>
     </div>
 
-    <ng-container *ngIf="isEnrolled && layout != 'summarycard'">
+    <ng-container *ngIf="isEnrolled && layout !== 'summarycard'">
         <div class="core-button-spinner" *ngIf="!courseOptionMenuEnabled && showDownload">
             <core-download-refresh [status]="prefetchCourseData.status" [enabled]="showDownload"
                 [statusTranslatable]="prefetchCourseData.statusTranslatable" [canTrustDownload]="false"
@@ -29,7 +29,7 @@
 
     <ion-item class="ion-text-wrap">
 
-        <ng-container *ngIf="layout == 'list' || layout == 'listwithenrol'">
+        <ng-container *ngIf="layout === 'list' || layout === 'listwithenrol'">
             <ion-icon *ngIf="!course.courseimage" name="fas-graduation-cap" slot="start" class="course-icon core-course-thumb"
                 aria-hidden="true">
             </ion-icon>
@@ -55,7 +55,7 @@
                     <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                     </core-format-text>
 
-                    <span *ngIf="(layout == 'list' || layout == 'listwithenrol') && !isEnrolled" class="core-course-enrol-icons">
+                    <span *ngIf="(layout === 'list' || layout === 'listwithenrol') && !isEnrolled" class="core-course-enrol-icons">
                         <ion-icon *ngFor="let icon of enrolmentIcons" color="medium" [name]="icon.icon" [title]="icon.label | translate"
                             [attr.aria-label]="icon.label | translate" [ngClass]="[icon.className]">
                         </ion-icon>
@@ -82,7 +82,7 @@
                 </ion-chip>
             </div>
 
-            <div *ngIf="layout != 'summarycard' && isEnrolled && progress >= 0 && completionUserTracked !== false"
+            <div *ngIf="layout !== 'summarycard' && isEnrolled && progress >= 0 && completionUserTracked !== false"
                 class="core-course-progress">
                 <core-progress-bar [progress]="progress" a11yText="core.courses.aria:courseprogress"></core-progress-bar>
             </div>
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 17633d581..06589ca7b 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
@@ -8,7 +8,7 @@
             </ion-label>
         </ion-item>
         <ion-item button class="ion-text-wrap" (click)="action('delete')" detail="false"
-            *ngIf="prefetch.status == 'downloaded' || prefetch.status == 'outdated'">
+            *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>
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index a5c6dc447..c45814538 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -37,7 +37,7 @@
                             [class.core-grades-grade-clickable]="row.expandable && showSummary" [id]="'grade-'+row.id"
                             *ngIf="row.itemtype !== 'leader'">
                             <ng-container *ngIf="row.itemtype">
-                                <td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
+                                <td *ngIf="row.itemtype === 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
                                 </td>
                                 <th class="core-grades-table-gradeitem ion-text-start" [attr.colspan]="row.colspan">
                                     <ion-icon *ngIf="row.expandable && showSummary" aria-hidden="true" slot="start" name="fas-chevron-right"
diff --git a/src/core/features/grades/pages/courses/courses.html b/src/core/features/grades/pages/courses/courses.html
index 13902dfcb..7f9a192b8 100644
--- a/src/core/features/grades/pages/courses/courses.html
+++ b/src/core/features/grades/pages/courses/courses.html
@@ -26,7 +26,7 @@
                         </core-format-text>
                     </ion-label>
                     <ion-badge slot="end" color="light">
-                        <span class="sr-only" *ngIf="course.grade && course.grade != '-'">
+                        <span class="sr-only" *ngIf="course.grade && course.grade !== '-'">
                             {{ 'core.grades.grade' | translate }}
                         </span>
                         {{course.grade}}
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index d4dd1aae5..e6e1fb8cc 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -22,7 +22,7 @@
         </div>
         <form [formGroup]="siteForm" (ngSubmit)="connect(siteForm.value.siteUrl, $event)" *ngIf="!fixedSites && siteForm" #siteFormEl>
             <!-- Form to input the site URL if there are no fixed sites. -->
-            <ng-container *ngIf=" siteSelector=='url'">
+            <ng-container *ngIf=" siteSelector==='url'">
                 <ion-item>
                     <ion-label position=" stacked">
                         <h2>{{ 'core.login.siteaddress' | translate }}</h2>
@@ -32,7 +32,7 @@
                     </ion-input>
                 </ion-item>
             </ng-container>
-            <ng-container *ngIf="siteSelector != 'url'">
+            <ng-container *ngIf="siteSelector !== 'url'">
                 <ion-item>
                     <ion-label position="stacked">
                         <h2>{{ 'core.login.siteaddress' | translate }}</h2>
@@ -74,7 +74,7 @@
                 </div>
             </ng-container>
 
-            <ion-item *ngIf="siteSelector == 'url'">
+            <ion-item *ngIf="siteSelector === 'url'">
                 <ion-label>
                     <ion-button expand="block" [disabled]="!siteForm.valid" class="ion-text-wrap" type="submit">
                         {{ 'core.login.connect' | translate }}
@@ -85,7 +85,7 @@
 
         <ng-container *ngIf="fixedSites">
             <!-- Pick the site from a list of fixed sites. -->
-            <ion-list *ngIf="siteSelector == 'list'">
+            <ion-list *ngIf="siteSelector === 'list'">
                 <ion-item>
                     <ion-label>
                         <h2 class="item-heading">{{ 'core.login.selectsite' | translate }}</h2>
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 2cc91b881..f17ec2c5e 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -1,9 +1,9 @@
 <ion-tabs #mainTabs [hidden]="!showTabs" [class]="'placement-' + tabsPlacement"
-    [class.tabshidden]="!isMainScreen && tabsPlacement == 'bottom'" (ionTabsDidChange)="tabChanged($event)">
+    [class.tabshidden]="!isMainScreen && tabsPlacement === 'bottom'" (ionTabsDidChange)="tabChanged($event)">
     <ion-tab-bar slot="bottom" class="mainmenu-tabs" [@menuVisibilityAnimation]="visibility">
         <ion-spinner *ngIf="!loaded" [attr.aria-label]="'core.loading' | translate"></ion-spinner>
 
-        <core-user-menu-button *ngIf="loaded && tabsPlacement == 'side'" [alwaysShow]="true"></core-user-menu-button>
+        <core-user-menu-button *ngIf="loaded && tabsPlacement === 'side'" [alwaysShow]="true"></core-user-menu-button>
 
         <ion-tab-button *ngFor="let tab of tabs" (keydown)="tabAction.keyDown(tab.page, $event)" (keyup)="tabAction.keyUp(tab.page, $event)"
             [hidden]="!loaded && tab.hide" [tab]="tab.page" [disabled]="tab.hide" layout="label-hide" class="{{tab.class}}"
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 602fb936e..a14467035 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -36,15 +36,15 @@
             </ion-spinner>
         </ion-item>
         <ng-container *ngFor="let item of customItems">
-            <ion-item button *ngIf="item.type != 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
-                [capture]="item.type == 'app'" [inApp]="item.type == 'inappbrowser'" class="core-moremenu-customitem" detail="true"
-                [detailIcon]="item.type == 'browser' ? 'open-outline' : 'chevron-forward'">
+            <ion-item button *ngIf="item.type !== 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
+                [capture]="item.type === 'app'" [inApp]="item.type === 'inappbrowser'" class="core-moremenu-customitem" detail="true"
+                [detailIcon]="item.type === 'browser' ? 'open-outline' : 'chevron-forward'">
                 <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{item.label}}</p>
                 </ion-label>
             </ion-item>
-            <ion-item button *ngIf="item.type == 'embedded'" (click)="openItem(item)" [attr.aria-label]="item.label"
+            <ion-item button *ngIf="item.type === 'embedded'" (click)="openItem(item)" [attr.aria-label]="item.label"
                 class="core-moremenu-customitem" detail="true">
                 <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 3dce170b6..57a4eaac3 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -9,7 +9,7 @@
             <ion-icon name="fas-magnifying-glass" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
         <ion-button *ngIf="showClear" slot="end" fill="clear" [attr.aria-label]="'core.clearsearch' | translate"
-            [disabled]="searched == '' || disabled" (click)="clearForm()">
+            [disabled]="searched === '' || disabled" (click)="clearForm()">
             <ion-icon name="fas-delete-left" slot="icon-only" aria-hidden="true" flip-rtl></ion-icon>
         </ion-button>
     </ion-item>
diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html
index 57fe64eee..90843dac5 100644
--- a/src/core/features/settings/pages/general/general.html
+++ b/src/core/features/settings/pages/general/general.html
@@ -47,7 +47,7 @@
                     {{ 'core.settings.colorscheme-' + scheme | translate }}</ion-select-option>
             </ion-select>
         </ion-item>
-        <ion-item *ngIf="colorSchemes.length> 0 && selectedScheme=='system' && isAndroid" lines="none">
+        <ion-item *ngIf="colorSchemes.length> 0 && selectedScheme==='system' && isAndroid" lines="none">
             <ion-label class="ion-text-wrap">
                 <p>{{ 'core.settings.colorscheme-system-notice' | translate }}</p>
             </ion-label>
diff --git a/src/core/features/tag/pages/index/index.html b/src/core/features/tag/pages/index/index.html
index 5afa6ae04..e3963735c 100644
--- a/src/core/features/tag/pages/index/index.html
+++ b/src/core/features/tag/pages/index/index.html
@@ -21,7 +21,7 @@
                     <ion-label class="ion-text-wrap">{{ 'core.tag.warningareasnotsupported' | translate }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let area of areas" [attr.aria-label]="area.nameKey | translate"
-                    (click)="openArea(area)" [attr.aria-current]="area.id == selectedAreaId ? 'page' : 'false'" button detail="true">
+                    (click)="openArea(area)" [attr.aria-current]="area.id === selectedAreaId ? 'page' : 'false'" button detail="true">
                     <ion-label>
                         <p class="item-heading">{{ area.nameKey | translate }}</p>
                     </ion-label>
diff --git a/src/core/features/user/classes/support/support-config.ts b/src/core/features/user/classes/support/support-config.ts
index fd15ddf12..1cd345738 100644
--- a/src/core/features/user/classes/support/support-config.ts
+++ b/src/core/features/user/classes/support/support-config.ts
@@ -22,14 +22,14 @@ export abstract class CoreUserSupportConfig {
      *
      * @returns Whether the user can contact support.
      */
-    public abstract canContactSupport(): boolean;
+    abstract canContactSupport(): boolean;
 
     /**
      * Get language used in the support page, if any.
      *
      * @returns Support page language.
      */
-    public abstract getSupportPageLang(): string | null;
+    abstract getSupportPageLang(): string | null;
 
     /**
      * Get url to use for contacting support.

From 1639e60ebe65f2d5836f149904ccda4fc625b743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 13 Nov 2023 13:12:29 +0100
Subject: [PATCH 06/17] MOBILE-3947 dx: Update some config to align to Ionic7

---
 .editorconfig           | 19 ++++++++++++
 .gitignore              | 66 ++++++++++++++++++++++++++++++++---------
 .vscode/extensions.json |  1 +
 tsconfig.json           | 28 +++++++++--------
 4 files changed, 88 insertions(+), 26 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..6c0301949
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_size = 2
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
index d3b41f8be..4d221f5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,32 +6,70 @@
 .tmp
 *.tmp
 *.tmp.*
-*.sublime-project
-*.sublime-workspace
-.DS_Store
-Thumbs.db
 UserInterfaceState.xcuserstate
 $RECYCLE.BIN/
 
 *.log
 log.txt
-npm-debug.log*
 
-/.idea
-/.ionic
-/.sass-cache
 /.sourcemaps
 /.versions
 /coverage
-/dist
-/node_modules
+
+# Ionic
+/.ionic
+/www
 /platforms
 /plugins
-/www
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-project
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+
+# Miscellaneous
+/.angular
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db
+
+# Moodle App
 /src/assets/lib
+/src/assets/lang/*
+/src/assets/env.json
 
 /moodle.config.*.json
 !/moodle.config.example.json
-
-/src/assets/lang/*
-/src/assets/env.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 71bb27499..2442fe5ac 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
     "recommendations": [
+        "ionic.ionic",
         "dbaeumer.vscode-eslint",
         "angular.ng-template"
     ]
diff --git a/tsconfig.json b/tsconfig.json
index 013b67b32..7b7f668e0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,8 @@
     "experimentalDecorators": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": false,
     "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
@@ -32,21 +34,23 @@
         "webpack-env"
     ],
     "paths": {
-      "@addons/*": ["addons/*"],
-      "@classes/*": ["core/classes/*"],
-      "@components/*": ["core/components/*"],
-      "@directives/*": ["core/directives/*"],
-      "@features/*": ["core/features/*"],
-      "@guards/*": ["core/guards/*"],
-      "@pipes/*": ["core/pipes/*"],
-      "@services/*": ["core/services/*"],
-      "@singletons": ["core/singletons/index"],
-      "@singletons/*": ["core/singletons/*"],
-      "@/*": ["*"]
+      "@addons/*": ["./addons/*"],
+      "@classes/*": ["./core/classes/*"],
+      "@components/*": ["./core/components/*"],
+      "@directives/*": ["./core/directives/*"],
+      "@features/*": ["./core/features/*"],
+      "@guards/*": ["./core/guards/*"],
+      "@pipes/*": ["./core/pipes/*"],
+      "@services/*": ["./core/services/*"],
+      "@singletons": ["./core/singletons/index"],
+      "@singletons/*": ["./core/singletons/*"],
+      "@/*": ["./*"]
     }
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true
   }
 }

From 9e9052db85e9db376a63184e4ebe5c7ae0dc168f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 9 Nov 2023 16:28:49 +0100
Subject: [PATCH 07/17] MOBILE-3947 chore: Fix some non valid types

---
 src/addons/block/timeline/classes/section.ts  |  2 +-
 .../timeline/components/timeline/timeline.ts  |  2 +-
 .../enrol/guest/services/enrol-handler.ts     |  2 +-
 .../services/handlers/mathjaxloader.ts        |  4 ++--
 .../mod/assign/services/assign-offline.ts     |  5 +++--
 .../mod/assign/services/handlers/prefetch.ts  |  2 +-
 .../mod/choice/components/index/index.ts      |  2 +-
 src/addons/mod/feedback/services/feedback.ts  |  4 ++--
 .../workshop/pages/submission/submission.ts   |  2 +-
 src/core/classes/database/database-table.ts   |  4 ++--
 src/core/components/split-view/split-view.ts  |  2 +-
 src/core/directives/format-text.ts            | 12 +++++++-----
 .../comments/services/comments-offline.ts     |  7 ++++---
 .../audio-recorder.component.ts               |  2 +-
 .../components/report-detail/report-detail.ts | 19 ++++++++++---------
 .../features/reportbuilder/pages/list/list.ts |  2 +-
 src/core/pipes/seconds-to-hms.ts              |  6 +++---
 src/core/services/utils/dom.ts                |  2 +-
 src/core/services/utils/text.ts               |  2 +-
 19 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/addons/block/timeline/classes/section.ts b/src/addons/block/timeline/classes/section.ts
index ae82df5a0..08a5f1104 100644
--- a/src/addons/block/timeline/classes/section.ts
+++ b/src/addons/block/timeline/classes/section.ts
@@ -44,7 +44,7 @@ export class AddonBlockTimelineSection {
         this.overdue = overdue;
         this.dateRange = dateRange;
         this.course = course;
-        this.dataSubject$ = new BehaviorSubject({
+        this.dataSubject$ = new BehaviorSubject<AddonBlockTimelineSectionData>({
             events: [],
             lastEventId: canLoadMore,
             canLoadMore: typeof canLoadMore !== 'undefined',
diff --git a/src/addons/block/timeline/components/timeline/timeline.ts b/src/addons/block/timeline/components/timeline/timeline.ts
index b9ee654cc..e61a52f5c 100644
--- a/src/addons/block/timeline/components/timeline/timeline.ts
+++ b/src/addons/block/timeline/components/timeline/timeline.ts
@@ -56,7 +56,7 @@ export class AddonBlockTimelineComponent implements OnInit, ICoreBlockComponent
 
     constructor() {
         this.logger = CoreLogger.getInstance('AddonBlockTimelineComponent');
-        this.search$ = new BehaviorSubject(null);
+        this.search$ = new BehaviorSubject<string | null>(null);
         this.initializeSort();
         this.initializeFilter();
         this.initializeSections();
diff --git a/src/addons/enrol/guest/services/enrol-handler.ts b/src/addons/enrol/guest/services/enrol-handler.ts
index 0a0b174c4..00c2a1313 100644
--- a/src/addons/enrol/guest/services/enrol-handler.ts
+++ b/src/addons/enrol/guest/services/enrol-handler.ts
@@ -98,7 +98,7 @@ export class AddonEnrolGuestHandlerService implements CoreEnrolGuestHandler {
             return false;
         }
 
-        const validatePassword = async (password: string): Promise<CorePasswordModalResponse> => {
+        const validatePassword = async (password = ''): Promise<CorePasswordModalResponse> => {
             const modal = await CoreDomUtils.showModalLoading('core.loading', true);
 
             try {
diff --git a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
index aca1a8916..5d40042a9 100644
--- a/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
+++ b/src/addons/filter/mathjaxloader/services/handlers/mathjaxloader.ts
@@ -407,8 +407,8 @@ type MathJaxWindow = Window & {
     MathJax?: any; // eslint-disable-line @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any
     M?: { // eslint-disable-line @typescript-eslint/naming-convention
         filter_mathjaxloader?: { // eslint-disable-line @typescript-eslint/naming-convention
-            _lang: ''; // eslint-disable-line @typescript-eslint/naming-convention
-            _configured: false; // eslint-disable-line @typescript-eslint/naming-convention
+            _lang: string; // eslint-disable-line @typescript-eslint/naming-convention
+            _configured: boolean; // eslint-disable-line @typescript-eslint/naming-convention
             // Add the configuration to the head and set the lang.
             configure: (params: Record<string, unknown>) => void;
             _setLocale: () => void; // eslint-disable-line @typescript-eslint/naming-convention
diff --git a/src/addons/mod/assign/services/assign-offline.ts b/src/addons/mod/assign/services/assign-offline.ts
index e275a489b..cf8d095f0 100644
--- a/src/addons/mod/assign/services/assign-offline.ts
+++ b/src/addons/mod/assign/services/assign-offline.ts
@@ -28,6 +28,7 @@ import {
     SUBMISSIONS_GRADES_TABLE,
     SUBMISSIONS_TABLE,
 } from './database/assign';
+import { CoreArray } from '@singletons/array';
 
 /**
  * Service to handle offline assign.
@@ -86,8 +87,8 @@ export class AddonModAssignOfflineProvider {
 
         const results = await Promise.all(promises);
         // Flatten array.
-        const flatten: (AddonModAssignSubmissionsDBRecord | AddonModAssignSubmissionsGradingDBRecord)[] =
-            [].concat.apply([], results);
+        const flatten = CoreArray
+            .flatten<AddonModAssignSubmissionsDBRecordFormatted | AddonModAssignSubmissionsGradingDBRecordFormatted>(results);
 
         // Get assign id.
         let assignIds: number[] = flatten.map((assign) => assign.assignid);
diff --git a/src/addons/mod/assign/services/handlers/prefetch.ts b/src/addons/mod/assign/services/handlers/prefetch.ts
index 0cb4fc2f4..b90c16a28 100644
--- a/src/addons/mod/assign/services/handlers/prefetch.ts
+++ b/src/addons/mod/assign/services/handlers/prefetch.ts
@@ -166,7 +166,7 @@ export class AddonModAssignPrefetchHandlerService extends CoreCourseActivityPref
 
         // Get intro and activity files from the submission status if it's a student.
         // It's ok if they were already obtained from the assignment instance, they won't be downloaded twice.
-        const files = canViewAllSubmissions ?
+        const files: CoreWSFile[] = canViewAllSubmissions ?
             [] :
             (submissionStatus.assignmentdata?.attachments?.intro || [])
                 .concat(submissionStatus.assignmentdata?.attachments?.activity || []);
diff --git a/src/addons/mod/choice/components/index/index.ts b/src/addons/mod/choice/components/index/index.ts
index e119299fa..720cf2b88 100644
--- a/src/addons/mod/choice/components/index/index.ts
+++ b/src/addons/mod/choice/components/index/index.ts
@@ -301,7 +301,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         this.data = [];
         this.labels = [];
 
-        this.results = results.map((result: AddonModChoiceResultFormatted) => {
+        this.results = results.map<AddonModChoiceResultFormatted>((result) => {
             if (result.numberofuser > 0) {
                 hasVotes = true;
             }
diff --git a/src/addons/mod/feedback/services/feedback.ts b/src/addons/mod/feedback/services/feedback.ts
index 3eb4e1375..f44148a97 100644
--- a/src/addons/mod/feedback/services/feedback.ts
+++ b/src/addons/mod/feedback/services/feedback.ts
@@ -194,9 +194,9 @@ export class AddonModFeedbackProvider {
             }
 
             // Treat multichoice checkboxes.
-            if (item.typ == 'multichoice' && item.presentation.split(AddonModFeedbackProvider.MULTICHOICE_TYPE_SEP)[0] == 'c') {
+            if (item.typ === 'multichoice' && item.presentation.split(AddonModFeedbackProvider.MULTICHOICE_TYPE_SEP)[0] === 'c') {
 
-                offlineValues[item.id] = offlineValues[item.id].filter((value) => value > 0);
+                offlineValues[item.id] = offlineValues[item.id].filter((value) => Number(value) > 0);
                 item.rawValue = offlineValues[item.id].join(AddonModFeedbackProvider.LINE_SEP);
             } else {
                 item.rawValue = offlineValues[item.id][0];
diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts
index bfb7c87b9..81db1a141 100644
--- a/src/addons/mod/workshop/pages/submission/submission.ts
+++ b/src/addons/mod/workshop/pages/submission/submission.ts
@@ -513,7 +513,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
             published: boolean;
         } = this.feedbackForm.value;
 
-        inputData.grade = inputData.grade >= 0 ? inputData.grade : '';
+        inputData.grade = Number(inputData.grade) >= 0 ? inputData.grade : '';
         // Add some HTML to the message if needed.
         inputData.text = CoreTextUtils.formatHtmlLines(inputData.text);
 
diff --git a/src/core/classes/database/database-table.ts b/src/core/classes/database/database-table.ts
index 20fbf8a86..629e95ed7 100644
--- a/src/core/classes/database/database-table.ts
+++ b/src/core/classes/database/database-table.ts
@@ -348,8 +348,8 @@ export class CoreDatabaseTable<
 
         records.sort((a, b) => {
             for (const [column, direction] of columnsSorting) {
-                const aValue = a[column];
-                const bValue = b[column];
+                const aValue = a[column] ?? 0;
+                const bValue = b[column] ?? 0;
 
                 if (aValue > bValue) {
                     return direction === 'desc' ? -1 : 1;
diff --git a/src/core/components/split-view/split-view.ts b/src/core/components/split-view/split-view.ts
index f053a7048..fa23064be 100644
--- a/src/core/components/split-view/split-view.ts
+++ b/src/core/components/split-view/split-view.ts
@@ -40,7 +40,7 @@ export class CoreSplitViewComponent implements AfterViewInit, OnDestroy {
     isNested = false;
     disabledScrollOuterContents: HTMLIonContentElement[] = [];
 
-    private outletRouteSubject: BehaviorSubject<ActivatedRouteSnapshot | null> = new BehaviorSubject(null);
+    private outletRouteSubject = new BehaviorSubject<ActivatedRouteSnapshot | null>(null);
     private subscriptions?: Subscription[];
 
     constructor(private element: ElementRef<HTMLElement>) {}
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index 7c25767cf..2046dbc94 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -464,11 +464,13 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncDirec
         const audios = Array.from(div.querySelectorAll('audio'));
         const videos = Array.from(div.querySelectorAll('video'));
         const iframes = Array.from(div.querySelectorAll('iframe'));
-        const buttons = Array.from(div.querySelectorAll('.button'));
+        const buttons = Array.from(div.querySelectorAll<HTMLElement>('.button'));
         const icons = Array.from(div.querySelectorAll('i.fa,i.fas,i.far,i.fab'));
-        const elementsWithInlineStyles = Array.from(div.querySelectorAll('*[style]'));
-        const stopClicksElements = Array.from(div.querySelectorAll('button,input,select,textarea'));
-        const frames = Array.from(div.querySelectorAll(CoreIframeUtilsProvider.FRAME_TAGS.join(',').replace(/iframe,?/, '')));
+        const elementsWithInlineStyles = Array.from(div.querySelectorAll<HTMLElement>('*[style]'));
+        const stopClicksElements = Array.from(div.querySelectorAll<HTMLElement>('button,input,select,textarea'));
+        const frames = Array.from(
+            div.querySelectorAll<FrameElement>(CoreIframeUtilsProvider.FRAME_TAGS.join(',').replace(/iframe,?/, '')),
+        );
         const svgImages = Array.from(div.querySelectorAll('image'));
         const promises: Promise<void>[] = [];
 
@@ -560,7 +562,7 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncDirec
         });
 
         // Handle all kind of frames.
-        const frameControllers = frames.map((frame: FrameElement) => {
+        const frameControllers = frames.map<FrameElementController>((frame) => {
             CoreIframeUtils.treatFrame(frame, false);
 
             return new FrameElementController(frame, !this.disabled);
diff --git a/src/core/features/comments/services/comments-offline.ts b/src/core/features/comments/services/comments-offline.ts
index 997b5f72a..766c72b3e 100644
--- a/src/core/features/comments/services/comments-offline.ts
+++ b/src/core/features/comments/services/comments-offline.ts
@@ -17,6 +17,7 @@ import { CoreSites } from '@services/sites';
 import { CoreTimeUtils } from '@services/utils/time';
 import { makeSingleton } from '@singletons';
 import { COMMENTS_TABLE, COMMENTS_DELETED_TABLE, CoreCommentsDBRecord, CoreCommentsDeletedDBRecord } from './database/comments';
+import { CoreArray } from '@singletons/array';
 
 /**
  * Service to handle offline comments.
@@ -33,11 +34,11 @@ export class CoreCommentsOfflineProvider {
     async getAllComments(siteId?: string): Promise<(CoreCommentsDBRecord | CoreCommentsDeletedDBRecord)[]> {
         const site = await CoreSites.getSite(siteId);
         const results = await Promise.all([
-            site.getDb().getRecords(COMMENTS_TABLE),
-            site.getDb().getRecords(COMMENTS_DELETED_TABLE),
+            site.getDb().getRecords<CoreCommentsDBRecord>(COMMENTS_TABLE),
+            site.getDb().getRecords<CoreCommentsDeletedDBRecord>(COMMENTS_DELETED_TABLE),
         ]);
 
-        return [].concat.apply([], results);
+        return CoreArray.flatten<CoreCommentsDBRecord | CoreCommentsDeletedDBRecord>(results);
     }
 
     /**
diff --git a/src/core/features/fileuploader/components/audio-recorder/audio-recorder.component.ts b/src/core/features/fileuploader/components/audio-recorder/audio-recorder.component.ts
index 85d01340c..f6285e211 100644
--- a/src/core/features/fileuploader/components/audio-recorder/audio-recorder.component.ts
+++ b/src/core/features/fileuploader/components/audio-recorder/audio-recorder.component.ts
@@ -48,7 +48,7 @@ export class CoreFileUploaderAudioRecorderComponent extends CoreModalComponent<C
         super(elementRef);
 
         this.recording = null;
-        this.media$ = new BehaviorSubject(null);
+        this.media$ = new BehaviorSubject<AudioRecorderMedia | null>(null);
         this.recording$ = this.media$.pipe(
             recorderAudioRecording(),
             shareReplay(),
diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.ts b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
index 9a445b942..0e48d1701 100644
--- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts
+++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
@@ -51,15 +51,16 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
         return this.layout === 'card' || (CoreScreen.isMobile && this.layout === 'adaptative');
     }
 
-    state$: Readonly<BehaviorSubject<CoreReportBuilderReportDetailState>> = new BehaviorSubject({
-        report: null,
-        loaded: false,
-        canLoadMoreRows: true,
-        errorLoadingRows: false,
-        cardviewShowFirstTitle: false,
-        cardVisibleColumns: 1,
-        page: 0,
-    });
+    state$: Readonly<BehaviorSubject<CoreReportBuilderReportDetailState>> =
+        new BehaviorSubject<CoreReportBuilderReportDetailState>({
+            report: null,
+            loaded: false,
+            canLoadMoreRows: true,
+            errorLoadingRows: false,
+            cardviewShowFirstTitle: false,
+            cardVisibleColumns: 1,
+            page: 0,
+        });
 
     source$: Observable<string>;
 
diff --git a/src/core/features/reportbuilder/pages/list/list.ts b/src/core/features/reportbuilder/pages/list/list.ts
index b57ce261f..d67c23af3 100644
--- a/src/core/features/reportbuilder/pages/list/list.ts
+++ b/src/core/features/reportbuilder/pages/list/list.ts
@@ -35,7 +35,7 @@ export class CoreReportBuilderListPage implements AfterViewInit, OnDestroy {
 
     reports!: CoreListItemsManager<CoreReportBuilderReport, CoreReportBuilderReportsSource>;
 
-    state$: Readonly<BehaviorSubject<CoreReportBuilderListState>> = new BehaviorSubject({
+    state$: Readonly<BehaviorSubject<CoreReportBuilderListState>> = new BehaviorSubject<CoreReportBuilderListState>({
         page: 1,
         perpage: REPORTS_LIST_LIMIT,
         loaded: false,
diff --git a/src/core/pipes/seconds-to-hms.ts b/src/core/pipes/seconds-to-hms.ts
index 4a14d02b1..9afc7c7ac 100644
--- a/src/core/pipes/seconds-to-hms.ts
+++ b/src/core/pipes/seconds-to-hms.ts
@@ -41,9 +41,7 @@ export class CoreSecondsToHMSPipe implements PipeTransform {
      * @returns Formatted seconds.
      */
     transform(seconds: string | number, showHours: boolean = true): string {
-        if (!seconds || seconds < 0) {
-            seconds = 0;
-        } else if (typeof seconds == 'string') {
+        if (typeof seconds === 'string') {
             // Convert the value to a number.
             const numberSeconds = parseInt(seconds, 10);
             if (isNaN(numberSeconds)) {
@@ -52,6 +50,8 @@ export class CoreSecondsToHMSPipe implements PipeTransform {
                 return seconds;
             }
             seconds = numberSeconds;
+        } else if (!seconds || seconds < 0) {
+            seconds = 0;
         }
 
         // Don't allow decimals.
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index 6a5e06a33..feae6ef72 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -687,7 +687,7 @@ export class CoreDomUtilsProvider {
         const element = this.convertToElement(html);
 
         // Treat elements with src (img, audio, video, ...).
-        const media = Array.from(element.querySelectorAll('img, video, audio, source, track'));
+        const media = Array.from(element.querySelectorAll<HTMLElement>('img, video, audio, source, track'));
         media.forEach((media: HTMLElement) => {
             const currentSrc = media.getAttribute('src');
             const newSrc = currentSrc ?
diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts
index 35bbb1571..dd7d148ef 100644
--- a/src/core/services/utils/text.ts
+++ b/src/core/services/utils/text.ts
@@ -982,7 +982,7 @@ export class CoreTextUtilsProvider {
      * @returns Number with leading zeros.
      */
     twoDigits(num: string | number): string {
-        if (num < 10) {
+        if (Number(num) < 10) {
             return '0' + num;
         } else {
             return '' + num; // Convert to string for coherence.

From e40a4f13bb56581ab023512f6a6e80d8b09ec956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 13 Nov 2023 10:05:19 +0100
Subject: [PATCH 08/17] MOBILE-3947 chore: Fix some HTML strict types

---
 .../badges/pages/user-badges/user-badges.html    |  2 +-
 .../addon-block-activitymodules.html             |  4 ++--
 .../myoverview/addon-block-myoverview.html       |  2 +-
 .../addon-block-recentlyaccessedcourses.html     |  2 +-
 .../addon-block-recentlyaccesseditems.html       |  4 ++--
 .../sitemainmenu/addon-block-sitemainmenu.html   |  2 +-
 .../addon-block-starredcourses.html              |  2 +-
 .../events/addon-block-timeline-events.html      |  2 +-
 .../timeline/addon-block-timeline.html           |  2 +-
 src/addons/blog/pages/entries/entries.html       |  2 +-
 src/addons/calendar/pages/event/event.html       |  2 +-
 .../pages/competencies/competencies.html         |  2 +-
 .../coursecompetencies/coursecompetencies.html   |  2 +-
 src/addons/competency/pages/plan/plan.html       |  2 +-
 .../competency/pages/planlist/planlist.html      |  2 +-
 .../conversation-info/conversation-info.html     |  2 +-
 .../messages/pages/contacts-35/contacts.html     |  2 +-
 src/addons/messages/pages/contacts/contacts.html |  4 ++--
 .../pages/discussions-35/discussions.html        |  6 +++---
 .../group-conversations/group-conversations.html | 16 ++++++++--------
 src/addons/messages/pages/search/search.html     |  2 +-
 .../components/index/addon-mod-assign-index.html |  3 ++-
 .../submission/addon-mod-assign-submission.html  |  2 +-
 .../pages/submission-list/submission-list.html   |  2 +-
 .../addon-mod-assign-submission-comments.html    |  2 +-
 .../addon-mod-assign-submission-file.html        |  2 +-
 .../addon-mod-assign-submission-onlinetext.html  |  2 +-
 .../bigbluebuttonbn/components/index/index.html  |  4 ++--
 .../components/index/addon-mod-book-index.html   |  2 +-
 src/addons/mod/book/components/toc/toc.html      |  2 +-
 .../components/index/addon-mod-choice-index.html |  2 +-
 .../data/components/actionsmenu/actionsmenu.html |  2 +-
 .../components/index/addon-mod-data-index.html   |  4 ++--
 .../index/addon-mod-feedback-index.html          |  2 +-
 .../mod/feedback/pages/attempts/attempts.html    |  4 ++--
 .../components/index/addon-mod-folder-index.html |  2 +-
 .../discussion-options-menu.html                 | 12 ++++++------
 src/addons/mod/forum/components/index/index.html |  2 +-
 .../post-options-menu/post-options-menu.html     |  6 +++---
 src/addons/mod/forum/components/post/post.html   |  2 +-
 .../sort-order-selector/sort-order-selector.html |  2 +-
 .../pages/new-discussion/new-discussion.html     |  2 +-
 .../index/addon-mod-glossary-index.html          |  4 ++--
 .../pages/user-attempts/user-attempts.html       |  6 +++---
 .../pages/users-attempts/users-attempts.html     |  4 ++--
 .../components/index/addon-mod-imscp-index.html  |  2 +-
 src/addons/mod/imscp/components/toc/toc.html     |  2 +-
 .../components/index/addon-mod-lesson-index.html |  2 +-
 .../lesson/components/menu-modal/menu-modal.html |  2 +-
 src/addons/mod/lesson/pages/player/player.html   |  2 +-
 .../components/index/addon-mod-quiz-index.html   |  2 +-
 .../navigation-modal/navigation-modal.html       |  2 +-
 .../components/index/addon-mod-scorm-index.html  |  2 +-
 src/addons/mod/wiki/components/map/map.html      |  4 ++--
 .../addon-mod-wiki-subwiki-picker.html           |  2 +-
 .../index/addon-mod-workshop-index.html          |  4 ++--
 .../mod/workshop/components/phase/phase.html     |  4 ++--
 src/addons/privatefiles/pages/index/index.html   |  3 ++-
 .../pages/course-storage/course-storage.html     |  2 +-
 .../pages/courses-storage/courses-storage.html   |  2 +-
 src/core/components/context-menu/context-menu.ts |  3 +--
 .../context-menu/core-context-menu-popover.html  |  2 +-
 src/core/components/file/core-file.html          |  2 +-
 .../components/local-file/core-local-file.html   |  2 +-
 .../components/tabs-outlet/core-tabs-outlet.html |  2 +-
 src/core/components/tabs/tab.ts                  |  2 +-
 .../only-title-block/core-block-only-title.html  |  2 +-
 .../core-block-pre-rendered.html                 |  2 +-
 .../choose-site-modal/choose-site-modal.html     |  2 +-
 .../components/course-index/course-index.html    |  4 ++--
 .../module-summary/module-summary.html           |  2 +-
 .../components/module/core-course-module.html    |  2 +-
 .../tag-area/core-course-tag-area.html           |  2 +-
 .../pages/course-summary/course-summary.html     |  6 +++---
 .../core-courses-course-options-menu.html        | 12 ++++++------
 .../courses/pages/categories/categories.html     |  2 +-
 .../features/grades/pages/courses/courses.html   |  2 +-
 .../login/components/site-help/site-help.html    |  4 ++--
 src/core/features/login/pages/site/site.html     |  4 ++--
 .../mainmenu/components/user-menu/user-menu.html | 13 +++++++------
 src/core/features/mainmenu/pages/more/more.html  | 10 +++++-----
 .../set-reminder-menu/set-reminder-menu.html     |  6 +++---
 .../components/search-box/core-search-box.html   |  2 +-
 .../features/settings/pages/about/about.html     | 12 ++++++------
 .../settings/pages/deviceinfo/deviceinfo.html    |  2 +-
 .../features/settings/pages/index/index.html     |  4 ++--
 .../settings/pages/licenses/licenses.html        |  2 +-
 .../sharedfiles/components/list/list.html        |  2 +-
 .../core-siteplugins-only-title-block.html       |  2 +-
 src/core/features/tag/pages/index/index.html     |  2 +-
 .../user/pages/participants/participants.html    |  2 +-
 .../features/user/pages/profile/profile.html     |  4 ++--
 92 files changed, 152 insertions(+), 150 deletions(-)

diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html
index 8b872cbea..d91a5e0e8 100644
--- a/src/addons/badges/pages/user-badges/user-badges.html
+++ b/src/addons/badges/pages/user-badges/user-badges.html
@@ -19,7 +19,7 @@
 
             <ion-list *ngIf="!badges.empty" class="ion-no-margin">
                 <ion-item button class="ion-text-wrap" *ngFor="let badge of badges.items" [attr.aria-label]="badge.name"
-                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" detail="true">
+                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" [detail]="true">
                     <ion-avatar slot="start">
                         <img [src]="badge.badgeurl" [alt]="badge.name" core-external-content>
                     </ion-avatar>
diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index b4f800003..98aebcd59 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -1,10 +1,10 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded">
-    <ion-item class="ion-text-wrap" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
+    <ion-item class="ion-text-wrap" *ngFor="let entry of entries" [detail]="true" button (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.iconModName" [showAlt]="false">
         </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 90adc25e6..176c08c90 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
     </ion-label>
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index d4b28ea36..66e1245d7 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
     </ion-label>
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index 2b185a878..9d157d6d1 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
     </ion-label>
@@ -14,7 +14,7 @@
             <div class="safe-area-pseudo-padding-start"></div>
             <div *ngFor="let item of items" class="core-horizontal-scroll-item">
                 <ion-card>
-                    <ion-item class="core-course-module-handler ion-text-wrap" detail="false" (click)="action($event, item)" button>
+                    <ion-item class="core-course-module-handler ion-text-wrap" [detail]="false" (click)="action($event, item)" button>
                         <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl" [modname]="item.modname"
                             [componentId]="item.cmid" [showAlt]="false" [purpose]="item.purpose">
                         </core-mod-icon>
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index 11bc7d2b8..4b6d5b6ba 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 88e7fdfce..7d297b771 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
     </ion-label>
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
index 4428d0f64..d84981b96 100644
--- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html
@@ -14,7 +14,7 @@
         </ion-label>
     </ion-item>
     <ng-container *ngFor="let event of dayEvents.events">
-        <ion-item class="addon-block-timeline-activity" detail="false" (click)="action($event, event.url)" [attr.aria-label]="event.name"
+        <ion-item class="addon-block-timeline-activity" [detail]="false" (click)="action($event, event.url)" [attr.aria-label]="event.name"
             button lines="full">
             <ion-label>
                 <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding">
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index 92d911286..b20b7952d 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     </ion-label>
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index fb9ffa77c..ff2f5d39b 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -65,7 +65,7 @@
                     <core-file *ngFor="let file of entry.attachmentfiles" [file]="file" [component]="this.component"
                         [componentId]="entry.id">
                     </core-file>
-                    <ion-item *ngIf="entry.uniquehash" [href]="entry.uniquehash" core-link detail="true">
+                    <ion-item *ngIf="entry.uniquehash" [href]="entry.uniquehash" core-link [detail]="true">
                         <ion-label>{{ 'addon.blog.linktooriginalentry' | translate }}</ion-label>
                     </ion-item>
                 </ion-card-content>
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 494a78e42..81a83d325 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -72,7 +72,7 @@
                     <p>{{ 'addon.calendar.type' + event.formattedType | translate }}</p>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true" detail="true">
+            <ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true" [detail]="true">
                 <ion-label>
                     <p class="item-heading">{{ 'core.course' | translate}}</p>
                     <p>
diff --git a/src/addons/competency/pages/competencies/competencies.html b/src/addons/competency/pages/competencies/competencies.html
index 72793a1db..33b3afe43 100644
--- a/src/addons/competency/pages/competencies/competencies.html
+++ b/src/addons/competency/pages/competencies/competencies.html
@@ -20,7 +20,7 @@
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngFor="let competency of competencies.items"
                     [attr.aria-label]="competency.competency.shortname" (click)="competencies.select(competency)"
-                    [attr.aria-current]="competencies.getItemAriaCurrent(competency)" button detail="true">
+                    [attr.aria-current]="competencies.getItemAriaCurrent(competency)" button [detail]="true">
                     <ion-label>
                         <p class="item-heading">
                             <core-format-text [text]="competency.competency.shortname" [contextLevel]="contextLevel"
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index f4afee0b4..5d5369b94 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -65,7 +65,7 @@
         <div *ngIf="competencies.loaded">
             <ion-card *ngFor="let competency of competencies.items">
                 <ion-item class="ion-text-wrap" (click)="competencies.select(competency)"
-                    [attr.aria-label]="competency.competency.shortname" detail="true" button>
+                    [attr.aria-label]="competency.competency.shortname" [detail]="true" button>
                     <ion-label>
                         <p class="item-heading">
                             <core-format-text [text]="competency.competency.shortname" contextLevel="course" [contextInstanceId]="courseId">
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index 5090642c4..dbe729263 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -81,7 +81,7 @@
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let competency of competencies.items" (click)="competencies.select(competency)"
-                    [attr.aria-label]="competency.competency.shortname" detail="true" button>
+                    [attr.aria-label]="competency.competency.shortname" [detail]="true" button>
                     <ion-label>
                         <p class="item-heading">
                             <core-format-text [text]="competency.competency.shortname" contextLevel="user"
diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html
index c1959b4a9..f980c458b 100644
--- a/src/addons/competency/pages/planlist/planlist.html
+++ b/src/addons/competency/pages/planlist/planlist.html
@@ -19,7 +19,7 @@
             </core-empty-box>
             <ion-list *ngIf="!plans.empty" class="ion-no-margin">
                 <ion-item class="ion-text-wrap" *ngFor="let plan of plans.items" [attr.aria-label]="plan.name" (click)="plans.select(plan)"
-                    [attr.aria-current]="plans.getItemAriaCurrent(plan)" button detail="true">
+                    [attr.aria-current]="plans.getItemAriaCurrent(plan)" button [detail]="true">
                     <ion-label>
                         <p class="item-heading">
                             <core-format-text [text]="plan.name" contextLevel="user" [contextInstanceId]="plan.userid">
diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html
index 3a4fb4af7..8d53b3dce 100644
--- a/src/addons/messages/components/conversation-info/conversation-info.html
+++ b/src/addons/messages/components/conversation-info/conversation-info.html
@@ -35,7 +35,7 @@
         </ion-item>
 
         <ion-item class="ion-text-wrap addon-messages-conversation-item" *ngFor="let member of members" (click)="closeModal(member.id)"
-            detail="true" button>
+            [detail]="true" button>
             <core-user-avatar [user]="member" [linkProfile]="false" [checkOnline]="member.showonlinestatus" slot="start">
             </core-user-avatar>
             <ion-label>
diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html
index 314a3b0d0..e79d83c11 100644
--- a/src/addons/messages/pages/contacts-35/contacts.html
+++ b/src/addons/messages/pages/contacts-35/contacts.html
@@ -42,7 +42,7 @@
                         <!-- Don't show deleted users -->
                         <ion-item class="ion-text-wrap addon-messages-conversation-item"
                             *ngIf="contact.profileimageurl || contact.profileimageurlsmall" [attr.aria-label]="contact.fullname"
-                            (click)="gotoDiscussion(contact.id)" detail="true" button
+                            (click)="gotoDiscussion(contact.id)" [detail]="true" button
                             [attr.aria-current]="contact.id == discussionUserId ? 'page' : 'false'">
                             <core-user-avatar [user]="contact" slot="start" [checkOnline]="contact.showonlinestatus"></core-user-avatar>
                             <ion-label>
diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html
index c049589e0..1ac693568 100644
--- a/src/addons/messages/pages/contacts/contacts.html
+++ b/src/addons/messages/pages/contacts/contacts.html
@@ -28,7 +28,7 @@
                     <core-loading [hideUntil]="confirmedLoaded">
                         <ion-list class="ion-no-margin" *ngIf="confirmedContacts.length">
                             <ion-item class="ion-text-wrap addon-messages-conversation-item" (click)="selectUser(contact.id)" button
-                                *ngFor="let contact of confirmedContacts" [attr.aria-label]="contact.fullname" detail="true"
+                                *ngFor="let contact of confirmedContacts" [attr.aria-label]="contact.fullname" [detail]="true"
                                 [attr.aria-current]="contact.id == selectedUserId ? 'page' : 'false'">
                                 <core-user-avatar slot="start" [user]="contact" [checkOnline]="contact.showonlinestatus"
                                     [linkProfile]="false">
@@ -67,7 +67,7 @@
                         <ion-list class="ion-no-margin" *ngIf="requests.length">
                             <ion-item class="ion-text-wrap addon-messages-conversation-item" *ngFor="let request of requests"
                                 [attr.aria-label]="request.fullname" (click)="selectUser(request.id)" button
-                                [attr.aria-current]="request.id == selectedUserId ? 'page' : 'false'" detail="true">
+                                [attr.aria-current]="request.id == selectedUserId ? 'page' : 'false'" [detail]="true">
                                 <core-user-avatar slot="start" [user]="request" [linkProfile]="false"></core-user-avatar>
                                 <ion-label>
                                     <core-format-text [text]="request.fullname" contextLevel="system" [contextInstanceId]="0">
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index bb3368ca3..a95d142d8 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -28,7 +28,7 @@
             <ion-list class="ion-no-margin">
 
                 <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()"
-                    [attr.aria-label]="'addon.messages.contacts' | translate" detail="true" button>
+                    [attr.aria-label]="'addon.messages.contacts' | translate" [detail]="true" button>
                     <ion-icon name="fas-address-book" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <p class="item-heading">{{ 'addon.messages.contacts' | translate }}</p>
@@ -46,7 +46,7 @@
                     </ion-item-divider>
                     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let result of search.results" button
                         [attr.aria-label]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)"
-                        [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'" detail="false">
+                        [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'" [detail]="false">
                         <core-user-avatar [user]="result" slot="start" [checkOnline]="result.showonlinestatus"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ result.fullname }}</p>
@@ -60,7 +60,7 @@
                 <ng-container *ngIf="!search.showResults">
                     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let discussion of discussions" button
                         [attr.aria-label]="discussion.fullname" (click)="gotoDiscussion(discussion.message!.user)"
-                        [attr.aria-current]="discussion.message!.user == discussionUserId ? 'page' : 'false'" detail="false">
+                        [attr.aria-current]="discussion.message!.user == discussionUserId ? 'page' : 'false'" [detail]="false">
                         <core-user-avatar [user]="discussion" slot="start" checkOnline="false"></core-user-avatar>
                         <ion-label>
                             <div class="flex-row ion-justify-content-between">
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index 9cca75e2d..eb9e0fdd7 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -27,7 +27,7 @@
 
         <core-loading [hideUntil]="loaded" [message]="loadingMessage">
             <ion-list>
-                <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()" detail="true" button>
+                <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()" [detail]="true" button>
                     <ion-icon name="fas-address-book" slot="start" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <h2>{{ 'addon.messages.contacts' | translate }}</h2>
@@ -38,10 +38,10 @@
                     </span>
                 </ion-item>
                 <!-- Favourite conversations. -->
-                <ion-item button class="ion-text-wrap divider" (click)="toggle(favourites)" sticky="true"
+                <ion-item button class="ion-text-wrap divider" (click)="toggle(favourites)"
                     [attr.aria-label]="(favourites.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="favourites.expanded" aria-controls="addon-messages-groupconversations-favourite" role="heading"
-                    detail="false">
+                    [detail]="false">
                     <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                         [class.expandable-status-icon-expanded]="favourites.expanded">
                     </ion-icon>
@@ -73,9 +73,9 @@
                 </ion-item>
 
                 <!-- Group conversations. -->
-                <ion-item button class="divider ion-text-wrap" (click)="toggle(group)" sticky="true"
+                <ion-item button class="divider ion-text-wrap" (click)="toggle(group)"
                     [attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate" [attr.aria-expanded]="group.expanded"
-                    aria-controls="addon-messages-groupconversations-group" role="heading" detail="false">
+                    aria-controls="addon-messages-groupconversations-group" role="heading" [detail]="false">
                     <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                         [class.expandable-status-icon-expanded]="group.expanded">
                     </ion-icon>
@@ -106,10 +106,10 @@
                     </ion-label>
                 </ion-item>
 
-                <ion-item button class="divider ion-text-wrap" (click)="toggle(individual)" sticky="true"
+                <ion-item button class="divider ion-text-wrap" (click)="toggle(individual)"
                     [attr.aria-label]="(individual.expanded ? 'core.collapse' : 'core.expand') | translate"
                     [attr.aria-expanded]="individual.expanded" aria-controls="addon-messages-groupconversations-individual" role="heading"
-                    detail="false">
+                    [detail]="false">
                     <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                         [class.expandable-status-icon-expanded]="individual.expanded">
                     </ion-icon>
@@ -147,7 +147,7 @@
 
 <!-- Template to render a list of conversations. -->
 <ng-template #conversationsTemplate let-conversations="conversations">
-    <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let conversation of conversations" button detail="false"
+    <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let conversation of conversations" button [detail]="false"
         (click)="gotoConversation(conversation.id, conversation.userid)"
         [attr.aria-current]="((conversation.id &&
             conversation.id == selectedConversationId) || (conversation.userid && conversation.userid == selectedUserId)) ? 'page': 'false'"
diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html
index f55f879bd..72cc82dfe 100644
--- a/src/addons/messages/pages/search/search.html
+++ b/src/addons/messages/pages/search/search.html
@@ -45,7 +45,7 @@
 
         <!-- List of results -->
         <ion-item class="addon-message-discussion ion-text-wrap" *ngFor="let result of item.results" [attr.aria-label]="result.fullname"
-            (click)="openConversation(result)" [attr.aria-current]="result == selectedResult ? 'page' : 'false'" detail="true" button>
+            (click)="openConversation(result)" [attr.aria-current]="result == selectedResult ? 'page' : 'false'" [detail]="true" button>
             <core-user-avatar slot="start" [user]="result" [checkOnline]="true" [linkProfile]="false"></core-user-avatar>
             <ion-label>
                 <p class="item-heading">
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index e7e04b991..3f65bb593 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -46,7 +46,8 @@
             </ion-item>
 
             <!-- Summary of all submissions. -->
-            <ion-item class="ion-text-wrap" *ngIf="summary && summary.participantcount" (click)="goToSubmissionList()" detail="true" button>
+            <ion-item class="ion-text-wrap" *ngIf="summary && summary.participantcount" (click)="goToSubmissionList()" [detail]="true"
+                button>
                 <ion-label>
                     <p class="item-heading" *ngIf="assign.teamsubmission">{{ 'addon.mod_assign.numberofteams' | translate }}</p>
                     <p class="item-heading" *ngIf="!assign.teamsubmission">{{ 'addon.mod_assign.numberofparticipants' | translate }}</p>
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index ac1208cd8..475acc689 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -393,7 +393,7 @@
 
                     <!-- Data about the grader (teacher who graded). -->
                     <ion-item class="ion-text-wrap" *ngIf="grader" core-user-link [userId]="grader!.id" [courseId]="courseId"
-                        [attr.aria-label]="grader!.fullname" detail="true">
+                        [attr.aria-label]="grader!.fullname" [detail]="true">
                         <core-user-avatar [user]="grader" slot="start" [linkProfile]="false"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ 'addon.mod_assign.gradedby' | translate }}</p>
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 61399abfc..dfc608421 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -28,7 +28,7 @@
                 <!-- List of submissions. -->
                 <ng-container *ngFor="let submission of submissions.items">
                     <ion-item class="ion-text-wrap" (click)="submissions.select(submission)" button
-                        [attr.aria-current]="submissions.getItemAriaCurrent(submission)" detail="true">
+                        [attr.aria-current]="submissions.getItemAriaCurrent(submission)" [detail]="true">
                         <core-user-avatar [user]="submission" [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading" *ngIf="submission.userfullname">{{submission.userfullname}}</p>
diff --git a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
index 157d9f527..912151506 100644
--- a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
+++ b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
@@ -1,4 +1,4 @@
-<ion-item *ngIf="commentsEnabled" class="ion-text-wrap" (click)="showComments($event)" detail="true" button>
+<ion-item *ngIf="commentsEnabled" class="ion-text-wrap" (click)="showComments($event)" [detail]="true" button>
     <ion-label>
         <h2>{{plugin.name}}</h2>
         <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments" [itemId]="submission.id"
diff --git a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
index 316e4df80..9dff2e4d5 100644
--- a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
+++ b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
@@ -10,7 +10,7 @@
 
 <!-- Edit -->
 <div *ngIf="edit">
-    <ion-item-divider class="ion-text-wrap" sticky="true">
+    <ion-item-divider class="ion-text-wrap" [sticky]="true">
         <ion-label>
             <h2>{{ plugin.name }}</h2>
         </ion-label>
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index 43f6b2009..b417a1286 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -13,7 +13,7 @@
 
 <!-- Edit -->
 <div *ngIf="edit && loaded">
-    <ion-item-divider class="ion-text-wrap" sticky="true">
+    <ion-item-divider class="ion-text-wrap" [sticky]="true">
         <ion-label>
             <h2>{{ plugin.name }}</h2>
         </ion-label>
diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html
index 0b2dccaf4..bb1d82c25 100644
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@@ -92,7 +92,7 @@
         </ion-item>
         <ng-container *ngFor="let recording of recordings">
             <ion-item button class="addon-mod_bbb-recording-title" [attr.aria-expanded]="recording.expanded" (click)="toggle(recording)"
-                [attr.aria-label]="(recording.expanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                [attr.aria-label]="(recording.expanded ? 'core.collapse' : 'core.expand') | translate" [detail]="false">
                 <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                     [class.expandable-status-icon-expanded]="recording.expanded">
                 </ion-icon>
@@ -108,7 +108,7 @@
                             <p class="item-heading">{{ recording.playbackLabel }}</p>
                         </ion-label>
                     </ion-item>
-                    <ion-item *ngFor="let playback of recording.playbacks" button (click)="openPlayback($event, playback)" detail="false"
+                    <ion-item *ngFor="let playback of recording.playbacks" button (click)="openPlayback($event, playback)" [detail]="false"
                         class="ion-text-wrap addon-mod_bbb-recording-playback-item">
                         <ion-label>
                             <p>{{ playback.name }}</p>
diff --git a/src/addons/mod/book/components/index/addon-mod-book-index.html b/src/addons/mod/book/components/index/addon-mod-book-index.html
index 89b4c085b..4d62979c4 100644
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@@ -20,7 +20,7 @@
             </ion-label>
         </ion-item>
 
-        <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" [class.item-dimmed]="chapter.hidden" button detail="true"
+        <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" [class.item-dimmed]="chapter.hidden" button [detail]="true"
             (click)="openBook(chapter.id)">
             <ion-label>
                 <p [class.ion-padding-start]="addPadding && chapter.level == 1 ? true : null">
diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html
index 7d63bbfea..f633ab0ff 100644
--- a/src/addons/mod/book/components/toc/toc.html
+++ b/src/addons/mod/book/components/toc/toc.html
@@ -14,7 +14,7 @@
     <nav>
         <ion-list>
             <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)"
-                [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button [class.item-dimmed]="chapter.hidden" detail="false">
+                [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button [class.item-dimmed]="chapter.hidden" [detail]="false">
                 <ion-label>
                     <p [class.ion-padding-start]="addPadding && chapter.level == 1 ? true : null" class="item-heading">
                         <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}} </span>
diff --git a/src/addons/mod/choice/components/index/addon-mod-choice-index.html b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
index a7279c118..08e56bc8a 100644
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@@ -89,7 +89,7 @@
                 <ion-col *ngIf="choice.publish && results" size="12" size-lg="7">
                     <ion-item-group *ngFor="let result of results">
                         <ion-item [button]="result.numberofuser > 0" class="divider ion-text-wrap" (click)="toggle(result)"
-                            [attr.aria-label]="(result.expanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                            [attr.aria-label]="(result.expanded ? 'core.collapse' : 'core.expand') | translate" [detail]="false">
                             <ion-icon [name]="result.numberofuser > 0 ? 'fas-chevron-right' : ''" flip-rtl slot="start" aria-hidden="true"
                                 class="expandable-status-icon" [class.expandable-status-icon-expanded]="result.expanded">
                             </ion-icon>
diff --git a/src/addons/mod/data/components/actionsmenu/actionsmenu.html b/src/addons/mod/data/components/actionsmenu/actionsmenu.html
index 242b68f1c..eadbe7c6a 100644
--- a/src/addons/mod/data/components/actionsmenu/actionsmenu.html
+++ b/src/addons/mod/data/components/actionsmenu/actionsmenu.html
@@ -1,6 +1,6 @@
 <ion-content>
     <ion-list>
-        <ion-item button class="ion-text-wrap" (click)="onItemClick(item)" *ngFor="let item of items" detail="false"
+        <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>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index f4c96dc7c..841034633 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -63,14 +63,14 @@
 
     <!-- Reset search. -->
     <ng-container *ngIf="search.searching && !isEmpty">
-        <ion-item (click)="searchReset($event)" button detail="false" *ngIf="!foundRecordsTranslationData">
+        <ion-item (click)="searchReset($event)" button [detail]="false" *ngIf="!foundRecordsTranslationData">
             <ion-label color="info">
                 {{ 'addon.mod_data.resetsettings' | translate}}
             </ion-label>
         </ion-item>
 
         <ion-card class="core-success-card" *ngIf="foundRecordsTranslationData">
-            <ion-item (click)="searchReset($event)" button detail="false">
+            <ion-item (click)="searchReset($event)" button [detail]="false">
                 <ion-label>
                     <p [innerHTML]="'addon.mod_data.foundrecords' | translate:{$a: foundRecordsTranslationData}"></p>
                 </ion-label>
diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
index 3396a80d2..fbe9ce761 100644
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -75,7 +75,7 @@
                 </span>
             </ion-badge>
         </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="!access.isanonymous && access.canviewreports" (click)="openNonRespondents()" detail="true"
+        <ion-item class="ion-text-wrap" *ngIf="!access.isanonymous && access.canviewreports" (click)="openNonRespondents()" [detail]="true"
             button>
             <ion-label>
                 <p class="item-heading">{{ 'addon.mod_feedback.show_nonrespondents' | translate }}</p>
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.html b/src/addons/mod/feedback/pages/attempts/attempts.html
index 0c97936e9..39cec4859 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.html
+++ b/src/addons/mod/feedback/pages/attempts/attempts.html
@@ -25,7 +25,7 @@
                             <h2>{{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: identifiableAttemptsTotal } }}</h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of identifiableAttempts" class="ion-text-wrap" button detail="true"
+                    <ion-item *ngFor="let attempt of identifiableAttempts" class="ion-text-wrap" button [detail]="true"
                         (click)="attempts?.select(attempt)" [attr.aria-current]="attempts?.getItemAriaCurrent(attempt)">
                         <core-user-avatar [user]="attempt" [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
@@ -41,7 +41,7 @@
                             <h2>{{ 'addon.mod_feedback.anonymous_entries' | translate : {$a: anonymousAttemptsTotal } }}</h2>
                         </ion-label>
                     </ion-item-divider>
-                    <ion-item *ngFor="let attempt of anonymousAttempts" class="ion-text-wrap" button detail="true"
+                    <ion-item *ngFor="let attempt of anonymousAttempts" class="ion-text-wrap" button [detail]="true"
                         (click)="attempts?.select(attempt)" [attr.aria-current]="attempts?.getItemAriaCurrent(attempt)">
                         <core-user-avatar [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 3d3d643ed..a39505780 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -15,7 +15,7 @@
 
     <ion-list *ngIf="contents && (contents.files.length + contents.folders.length > 0)">
         <ng-container *ngFor="let folder of contents.folders">
-            <ion-item class="ion-text-wrap item-file item-directory" (click)="openFolder(folder)" detail="true" button>
+            <ion-item class="ion-text-wrap item-file item-directory" (click)="openFolder(folder)" [detail]="true" button>
                 <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{folder.filename}}</p>
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 4736dcd70..e5ef8a551 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,38 @@
 <ion-content>
     <ion-list>
-        <ion-item button class="ion-text-wrap" (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked" detail="false">
+        <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-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-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-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">
+            [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">
+            [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>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 6e926f3a1..46e3f57ee 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -76,7 +76,7 @@
                 <p>{{ 'addon.mod_forum.errorloadingsortingorderdetails' | translate }}</p>
             </core-empty-box>
 
-            <ion-item *ngFor="let discussion of discussionsItems" class="addon-mod-forum-discussion" detail="true"
+            <ion-item *ngFor="let discussion of discussionsItems" class="addon-mod-forum-discussion" [detail]="true"
                 [lines]="discussion.groupname && 'none'" [attr.aria-current]="discussions?.getItemAriaCurrent(discussion)"
                 (click)="discussions?.select(discussion)" button>
                 <ion-label>
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 c4362e55f..dcf9398b7 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,20 +1,20 @@
 <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-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-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"
+            <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>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index df950ecdd..db3f5fb5d 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -123,7 +123,7 @@
             <ion-checkbox slot="end" [(ngModel)]="formData.isprivatereply" name="isprivatereply"></ion-checkbox>
         </ion-item>
         <ng-container *ngIf="forum.id && forum.maxattachments > 0">
-            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
+            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" [detail]="false" [attr.aria-expanded]="advanced"
                 [attr.aria-controls]="'addon-forum-reply-edit-form-advanced-' + uniqueId"
                 [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate">
                 <ion-icon *ngIf="!advanced" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
diff --git a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
index 6c8aa3b07..5405829dd 100644
--- a/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
+++ b/src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
@@ -13,7 +13,7 @@
 <ion-content>
     <ion-list id="addon-mod-forum-sort-selector" role="listbox" aria-labelledby="addon-mod-forum-sort-order-label">
         <ng-container *ngFor="let sortOrder of sortOrders">
-            <ion-item class="ion-text-wrap" detail="false" role="combobox"
+            <ion-item class="ion-text-wrap" [detail]="false" role="combobox"
                 [attr.aria-current]="selected == sortOrder.value ? 'page' : 'false'" [attr.aria-label]="sortOrder.label | translate"
                 (click)="selectSortOrder(sortOrder)" button aria-haspopup="dialog">
                 <ion-label>
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
index ba0d4359d..e13a19bf9 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html
@@ -31,7 +31,7 @@
                     (contentChanged)="onMessageChange($event)">
                 </core-rich-text-editor>
             </ion-item>
-            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" detail="false" [attr.aria-expanded]="advanced"
+            <ion-item button class="divider ion-text-wrap" (click)="toggleAdvanced()" [detail]="false" [attr.aria-expanded]="advanced"
                 [attr.aria-label]="(advanced ? 'core.hideadvanced' : 'core.showadvanced') | translate" role="heading"
                 aria-controls="addon-mod-forum-new-discussion-advanced">
                 <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 9da82ceb1..ce3e456d5 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -37,7 +37,7 @@
                     <h2 class="big">{{ 'addon.mod_glossary.entriestobesynced' | translate }}</h2>
                 </ion-label>
             </ion-item-divider>
-            <ion-item *ngFor="let entry of entries.offlineEntries" (click)="entries.select(entry)" button detail="false"
+            <ion-item *ngFor="let entry of entries.offlineEntries" (click)="entries.select(entry)" button [detail]="false"
                 [attr.aria-current]="entries.getItemAriaCurrent(entry)">
                 <ion-label>
                     <div class="addon-mod-glossary-index--offline-entry">
@@ -58,7 +58,7 @@
                     </ion-label>
                 </ion-item-divider>
 
-                <ion-item button (click)="entries.select(entry)" [attr.aria-current]="entries.getItemAriaCurrent(entry)" detail="false">
+                <ion-item button (click)="entries.select(entry)" [attr.aria-current]="entries.getItemAriaCurrent(entry)" [detail]="false">
                     <ion-label>
                         <core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary!.coursemodule"
                             [courseId]="courseId">
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index b174ad52c..2570a5a1a 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -19,7 +19,7 @@
     <core-loading [hideUntil]="loaded">
         <!-- User viewed. -->
         <ion-item class="ion-text-wrap" *ngIf="user && !isCurrentUser" core-user-link [userId]="user.id" [courseId]="courseId"
-            [attr.aria-label]="user.fullname" button detail="true">
+            [attr.aria-label]="user.fullname" button [detail]="true">
             <core-user-avatar [user]="user" slot="start" [courseId]="courseId" [linkProfile]="false"></core-user-avatar>
             <ion-label>
                 <h2>{{ user.fullname }}</h2>
@@ -65,7 +65,7 @@
 <!-- Template to render a list of conversations. -->
 <ng-template #attemptsTemplate let-attempts="attempts">
     <!-- "Header" of the table -->
-    <ion-item class="addon-mod_h5pactivity-table-header hide-detail" detail="true">
+    <ion-item class="addon-mod_h5pactivity-table-header hide-detail" [detail]="true">
         <ion-label>
             <ion-row class="ion-align-items-center">
                 <ion-col class="ion-text-center">#</ion-col>
@@ -80,7 +80,7 @@
     </ion-item>
 
     <!-- List of attempts. -->
-    <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-row" *ngFor="let attempt of attempts" button detail="true"
+    <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-row" *ngFor="let attempt of attempts" button [detail]="true"
         [attr.aria-label]="'addon.mod_h5pactivity.viewattempt' | translate:{$a: attempt.attempt}" (click)="openAttempt(attempt)">
 
         <ion-label>
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
index 2610c501e..8d3118bf5 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.html
@@ -19,7 +19,7 @@
     <core-loading [hideUntil]="loaded">
         <ion-list *ngIf="users.length">
             <!-- "Header" of the table -->
-            <ion-item class="addon-mod_h5pactivity-table-header hide-detail font-bold" detail="true">
+            <ion-item class="addon-mod_h5pactivity-table-header hide-detail font-bold" [detail]="true">
                 <ion-label>
                     <ion-row class="ion-align-items-center">
                         <ion-col class="ion-text-center" size="4">{{ 'core.user' | translate }}</ion-col>
@@ -31,7 +31,7 @@
             </ion-item>
 
             <!-- List of users. -->
-            <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-row" *ngFor="let user of users" detail="true"
+            <ion-item class="ion-text-wrap addon-mod_h5pactivity-table-row" *ngFor="let user of users" [detail]="true"
                 [attr.aria-label]="'addon.mod_h5pactivity.review_user_attempts' | translate:{$a: user.attempts.length}"
                 (click)="openUser(user)" [class.hide-detail]="!user.attempts.length" [button]="user.attempts.length > 0">
 
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index ba70af882..f483981b8 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -20,7 +20,7 @@
             </ion-label>
         </ion-item>
 
-        <ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openImscp(item.href)" button detail="true">
+        <ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openImscp(item.href)" button [detail]="true">
             <ion-label [class.core-bold]="!item.href">
                 <p>
                     <span class="ion-padding-start" *ngFor="let i of getNumberForPadding(item.level)"></span>
diff --git a/src/addons/mod/imscp/components/toc/toc.html b/src/addons/mod/imscp/components/toc/toc.html
index a8400e7ba..8b69fcc77 100644
--- a/src/addons/mod/imscp/components/toc/toc.html
+++ b/src/addons/mod/imscp/components/toc/toc.html
@@ -14,7 +14,7 @@
     <nav>
         <ion-list>
             <ion-item *ngFor="let item of items" (click)="loadItem(item.href)"
-                [attr.aria-current]="selected == item.href ? 'page' : 'false'" button detail="false">
+                [attr.aria-current]="selected == item.href ? 'page' : 'false'" button [detail]="false">
                 <ion-label [class.core-bold]="!item.href">
                     <p class="item-heading">
                         <span class="ion-padding-start" *ngFor="let i of getNumberForPadding(item.level)"></span>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 4b4a24ab7..a0eee6120 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -184,7 +184,7 @@
                         </ion-card-header>
 
                         <ion-item class="ion-text-wrap" *ngFor="let student of overview.students" button (click)="openRetake(student.id)"
-                            detail="true">
+                            [detail]="true">
                             <core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId">
                             </core-user-avatar>
                             <ion-label>
diff --git a/src/addons/mod/lesson/components/menu-modal/menu-modal.html b/src/addons/mod/lesson/components/menu-modal/menu-modal.html
index 541e03064..bbdd4f623 100644
--- a/src/addons/mod/lesson/components/menu-modal/menu-modal.html
+++ b/src/addons/mod/lesson/components/menu-modal/menu-modal.html
@@ -41,7 +41,7 @@
                     <ng-container *ngFor="let page of pageInstance.lessonPages">
                         <ion-item class="ion-text-wrap" *ngIf="page.display && page.displayinmenublock" (click)="loadPage(page.id)"
                             [attr.aria-current]="!pageInstance.eolData && pageInstance.currentPage == page.id ? 'page' : 'false'" button
-                            detail="true">
+                            [detail]="true">
                             <ion-label>
                                 <core-format-text [text]="page.title" contextLevel="module" [courseId]="pageInstance.courseId"
                                     [contextInstanceId]="pageInstance.lesson?.coursemodule">
diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html
index a351a1109..88d8a8784 100644
--- a/src/addons/mod/lesson/pages/player/player.html
+++ b/src/addons/mod/lesson/pages/player/player.html
@@ -5,7 +5,7 @@
         </ion-buttons>
         <ion-title>
             <h1>
-                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId">
+                <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson?.coursemodule" [courseId]="courseId">
                 </core-format-text>
             </h1>
         </ion-title>
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 44e52cd5f..a484ac79e 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -74,7 +74,7 @@
             </ion-item>
             <div role="rowgroup">
                 <!-- List of attempts. -->
-                <ion-item button detail="true" *ngFor="let attempt of attempts" class="ion-text-wrap"
+                <ion-item button [detail]="true" *ngFor="let attempt of attempts" class="ion-text-wrap"
                     [ngClass]='{"addon-mod_quiz-highlighted": attempt.highlightGrade}' [attr.aria-label]="'core.seemoredetail' | translate"
                     (click)="viewAttempt(attempt.id)">
                     <ion-label>
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
index 43d093486..9ed8232ff 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
@@ -15,7 +15,7 @@
         <ion-list>
             <ion-item button class="ion-text-wrap {{question.stateClass}}" *ngFor="let question of navigation"
                 [attr.aria-current]="!summaryShown && currentPage == question.page ? 'page' : 'false'"
-                (click)="loadPage(question.page, question.slot)" detail="false">
+                (click)="loadPage(question.page, question.slot)" [detail]="false">
 
                 <ion-label class="ion-text-wrap">
                     <span *ngIf="question.type !== 'description' && question.questionnumber">
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index 63640e0e2..60b137cb0 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -45,7 +45,7 @@
                         <p slot="end">{{ numAttempts }}</p>
                     </ion-item>
                     <ion-item *ngIf="onlineAttempts.length > 0" button class="divider ion-text-wrap" (click)="toggleGrades()"
-                        [attr.aria-label]="(gradesExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                        [attr.aria-label]="(gradesExpanded ? 'core.collapse' : 'core.expand') | translate" [detail]="false">
                         <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                             [class.expandable-status-icon-expanded]="gradesExpanded">
                         </ion-icon>
diff --git a/src/addons/mod/wiki/components/map/map.html b/src/addons/mod/wiki/components/map/map.html
index e51ddedad..0008a4d31 100644
--- a/src/addons/mod/wiki/components/map/map.html
+++ b/src/addons/mod/wiki/components/map/map.html
@@ -14,7 +14,7 @@
     <nav>
         <ion-list>
             <!-- Go to "home". -->
-            <ion-item class="ion-text-wrap" *ngIf="homeView" (click)="goToWikiHome()" button detail="true">
+            <ion-item class="ion-text-wrap" *ngIf="homeView" (click)="goToWikiHome()" button [detail]="true">
                 <ion-icon name="fas-house" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>{{ 'addon.mod_wiki.gowikihome' | translate }}</ion-label>
             </ion-item>
@@ -25,7 +25,7 @@
                     </ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let page of letter.pages" (click)="goToPage(page)"
-                    [attr.aria-current]="selectedTitle == page.title ? 'page' : 'false'" button detail="false">
+                    [attr.aria-current]="selectedTitle == page.title ? 'page' : 'false'" button [detail]="false">
                     <ion-icon name="fas-house" slot="start" *ngIf="page.firstpage" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
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 4844903d8..42034ae8f 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
@@ -9,7 +9,7 @@
                 </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">
+                [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>
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 18e47a08a..2ce28dfc5 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -14,7 +14,7 @@
     </core-course-module-info>
 
     <ion-card *ngIf="phases && workshop">
-        <ion-item button (click)="viewPhaseInfo()" detail="true">
+        <ion-item button (click)="viewPhaseInfo()" [detail]="true">
             <ion-label>
                 <h2 class="ion-text-wrap">{{ phases[workshop.phase].title }}</h2>
             </ion-label>
@@ -22,7 +22,7 @@
         <ng-container *ngIf="phases && phases[workshop.phase] && phases[workshop.phase].tasks &&
             phases[workshop.phase].tasks.length">
             <ion-item button class="ion-text-wrap" *ngFor="let task of phases[workshop.phase].tasks"
-                [class.item-dimmed]="task.code === 'submit' && !showSubmit" (click)="runTask(task)" detail="false">
+                [class.item-dimmed]="task.code === 'submit' && !showSubmit" (click)="runTask(task)" [detail]="false">
                 <ion-icon slot="start" name="far-circle" *ngIf="task.completed === null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
                 <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed === ''"
diff --git a/src/addons/mod/workshop/components/phase/phase.html b/src/addons/mod/workshop/components/phase/phase.html
index 2635a752a..12a27bef1 100644
--- a/src/addons/mod/workshop/components/phase/phase.html
+++ b/src/addons/mod/workshop/components/phase/phase.html
@@ -21,7 +21,7 @@
                     </p>
                 </ion-label>
             </ion-item-divider>
-            <ion-item class="ion-text-wrap" *ngIf="phase.switchUrl" [href]="phase.switchUrl" detail="false">
+            <ion-item class="ion-text-wrap" *ngIf="phase.switchUrl" [href]="phase.switchUrl" [detail]="false">
                 <ion-icon slot="start" name="fas-right-left" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p>{{ 'addon.mod_workshop.switchphase' + phase.code | translate }}</p>
@@ -30,7 +30,7 @@
             </ion-item>
             <ion-item class="ion-text-wrap" *ngFor="let task of phase.tasks"
                 [class.item-dimmed]="phase.code !== workshopPhase || (task.code === 'submit' && !showSubmit)" (click)="runTask(task)"
-                detail="false" button>
+                [detail]="false" button>
                 <ion-icon slot="start" name="far-circle" *ngIf="task.completed == null"
                     [attr.aria-label]="'addon.mod_workshop.tasktodo' | translate"></ion-icon>
                 <ion-icon slot="start" name="fas-circle-xmark" color="danger" *ngIf="task.completed === ''"
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index 8887aab00..af53f6643 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -37,7 +37,8 @@
         <!-- List of files. -->
         <ion-list *ngIf="files && files.length > 0">
             <ng-container *ngFor="let file of files">
-                <ion-item button *ngIf="file.isdir" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)" detail="true">
+                <ion-item button *ngIf="file.isdir" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)"
+                    [detail]="true">
                     <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                     <ion-label>{{file.filename}}</ion-label>
                 </ion-item>
diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html
index 0c90b2fb4..64caa217d 100644
--- a/src/addons/storagemanager/pages/course-storage/course-storage.html
+++ b/src/addons/storagemanager/pages/course-storage/course-storage.html
@@ -50,7 +50,7 @@
         <ng-container *ngFor="let section of sections">
             <ion-card class="section" *ngIf="section.modules.length > 0">
                 <ion-card-header>
-                    <ion-item [lines]="section.expanded ? 'full' : 'none'" button detail="false" (click)="toggleExpand($event, section)"
+                    <ion-item [lines]="section.expanded ? 'full' : 'none'" button [detail]="false" (click)="toggleExpand($event, section)"
                         [class.core-course-storage-section-expanded]="section.expanded"
                         [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
                         [attr.aria-expanded]="section.expanded" [attr.aria-controls]="'core-course-storage-section-' + section.id">
diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
index b7692ea14..134cc61bc 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html
@@ -43,7 +43,7 @@
                 </ion-button>
             </ion-item>
             <ion-item *ngFor="let course of downloadedCourses" class="course" (click)="openCourse(course.id, course.title)" button
-                detail="true">
+                [detail]="true">
                 <ion-label class="ion-text-wrap">
                     <p class="item-heading">
                         <core-format-text [text]="course.title" contextLevel="course" [contextInstanceId]="course.id" [adaptImg]="false">
diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts
index 6102bc4b6..1f1d679da 100644
--- a/src/core/components/context-menu/context-menu.ts
+++ b/src/core/components/context-menu/context-menu.ts
@@ -31,7 +31,7 @@ import { CoreDirectivesRegistry } from '@singletons/directives-registry';
 })
 export class CoreContextMenuComponent implements OnInit, OnDestroy {
 
-    @Input() icon?: string; // Icon to be shown on the navigation bar. Default: Kebab menu icon.
+    @Input() icon = 'ellipsis-vertical'; // Icon to be shown on the navigation bar. Default: Kebab menu icon.
     @Input() title?: string; // Text to be shown on the top of the popover.
     @Input('aria-label') ariaLabel?: string; // Aria label to be shown on the top of the popover.
 
@@ -68,7 +68,6 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
      * @inheritdoc
      */
     ngOnInit(): void {
-        this.icon = this.icon || 'ellipsis-vertical';
         this.ariaLabel = this.ariaLabel || this.title || Translate.instant('core.displayoptions');
     }
 
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 960de7d6b..bddc16604 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -5,7 +5,7 @@
         </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)"
+            [detail]="!!(item.href && !item.iconAction)" role="menuitem" [button]="!!(item.href && !item.iconAction)"
             [showBrowserWarning]="item.showBrowserWarning">
             <ion-label>
                 <p class="item-heading">
diff --git a/src/core/components/file/core-file.html b/src/core/components/file/core-file.html
index e6e2e729d..59c82403a 100644
--- a/src/core/components/file/core-file.html
+++ b/src/core/components/file/core-file.html
@@ -1,5 +1,5 @@
 <ion-card class="card-file">
-    <ion-item *ngIf="file" button class="ion-text-wrap item-file" (click)="download($event, true)" detail="false">
+    <ion-item *ngIf="file" button class="ion-text-wrap item-file" (click)="download($event, true)" [detail]="false">
         <ion-thumbnail slot="start">
             <img [src]="fileIcon" alt="" role="presentation" />
         </ion-thumbnail>
diff --git a/src/core/components/local-file/core-local-file.html b/src/core/components/local-file/core-local-file.html
index 5814bf9c9..d3ca0cdd2 100644
--- a/src/core/components/local-file/core-local-file.html
+++ b/src/core/components/local-file/core-local-file.html
@@ -1,6 +1,6 @@
 <form (ngSubmit)="changeName(newFileName, $event)" #nameForm>
     <ion-card class="card-file">
-        <ion-item class="ion-text-wrap item-file" (click)="openFile($event)" button detail="false">
+        <ion-item class="ion-text-wrap item-file" (click)="openFile($event)" button [detail]="false">
             <ion-thumbnail slot="start">
                 <img [src]="fileIcon" [alt]="fileExtension" role="presentation" />
             </ion-thumbnail>
diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html
index 8933706b0..e808fc40a 100644
--- a/src/core/components/tabs-outlet/core-tabs-outlet.html
+++ b/src/core/components/tabs-outlet/core-tabs-outlet.html
@@ -8,7 +8,7 @@
             </ion-button>
             <ion-slides [options]="slidesOpts" [dir]="direction" role="tablist" [attr.aria-label]="description">
                 <ng-container *ngFor="let tab of tabs">
-                    <ion-slide role="presentation" [id]="tab.id! + '-tab'" tabindex="-1" [class.selected]="selected == tab.id"
+                    <ion-slide *ngIf="tab.id" role="presentation" [id]="tab.id + '-tab'" tabindex="-1" [class.selected]="selected == tab.id"
                         class="{{tab.class}}">
                         <ion-tab-button (ionTabButtonClick)="selectTab(tab.id, $event)" (keydown)="tabAction.keyDown(tab.id, $event)"
                             (keyup)="tabAction.keyUp(tab.id, $event)" [tab]="tab.page" [layout]="layout" role="tab"
diff --git a/src/core/components/tabs/tab.ts b/src/core/components/tabs/tab.ts
index a93de6abc..6a9c7590b 100644
--- a/src/core/components/tabs/tab.ts
+++ b/src/core/components/tabs/tab.ts
@@ -41,7 +41,7 @@ import { CoreTabsComponent } from './tabs';
  */
 @Component({
     selector: 'core-tab',
-    template: '<ng-container *ngIf="loaded" [ngTemplateOutlet]="template"></ng-container>',
+    template: '<ng-container *ngIf="loaded && template" [ngTemplateOutlet]="template"></ng-container>',
 })
 export class CoreTabComponent implements OnInit, OnDestroy, CoreTabBase {
 
diff --git a/src/core/features/block/components/only-title-block/core-block-only-title.html b/src/core/features/block/components/only-title-block/core-block-only-title.html
index d3e85a924..46edc4a9b 100644
--- a/src/core/features/block/components/only-title-block/core-block-only-title.html
+++ b/src/core/features/block/components/only-title-block/core-block-only-title.html
@@ -1,4 +1,4 @@
-<ion-item button class="ion-text-wrap divider" (click)="gotoBlock()" detail="true">
+<ion-item button class="ion-text-wrap divider" (click)="gotoBlock()" [detail]="true">
     <ion-label>
         <h2>{{ title | translate }}</h2>
     </ion-label>
diff --git a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
index c109a16d1..023752457 100644
--- a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
+++ b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html
@@ -1,4 +1,4 @@
-<ion-item-divider class="ion-text-wrap" *ngIf="title" sticky="true">
+<ion-item-divider class="ion-text-wrap" *ngIf="title" [sticky]="true">
     <ion-label>
         <h2>
             <core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid" [courseId]="courseId">
diff --git a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
index 49f14b326..25ceee8f7 100644
--- a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
+++ b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
@@ -19,7 +19,7 @@
                     <p *ngIf="displaySiteUrl">{{ url }}</p>
                 </ion-label>
             </ion-item>
-            <ion-item *ngFor="let site of sites" (click)="siteClicked(site.id)" detail="false" button>
+            <ion-item *ngFor="let site of sites" (click)="siteClicked(site.id)" [detail]="false" button>
                 <core-user-avatar [user]="site" slot="start" [linkProfile]="false"></core-user-avatar>
 
                 <ion-label>
diff --git a/src/core/features/course/components/course-index/course-index.html b/src/core/features/course/components/course-index/course-index.html
index bdff39b4c..30467dd8b 100644
--- a/src/core/features/course/components/course-index/course-index.html
+++ b/src/core/features/course/components/course-index/course-index.html
@@ -16,7 +16,7 @@
             <ng-container *ngFor="let section of sectionsToRender">
                 <ion-item *ngIf="allSectionId == section.id" class="divider core-course-index-all"
                     (click)="selectSectionOrModule($event, section.id)" button [class.item-current]="selectedId === section.id"
-                    detail="false">
+                    [detail]="false">
                     <ion-label>
                         <h2>
                             <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course?.id">
@@ -27,7 +27,7 @@
                 <ng-container *ngIf="allSectionId != section.id">
                     <ion-item class="divider section" (click)="selectSectionOrModule($event, section.id)" button
                         [class.item-current]="selectedId === section.id" [class.item-dimmed]="!section.visible"
-                        [class.item-hightlighted]="section.highlighted" detail="false" sticky="true">
+                        [class.item-hightlighted]="section.highlighted" [detail]="false">
                         <ion-icon *ngIf="section.hasVisibleModules" name="fas-chevron-right" flip-rtl slot="start"
                             class="expandable-status-icon" (ariaButtonClick)="toggleExpand($event, section)"
                             [attr.aria-label]="(section.expanded ? 'core.collapse' : 'core.expand') | translate"
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index aadf0701f..0d6d0e6b6 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -68,7 +68,7 @@
                 <ng-container *ngFor="let grade of grades">
                     <ion-item button *ngIf="grade.gradeitem" class="ion-text-wrap divider" (click)="toggleGrade(grade)"
                         [attr.aria-label]="(grade.expanded ? 'core.collapse' : 'core.expand') | translate"
-                        [attr.aria-expanded]="grade.expanded" [attr.aria-controls]="'grade-'+grade.id" role="heading" detail="false">
+                        [attr.aria-expanded]="grade.expanded" [attr.aria-controls]="'grade-'+grade.id" role="heading" [detail]="false">
                         <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                             [class.expandable-status-icon-expanded]="grade.expanded">
                         </ion-icon>
diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html
index 9d2dc797b..b1f674f9f 100644
--- a/src/core/features/course/components/module/core-course-module.html
+++ b/src/core/features/course/components/module/core-course-module.html
@@ -109,7 +109,7 @@
 
     <!-- Loading. -->
     <ion-item *ngIf="module.handlerData.loading" role="status" class="ion-text-wrap core-module-loading"
-        [attr.aria-label]="module.handlerData.a11yTitle" detail="false">
+        [attr.aria-label]="module.handlerData.a11yTitle" [detail]="false">
         <ion-label>
             <ion-spinner [attr.aria-label]="'core.loading' | translate"></ion-spinner>
         </ion-label>
diff --git a/src/core/features/course/components/tag-area/core-course-tag-area.html b/src/core/features/course/components/tag-area/core-course-tag-area.html
index 033ffc509..4fc9e95a8 100644
--- a/src/core/features/course/components/tag-area/core-course-tag-area.html
+++ b/src/core/features/course/components/tag-area/core-course-tag-area.html
@@ -1,5 +1,5 @@
 <ion-card *ngFor="let item of items">
-    <ion-item class="ion-text-wrap" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName" button detail="true">
+    <ion-item class="ion-text-wrap" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName" button [detail]="true">
         <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading">{{ item.courseName }}</p>
diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index e7d2179b3..c571f3911 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -69,7 +69,7 @@
                     </ion-label>
                 </ion-item>
 
-                <ion-item class="ion-text-wrap" *ngIf="course.summary" detail="false">
+                <ion-item class="ion-text-wrap" *ngIf="course.summary" [detail]="false">
                     <ion-label>
                         <h2 class="item-heading">
                             {{'core.course.coursesummary' | translate}}
@@ -81,7 +81,7 @@
 
                 <ion-list *ngIf="course.contacts && course.contacts.length">
                     <ion-item [button]="course.contacts.length >= 5" class="ion-text-wrap" (click)="toggleContacts()"
-                        [attr.aria-label]="(contactsExpanded ? 'core.collapse' : 'core.expand') | translate" detail="false">
+                        [attr.aria-label]="(contactsExpanded ? 'core.collapse' : 'core.expand') | translate" [detail]="false">
                         <ion-icon *ngIf="course.contacts.length >= 5" name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true"
                             class="expandable-status-icon" [class.expandable-status-icon-expanded]="contactsExpanded">
                         </ion-icon>
@@ -93,7 +93,7 @@
                     </ion-item>
                     <ng-container *ngIf="contactsExpanded || course.contacts.length < 5">
                         <ion-item button class="ion-text-wrap" *ngFor="let contact of course.contacts" core-user-link [userId]="contact.id"
-                            [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" detail="true">
+                            [courseId]="isEnrolled ? course.id : null" [attr.aria-label]="'core.viewprofile' | translate" [detail]="true">
                             <core-user-avatar [user]="contact" slot="start" [userId]="contact.id" [courseId]="isEnrolled ? course.id : null"
                                 [linkProfile]="false">
                             </core-user-avatar>
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 06589ca7b..c7eb710b3 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,38 +1,38 @@
 <ion-content>
     <ion-list>
-        <ion-item button class="ion-text-wrap" (click)="action('download')" *ngIf="downloadCourseEnabled" detail="false">
+        <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"
+        <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-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-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-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-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>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index c4c600bc1..bdc86b61d 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -48,7 +48,7 @@
                 </ion-item-divider>
                 <ion-card *ngFor="let category of categories">
                     <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name"
-                        detail="true">
+                        [detail]="true">
                         <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate"></ion-icon>
                         <ion-label>
                             <p class="item-heading">
diff --git a/src/core/features/grades/pages/courses/courses.html b/src/core/features/grades/pages/courses/courses.html
index 7f9a192b8..1c6149ebd 100644
--- a/src/core/features/grades/pages/courses/courses.html
+++ b/src/core/features/grades/pages/courses/courses.html
@@ -19,7 +19,7 @@
 
             <ion-list *ngIf="!courses.empty">
                 <ion-item *ngFor="let course of courses.items" [attr.aria-label]="course.courseFullName"
-                    [attr.aria-current]="courses.getItemAriaCurrent(course)" class="ion-text-wrap" button detail="true"
+                    [attr.aria-current]="courses.getItemAriaCurrent(course)" class="ion-text-wrap" button [detail]="true"
                     (click)="courses.select(course)">
                     <ion-label>
                         <core-format-text [text]="course.courseFullName" [contextInstanceId]="course.courseid" contextLevel="course">
diff --git a/src/core/features/login/components/site-help/site-help.html b/src/core/features/login/components/site-help/site-help.html
index 675d3809c..3517b8dc6 100644
--- a/src/core/features/login/components/site-help/site-help.html
+++ b/src/core/features/login/components/site-help/site-help.html
@@ -13,8 +13,8 @@
 <ion-content>
     <ion-list>
         <ng-container *ngFor="let question of questions">
-            <ion-item button class="ion-text-wrap divider" (click)="toggle(question)" sticky="true" [attr.aria-expanded]="isOpen(question)"
-                [attr.aria-controls]="'question-' + question.id + '-answer'" role="heading" detail="false">
+            <ion-item button class="ion-text-wrap divider" (click)="toggle(question)" [attr.aria-expanded]="isOpen(question)"
+                [attr.aria-controls]="'question-' + question.id + '-answer'" role="heading" [detail]="false">
                 <ion-icon name="fas-chevron-right" flip-rtl slot="start" aria-hidden="true" class="expandable-status-icon"
                     [class.expandable-status-icon-expanded]="isOpen(question)">
                 </ion-icon>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index e6e1fb8cc..71cdc764b 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -49,7 +49,7 @@
                         </ion-label>
                     </ion-item>
                     <ion-item button *ngIf="enteredSiteUrl" (click)="connect(enteredSiteUrl.url, $event)"
-                        [attr.aria-label]="'core.login.connect' | translate" detail="true" class="core-login-entered-site">
+                        [attr.aria-label]="'core.login.connect' | translate" [detail]="true" class="core-login-entered-site">
                         <ion-thumbnail slot="start" aria-hidden="true">
                             <ion-icon name="fas-pen" aria-hidden="true"></ion-icon>
                         </ion-thumbnail>
@@ -120,7 +120,7 @@
 
 <!-- Template site selector. -->
 <ng-template #sitelisting let-site="site">
-    <ion-item button (click)="connect(site.url, $event, site)" [ngClass]="site.className" [attr.aria-label]="site.name" detail="true">
+    <ion-item button (click)="connect(site.url, $event, site)" [ngClass]="site.className" [attr.aria-label]="site.name" [detail]="true">
         <ion-thumbnail *ngIf="siteFinderSettings.displayimage" slot="start">
             <img [src]="site.imageurl" *ngIf="site.imageurl" onError="this.src='assets/icon/icon.png'" alt="" role="presentation">
             <img src="assets/icon/icon.png" *ngIf="!site.imageurl" class="core-login-default-icon" alt="" role="presentation">
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index de361493a..8de97c149 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -16,7 +16,7 @@
     <core-loading [hideUntil]="siteLogoLoaded && handlersLoaded">
         <ion-list>
             <!-- Site info with URL and clickable. -->
-            <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo && displaySiteUrl" lines="full" detail="false"
+            <ion-item button class="core-usermenu-siteinfo ion-text-wrap" *ngIf="siteInfo && displaySiteUrl" lines="full" [detail]="false"
                 [href]="siteUrl" core-link auto-login="yes">
                 <ion-label>
                     <!-- Show site logo. -->
@@ -43,7 +43,7 @@
             </ion-item>
 
             <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
-                detail="true" [attr.aria-label]="'core.user.profile' | translate">
+                [detail]="true" [attr.aria-label]="'core.user.profile' | translate">
                 <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
                 <ion-label>
                     <p class="item-heading">{{ siteInfo.fullname }}</p>
@@ -58,7 +58,7 @@
 
             <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
                 [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" detail="true">
+                [attr.aria-label]="handler.title | translate" [detail]="true">
                 <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ handler.title | translate }}</p>
@@ -73,7 +73,7 @@
                 </ion-spinner>
             </ion-item>
 
-            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" detail="true"
+            <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" [detail]="true"
                 class="core-user-menu-preferences">
                 <ion-icon name="fas-wrench" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
@@ -82,7 +82,8 @@
             </ion-item>
 
             <ion-item *ngIf="displayContactSupport" button (click)="contactSupport($event)"
-                [attr.aria-label]="'core.user.support' | translate" detail="true" detailIcon="open-outline" class="core-user-menu-support">
+                [attr.aria-label]="'core.user.support' | translate" [detail]="true" detailIcon="open-outline"
+                class="core-user-menu-support">
                 <ion-icon name="fas-envelope" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.user.support' | translate }}</p>
@@ -92,7 +93,7 @@
     </core-loading>
 </ion-content>
 <ion-footer>
-    <ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" detail="true" class="ion-text-wrap">
+    <ion-item *ngIf="displaySwitchAccount" button lines="full" (click)="switchAccounts($event)" [detail]="true" class="ion-text-wrap">
         <ion-icon name="fas-right-left" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading">{{ 'core.mainmenu.switchaccount' | translate }}</p>
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index a14467035..a9582312b 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -21,7 +21,7 @@
             </ion-label>
         </ion-item>
         <ion-item button *ngFor="let handler of handlers" [ngClass]="['core-moremenu-handler', handler.class || '']"
-            (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true">
+            (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" [detail]="true">
             <ion-icon [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ handler.title | translate}}</p>
@@ -37,7 +37,7 @@
         </ion-item>
         <ng-container *ngFor="let item of customItems">
             <ion-item button *ngIf="item.type !== 'embedded'" [href]="item.url" [attr.aria-label]="item.label" core-link
-                [capture]="item.type === 'app'" [inApp]="item.type === 'inappbrowser'" class="core-moremenu-customitem" detail="true"
+                [capture]="item.type === 'app'" [inApp]="item.type === 'inappbrowser'" class="core-moremenu-customitem" [detail]="true"
                 [detailIcon]="item.type === 'browser' ? 'open-outline' : 'chevron-forward'">
                 <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
@@ -45,14 +45,14 @@
                 </ion-label>
             </ion-item>
             <ion-item button *ngIf="item.type === 'embedded'" (click)="openItem(item)" [attr.aria-label]="item.label"
-                class="core-moremenu-customitem" detail="true">
+                class="core-moremenu-customitem" [detail]="true">
                 <ion-icon [name]="item.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{item.label}}</p>
                 </ion-label>
             </ion-item>
         </ng-container>
-        <ion-item button *ngIf="showScanQR" (click)="scanQR()" detail="true">
+        <ion-item button *ngIf="showScanQR" (click)="scanQR()" [detail]="true">
             <ion-icon name="fas-qrcode" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ 'core.scanqr' | translate }}</p>
@@ -61,7 +61,7 @@
     </ion-list>
 </ion-content>
 <ion-footer>
-    <ion-item button (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate" detail="true">
+    <ion-item button (click)="openSettings()" [attr.aria-label]="'core.settings.appsettings' | translate" [detail]="true">
         <ion-icon name="fas-gears" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
             <p class="item-heading">{{ 'core.settings.appsettings' | translate }}</p>
diff --git a/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.html b/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.html
index 45a4bd241..425bc39d1 100644
--- a/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.html
+++ b/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.html
@@ -9,7 +9,7 @@
     <ion-content>
         <!-- Preset options. -->
         <ng-container *ngFor="let option of presetOptions">
-            <ion-item button class="ion-text-wrap" (click)="setReminder(option.radioValue)" detail="false" *ngIf="option.enabled"
+            <ion-item button class="ion-text-wrap" (click)="setReminder(option.radioValue)" [detail]="false" *ngIf="option.enabled"
                 [attr.aria-selected]="currentValue === option.radioValue">
                 <ion-label>
                     <p class="item-heading">{{ option.label }}</p>
@@ -19,7 +19,7 @@
         </ng-container>
 
         <!-- Custom value. -->
-        <ion-item button class="ion-text-wrap" (click)="setCustom($event)" detail="false" [attr.aria-selected]="currentValue === 'custom'">
+        <ion-item button class="ion-text-wrap" (click)="setCustom($event)" [detail]="false" [attr.aria-selected]="currentValue === 'custom'">
             <ion-label>
                 <p class="item-heading">{{ 'core.reminders.custom' | translate }}</p>
                 <p>{{ customLabel }}</p>
@@ -27,7 +27,7 @@
             <ion-icon name="fas-check" *ngIf="currentValue === 'custom'" slot="end" aria-hidden="true"></ion-icon>
         </ion-item>
 
-        <ion-item *ngIf="noReminderLabel" button class="ion-text-wrap text-danger border-top" (click)="disableReminder()" detail="false"
+        <ion-item *ngIf="noReminderLabel" button class="ion-text-wrap text-danger border-top" (click)="disableReminder()" [detail]="false"
             [attr.aria-selected]="currentValue === 'disabled'">
             <ion-label>
                 <p class="item-heading">{{ noReminderLabel | translate }}</p>
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 57a4eaac3..6f0cc0bba 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -15,7 +15,7 @@
     </ion-item>
     <ion-list class="core-search-history" [hidden]="!historyShown">
         <ion-item button class="ion-text-wrap" *ngFor="let item of history" (click)="historyClicked($event, item.searchedtext)" tabindex="0"
-            detail="true">
+            [detail]="true">
             <ion-icon name="fas-clock-rotate-left" slot="start" aria-hidden="true">
             </ion-icon>
             <ion-label>{{item.searchedtext}}</ion-label>
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 198f1cdaf..2f7796a70 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -13,26 +13,26 @@
 
 <ion-content>
     <ion-list class="list-item-limited-width">
-        <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
+        <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" [detail]="true">
             <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
         </ion-item>
-        <ion-item *ngIf="privacyPolicy" class="ion-text-wrap" button core-link auto-login="no" [href]="privacyPolicy" detail="true"
+        <ion-item *ngIf="privacyPolicy" class="ion-text-wrap" button core-link auto-login="no" [href]="privacyPolicy" [detail]="true"
             detailIcon="open-outline">
             <ion-icon name="fas-user-shield" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
         </ion-item>
-        <ion-item *ngIf="a11yStatement" class="ion-text-wrap" button core-link auto-login="no" [href]="a11yStatement" detail="true"
+        <ion-item *ngIf="a11yStatement" class="ion-text-wrap" button core-link auto-login="no" [href]="a11yStatement" [detail]="true"
             detailIcon="open-outline">
             <ion-icon name="fas-universal-access" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.accessstatement' | translate }}</ion-label>
         </ion-item>
         <ion-item *ngIf="currentSite && feedbackFormUrl && showSurvey" class="ion-text-wrap" button core-link [href]="feedbackFormUrl"
-            detail="true" detailIcon="open-outline">
+            [detail]="true" detailIcon="open-outline">
             <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.helpusimprove' | translate }}</ion-label>
         </ion-item>
-        <ion-item *ngIf="legalDisclaimer" class="ion-text-wrap" button core-link auto-login="no" [href]="legalDisclaimer" detail="true"
+        <ion-item *ngIf="legalDisclaimer" class="ion-text-wrap" button core-link auto-login="no" [href]="legalDisclaimer" [detail]="true"
             detailIcon="open-outline">
             <ion-icon name="fas-scale-balanced" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.settings.legaldisclaimer' | translate }}</ion-label>
@@ -41,7 +41,7 @@
 </ion-content>
 
 <ion-footer class="ion-no-border">
-    <ion-item button class="ion-text-wrap ion-text-center core-about-deviceinfo" detail="false" (click)="openPage('deviceinfo')">
+    <ion-item button class="ion-text-wrap ion-text-center core-about-deviceinfo" [detail]="false" (click)="openPage('deviceinfo')">
         <ion-label>
             <p class="item-heading">{{ appName }} {{ versionName }}</p>
         </ion-label>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 45385d0dd..c4da48990 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -18,7 +18,7 @@
 
 <ion-content>
     <ion-list class="list-item-limited-width">
-        <ion-item *ngIf="showDevOptions" detail="true" (click)="gotoDevOptions()">
+        <ion-item *ngIf="showDevOptions" [detail]="true" (click)="gotoDevOptions()">
             <ion-icon name="fas-terminal" slot="start" aria-hidden="true"></ion-icon>
             <ion-label class="ion-text-wrap">
                 <p class="item-heading">{{ 'core.settings.developeroptions' | translate }}</p>
diff --git a/src/core/features/settings/pages/index/index.html b/src/core/features/settings/pages/index/index.html
index aa88d9c50..d9cca2a34 100644
--- a/src/core/features/settings/pages/index/index.html
+++ b/src/core/features/settings/pages/index/index.html
@@ -12,8 +12,8 @@
 <ion-content>
     <core-split-view>
         <ion-list>
-            <ion-item *ngFor="let section of sections.items" [attr.aria-current]="sections.getItemAriaCurrent(section)" button detail="true"
-                (click)="sections.select(section)">
+            <ion-item *ngFor="let section of sections.items" [attr.aria-current]="sections.getItemAriaCurrent(section)" button
+                [detail]="true" (click)="sections.select(section)">
                 <ion-icon [name]="section.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>{{ section.name | translate }}</ion-label>
             </ion-item>
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 485c3c63e..b883d1942 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -15,7 +15,7 @@
             [placeholder]="'core.filter' | translate" class="ion-margin-top">
         </ion-searchbar>
         <ion-list>
-            <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no" detail="false">
+            <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no" [detail]="false">
                 <ion-label>
                     {{ 'core.settings.opensourcelicenses' | translate }}
                 </ion-label>
diff --git a/src/core/features/sharedfiles/components/list/list.html b/src/core/features/sharedfiles/components/list/list.html
index 96174712a..51823b9a7 100644
--- a/src/core/features/sharedfiles/components/list/list.html
+++ b/src/core/features/sharedfiles/components/list/list.html
@@ -13,7 +13,7 @@
                 (onDelete)="fileDeleted(idx)" (onRename)="fileRenamed(idx, $event)">
             </core-local-file>
 
-            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)" detail="true">
+            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file item-directory" (click)="openFolder(file)" [detail]="true">
                 <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>{{ file.name }}</ion-label>
             </ion-item>
diff --git a/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html b/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
index c80615fda..923599f69 100644
--- a/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
+++ b/src/core/features/siteplugins/components/only-title-block/core-siteplugins-only-title-block.html
@@ -1,4 +1,4 @@
-<ion-item button class="divider ion-text-wrap" detail="true" (click)="gotoBlock()">
+<ion-item button class="divider ion-text-wrap" [detail]="true" (click)="gotoBlock()">
     <ion-label>
         <h2>{{ title | translate }}</h2>
     </ion-label>
diff --git a/src/core/features/tag/pages/index/index.html b/src/core/features/tag/pages/index/index.html
index e3963735c..3e8f9c87e 100644
--- a/src/core/features/tag/pages/index/index.html
+++ b/src/core/features/tag/pages/index/index.html
@@ -21,7 +21,7 @@
                     <ion-label class="ion-text-wrap">{{ 'core.tag.warningareasnotsupported' | translate }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let area of areas" [attr.aria-label]="area.nameKey | translate"
-                    (click)="openArea(area)" [attr.aria-current]="area.id === selectedAreaId ? 'page' : 'false'" button detail="true">
+                    (click)="openArea(area)" [attr.aria-current]="area.id === selectedAreaId ? 'page' : 'false'" button [detail]="true">
                     <ion-label>
                         <p class="item-heading">{{ area.nameKey | translate }}</p>
                     </ion-label>
diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html
index fa9e23016..c724447a0 100644
--- a/src/core/features/user/pages/participants/participants.html
+++ b/src/core/features/user/pages/participants/participants.html
@@ -20,7 +20,7 @@
             <ion-list *ngIf="!participants.empty">
                 <ion-item *ngFor="let participant of participants.items" class="ion-text-wrap"
                     [attr.aria-current]="participants.getItemAriaCurrent(participant)" [attr.aria-label]="participant.fullname"
-                    (click)="participants.select(participant)" button detail="true">
+                    (click)="participants.select(participant)" button [detail]="true">
 
                     <core-user-avatar [user]="participant" [linkProfile]="false" [checkOnline]="true" slot="start">
                     </core-user-avatar>
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index b8be19e55..17a3ce676 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -51,7 +51,7 @@
                 </div>
             </div>
             <ion-item button class="ion-text-wrap core-user-profile-handler" (click)="openUserDetails()"
-                [attr.aria-label]="'core.user.details' | translate" detail="true">
+                [attr.aria-label]="'core.user.details' | translate" [detail]="true">
                 <ion-icon name="fas-user" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ 'core.user.details' | translate }}</p>
@@ -64,7 +64,7 @@
             </ion-item>
             <ion-item button *ngFor="let handler of newPageHandlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
                 [ngClass]="['core-user-profile-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" detail="true">
+                [attr.aria-label]="handler.title | translate" [detail]="true">
                 <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
                     <p class="item-heading">{{ handler.title | translate }}</p>

From 4ebec029ba6bac82893355afedb292636048d6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 13 Nov 2023 12:36:04 +0100
Subject: [PATCH 09/17] MOBILE-3947 user: Fix user types on user-avatar

---
 .../components/sites-list/sites-list.html     |  2 +-
 .../components/user-avatar/user-avatar.ts     | 27 ++++++++++++++++---
 .../choose-site-modal/choose-site-modal.html  |  2 +-
 .../login/pages/reconnect/reconnect.html      |  2 +-
 .../user-menu-button/user-menu-button.html    |  2 +-
 .../components/user-menu/user-menu.html       |  2 +-
 src/core/services/sites.ts                    |  2 ++
 7 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/core/components/sites-list/sites-list.html b/src/core/components/sites-list/sites-list.html
index d4f3b7e57..b00d973dd 100644
--- a/src/core/components/sites-list/sites-list.html
+++ b/src/core/components/sites-list/sites-list.html
@@ -40,7 +40,7 @@
     <ion-item [attr.button]="isSiteClickable(isCurrentSite) ? true : null" (click)="siteClicked($event, site, isCurrentSite)"
         [attr.detail]="isSiteClickable(isCurrentSite) ? 'true' : 'false'" [class.item-current]="isCurrentSite">
 
-        <core-user-avatar [user]="site" slot="start" [linkProfile]="false" [siteId]="site.id"></core-user-avatar>
+        <core-user-avatar [site]="site" slot="start" [linkProfile]="false" [siteId]="site.id"></core-user-avatar>
 
         <ion-label>
             <p class="item-heading">{{site.fullname}}</p>
diff --git a/src/core/components/user-avatar/user-avatar.ts b/src/core/components/user-avatar/user-avatar.ts
index bdb7bee4c..6c3e137e5 100644
--- a/src/core/components/user-avatar/user-avatar.ts
+++ b/src/core/components/user-avatar/user-avatar.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChange } from '@angular/core';
 
-import { CoreSites } from '@services/sites';
+import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { USER_PROFILE_PICTURE_UPDATED, CoreUserBasicData } from '@features/user/services/user';
@@ -22,6 +22,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
 import { CoreUserHelper } from '@features/user/services/user-helper';
 import { CoreUrlUtils } from '@services/utils/url';
+import { CoreSiteInfo } from '@classes/site';
 
 /**
  * Component to display a "user avatar".
@@ -35,7 +36,8 @@ import { CoreUrlUtils } from '@services/utils/url';
 })
 export class CoreUserAvatarComponent implements OnInit, OnChanges, OnDestroy {
 
-    @Input() user?: CoreUserWithAvatar;
+    @Input() user?: CoreUserWithAvatar; // @todo Fix the accepted type and restrict it a bit.
+    @Input() site?: CoreSiteBasicInfo | CoreSiteInfo; // Site info contains user info.
     // The following params will override the ones in user object.
     @Input() profileUrl?: string;
     @Input() linkProfile = true; // Avoid linking to the profile if wanted.
@@ -71,8 +73,23 @@ export class CoreUserAvatarComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
-        this.siteId = this.siteId || CoreSites.getCurrentSiteId();
+    async ngOnInit(): Promise<void> {
+        this.siteId = this.siteId ?? (this.site && 'id' in this.site
+            ? this.site.id
+            : CoreSites.getCurrentSiteId());
+
+        if (this.site && !this.user) {
+            this.user = {
+                id: ('userid' in this.site
+                    ? this.site.userid
+                    : this.site.userId)
+                    ?? (await CoreSites.getSite(this.siteId)).getUserId(),
+                fullname: this.site.fullname ?? '',
+                firstname: this.site.firstname ?? '',
+                lastname: this.site.lastname ?? '',
+                userpictureurl: this.site.userpictureurl,
+            };
+        }
 
         this.setFields();
     }
@@ -189,4 +206,6 @@ export type CoreUserWithAvatar = CoreUserBasicData & {
     isonline?: boolean;
     courseid?: number;
     lastaccess?: number;
+    firstname?: string; // The first name(s) of the user.
+    lastname?: string; // The family name of the user.
 };
diff --git a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
index 25ceee8f7..a78a68793 100644
--- a/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
+++ b/src/core/features/contentlinks/components/choose-site-modal/choose-site-modal.html
@@ -20,7 +20,7 @@
                 </ion-label>
             </ion-item>
             <ion-item *ngFor="let site of sites" (click)="siteClicked(site.id)" [detail]="false" button>
-                <core-user-avatar [user]="site" slot="start" [linkProfile]="false"></core-user-avatar>
+                <core-user-avatar [site]="site" slot="start" [linkProfile]="false"></core-user-avatar>
 
                 <ion-label>
                     <p class="item-heading">{{site.fullname}}</p>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index af0a6e681..dcde5f15f 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -45,7 +45,7 @@
 
                 <div class="core-login-user">
                     <!-- Show user avatar. -->
-                    <core-user-avatar class="large-avatar" *ngIf="showUserAvatar" [user]="siteInfo" [linkProfile]="false"
+                    <core-user-avatar class="large-avatar" *ngIf="showUserAvatar" [site]="siteInfo" [linkProfile]="false"
                         [siteId]="siteId"></core-user-avatar>
                     <p *ngIf="siteInfo?.fullname" class="core-login-fullname">
                         <core-format-text [text]="siteInfo?.fullname" [filter]="false"></core-format-text>
diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
index 5e8829b0b..b23e54da8 100644
--- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
+++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.html
@@ -1,4 +1,4 @@
-<core-user-avatar *ngIf="(alwaysShow || isMainScreen) && siteInfo" [user]="siteInfo" class="core-bar-button-image clickable"
+<core-user-avatar *ngIf="(alwaysShow || isMainScreen) && siteInfo" [site]="siteInfo" class="core-bar-button-image clickable"
     [linkProfile]="false" (ariaButtonClick)="openUserMenu($event)" [userTour]="userTour"
     [attr.aria-label]="'core.user.useraccount' | translate">
 </core-user-avatar>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 8de97c149..896d075c2 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -44,7 +44,7 @@
 
             <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
                 [detail]="true" [attr.aria-label]="'core.user.profile' | translate">
-                <core-user-avatar [user]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
+                <core-user-avatar [site]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start"></core-user-avatar>
                 <ion-label>
                     <p class="item-heading">{{ siteInfo.fullname }}</p>
                 </ion-label>
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 48239c18b..f3ec0137b 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1253,6 +1253,7 @@ export class CoreSitesProvider {
 
                 const basicInfo: CoreSiteBasicInfo = {
                     id: site.id,
+                    userId: siteInfo?.userid,
                     siteUrl: site.siteUrl,
                     siteUrlWithoutProtocol: site.siteUrl.replace(/^https?:\/\//, '').toLowerCase(),
                     fullname: siteInfo?.fullname,
@@ -2148,6 +2149,7 @@ export type CoreSiteUserTokenResponse = {
  */
 export type CoreSiteBasicInfo = {
     id: string; // Site ID.
+    userId?: number; // User ID.
     siteUrl: string; // Site URL.
     siteUrlWithoutProtocol: string; // Site URL without protocol.
     fullname?: string; // User's full name.

From feb8a78eccd406c0be9ee48f04ef67927a3e0a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Nov 2023 13:30:51 +0100
Subject: [PATCH 10/17] MOBILE-3947 chore: Change IonRefresher type to
 HTMLIonRefresherElement

---
 src/addons/badges/pages/issued-badge/issued-badge.ts          | 3 +--
 src/addons/badges/pages/user-badges/user-badges.ts            | 3 +--
 .../block/myoverview/components/myoverview/myoverview.ts      | 4 ++--
 src/addons/blog/pages/entries/entries.ts                      | 3 +--
 src/addons/calendar/pages/day/day.ts                          | 3 +--
 src/addons/calendar/pages/edit-event/edit-event.ts            | 3 +--
 src/addons/calendar/pages/event/event.ts                      | 3 +--
 src/addons/calendar/pages/index/index.ts                      | 3 +--
 src/addons/competency/pages/competencies/competencies.page.ts | 3 +--
 src/addons/competency/pages/competency/competency.page.ts     | 3 +--
 .../pages/competencysummary/competencysummary.page.ts         | 3 +--
 .../pages/coursecompetencies/coursecompetencies.page.ts       | 3 +--
 src/addons/competency/pages/plan/plan.ts                      | 3 +--
 src/addons/competency/pages/planlist/planlist.ts              | 3 +--
 src/addons/coursecompletion/pages/report/report.ts            | 3 +--
 src/addons/messageoutput/airnotifier/pages/devices/devices.ts | 3 +--
 .../conversation-info/conversation-info.component.ts          | 3 +--
 src/addons/messages/pages/contacts-35/contacts.ts             | 3 +--
 src/addons/messages/pages/contacts/contacts.ts                | 3 +--
 src/addons/messages/pages/discussions-35/discussions.ts       | 3 +--
 .../messages/pages/group-conversations/group-conversations.ts | 4 ++--
 src/addons/messages/pages/settings/settings.ts                | 3 +--
 .../mod/assign/pages/submission-list/submission-list.ts       | 3 +--
 .../mod/assign/pages/submission-review/submission-review.ts   | 3 +--
 src/addons/mod/book/pages/contents/contents.ts                | 3 +--
 .../mod/chat/pages/session-messages/session-messages.ts       | 3 +--
 src/addons/mod/chat/pages/sessions/sessions.ts                | 3 +--
 src/addons/mod/data/pages/entry/entry.ts                      | 4 ++--
 src/addons/mod/feedback/pages/attempts/attempts.ts            | 3 +--
 .../mod/feedback/pages/nonrespondents/nonrespondents.ts       | 3 +--
 src/addons/mod/forum/pages/discussion/discussion.ts           | 4 ++--
 src/addons/mod/forum/pages/new-discussion/new-discussion.ts   | 3 +--
 src/addons/mod/glossary/pages/entry/entry.ts                  | 3 +--
 .../mod/h5pactivity/pages/attempt-results/attempt-results.ts  | 3 +--
 .../mod/h5pactivity/pages/user-attempts/user-attempts.ts      | 3 +--
 .../mod/h5pactivity/pages/users-attempts/users-attempts.ts    | 3 +--
 src/addons/mod/imscp/pages/view/view.ts                       | 3 +--
 src/addons/mod/lesson/pages/user-retake/user-retake.ts        | 3 +--
 src/addons/mod/quiz/pages/attempt/attempt.ts                  | 3 +--
 src/addons/mod/quiz/pages/review/review.ts                    | 4 ++--
 src/addons/mod/workshop/pages/assessment/assessment.ts        | 3 +--
 src/addons/mod/workshop/pages/submission/submission.ts        | 4 ++--
 src/addons/notes/pages/list/list.ts                           | 4 ++--
 src/addons/notifications/pages/list/list.ts                   | 3 +--
 src/addons/notifications/pages/settings/settings.ts           | 3 +--
 src/addons/privatefiles/pages/index/index.ts                  | 3 +--
 src/core/features/block/components/side-blocks/side-blocks.ts | 3 +--
 src/core/features/comments/pages/viewer/viewer.ts             | 4 ++--
 src/core/features/course/classes/main-resource-component.ts   | 3 +--
 .../features/course/components/course-format/course-format.ts | 4 ++--
 .../course/format/singleactivity/components/singleactivity.ts | 3 +--
 src/core/features/course/pages/contents/contents.ts           | 4 ++--
 .../course/pages/course-summary/course-summary.page.ts        | 4 ++--
 src/core/features/course/pages/list-mod-type/list-mod-type.ts | 3 +--
 .../features/course/pages/module-preview/module-preview.ts    | 3 +--
 src/core/features/course/services/module-delegate.ts          | 3 +--
 src/core/features/courses/pages/categories/categories.ts      | 3 +--
 src/core/features/courses/pages/dashboard/dashboard.ts        | 3 +--
 src/core/features/courses/pages/list/list.ts                  | 3 +--
 src/core/features/courses/pages/my/my.ts                      | 3 +--
 src/core/features/grades/pages/course/course.page.ts          | 3 +--
 src/core/features/grades/pages/courses/courses.ts             | 3 +--
 .../reportbuilder/components/report-detail/report-detail.ts   | 3 +--
 src/core/features/reportbuilder/pages/list/list.ts            | 3 +--
 .../global-search-filters/global-search-filters.component.ts  | 3 +--
 src/core/features/settings/pages/site/site.ts                 | 3 +--
 src/core/features/settings/pages/space-usage/space-usage.ts   | 3 +--
 src/core/features/sharedfiles/components/list/list.ts         | 3 +--
 src/core/features/sitehome/pages/index/index.ts               | 3 +--
 .../siteplugins/components/course-format/course-format.ts     | 3 +--
 .../siteplugins/components/module-index/module-index.ts       | 3 +--
 .../features/siteplugins/pages/course-option/course-option.ts | 3 +--
 .../features/siteplugins/pages/module-index/module-index.ts   | 3 +--
 src/core/features/siteplugins/pages/plugin/plugin.ts          | 3 +--
 src/core/features/tag/pages/index-area/index-area.ts          | 3 +--
 src/core/features/tag/pages/index/index.ts                    | 3 +--
 src/core/features/tag/pages/search/search.ts                  | 3 +--
 src/core/features/user/pages/about/about.ts                   | 3 +--
 .../features/user/pages/participants/participants.page.ts     | 3 +--
 src/core/features/user/pages/profile/profile.ts               | 3 +--
 80 files changed, 91 insertions(+), 160 deletions(-)

diff --git a/src/addons/badges/pages/issued-badge/issued-badge.ts b/src/addons/badges/pages/issued-badge/issued-badge.ts
index 1440e7f02..640b75e5e 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.ts
+++ b/src/addons/badges/pages/issued-badge/issued-badge.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
@@ -130,7 +129,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshBadges(refresher?: IonRefresher): Promise<void> {
+    async refreshBadges(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(Promise.all([
             AddonBadges.invalidateUserBadges(this.courseId, this.userId),
         ]));
diff --git a/src/addons/badges/pages/user-badges/user-badges.ts b/src/addons/badges/pages/user-badges/user-badges.ts
index 9d02a2c5f..eab870748 100644
--- a/src/addons/badges/pages/user-badges/user-badges.ts
+++ b/src/addons/badges/pages/user-badges/user-badges.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -90,7 +89,7 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshBadges(refresher?: IonRefresher): Promise<void> {
+    async refreshBadges(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(
             AddonBadges.invalidateUserBadges(
                 this.badges.getSource().COURSE_ID,
diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts
index bbf812037..efe60ab14 100644
--- a/src/addons/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts
@@ -31,7 +31,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
-import { IonRefresher, IonSearchbar } from '@ionic/angular';
+import { IonSearchbar } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { PageLoadWatcher } from '@classes/page-load-watcher';
 import { PageLoadsManager } from '@classes/page-loads-manager';
@@ -191,7 +191,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param done Function to call when done.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void): Promise<void> {
         if (this.loaded) {
             return this.refreshContent().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/blog/pages/entries/entries.ts b/src/addons/blog/pages/entries/entries.ts
index b5ee60335..a570d0786 100644
--- a/src/addons/blog/pages/entries/entries.ts
+++ b/src/addons/blog/pages/entries/entries.ts
@@ -19,7 +19,6 @@ import { CoreComments } from '@features/comments/services/comments';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
 import { CoreTag } from '@features/tag/services/tag';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -272,7 +271,7 @@ export class AddonBlogEntriesPage implements OnInit {
      *
      * @param refresher Refresher instance.
      */
-    refresh(refresher?: IonRefresher): void {
+    refresh(refresher?: HTMLIonRefresherElement): void {
         const promises = this.entries.map((entry) =>
             CoreComments.invalidateCommentsData('user', entry.userid, this.component, entry.id, 'format_blog'));
 
diff --git a/src/addons/calendar/pages/day/day.ts b/src/addons/calendar/pages/day/day.ts
index 1f539005c..83c8e41a8 100644
--- a/src/addons/calendar/pages/day/day.ts
+++ b/src/addons/calendar/pages/day/day.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -301,7 +300,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
      * @param done Function to call when done.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void): Promise<void> {
         if (!this.loaded) {
             return;
         }
diff --git a/src/addons/calendar/pages/edit-event/edit-event.ts b/src/addons/calendar/pages/edit-event/edit-event.ts
index a6dd52dd0..993603f9e 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.ts
+++ b/src/addons/calendar/pages/edit-event/edit-event.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
 import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { IonRefresher } from '@ionic/angular';
 import { CoreEvents } from '@singletons/events';
 import { CoreGroup, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
@@ -383,7 +382,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         const promises = [
             AddonCalendar.invalidateAccessInformation(this.courseId),
             AddonCalendar.invalidateAllowedEventTypes(this.courseId),
diff --git a/src/addons/calendar/pages/event/event.ts b/src/addons/calendar/pages/event/event.ts
index 59b6eb622..3aedbbeb8 100644
--- a/src/addons/calendar/pages/event/event.ts
+++ b/src/addons/calendar/pages/event/event.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { AlertOptions } from '@ionic/core';
 import {
     AddonCalendar,
@@ -419,7 +418,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
      * @param showErrors Whether to show sync errors to the user.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors= false): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void, showErrors= false): Promise<void> {
         if (!this.eventLoaded) {
             return;
         }
diff --git a/src/addons/calendar/pages/index/index.ts b/src/addons/calendar/pages/index/index.ts
index cd48d82d1..ac6828c74 100644
--- a/src/addons/calendar/pages/index/index.ts
+++ b/src/addons/calendar/pages/index/index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
@@ -263,7 +262,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      * @param showErrors Whether to show sync errors to the user.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors?: boolean): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void, showErrors?: boolean): Promise<void> {
         if (!this.loaded) {
             return;
         }
diff --git a/src/addons/competency/pages/competencies/competencies.page.ts b/src/addons/competency/pages/competencies/competencies.page.ts
index 170976e19..9a3f1750b 100644
--- a/src/addons/competency/pages/competencies/competencies.page.ts
+++ b/src/addons/competency/pages/competencies/competencies.page.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import {
@@ -121,7 +120,7 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
      *
      * @param refresher Refresher.
      */
-    async refreshCompetencies(refresher?: IonRefresher): Promise<void> {
+    async refreshCompetencies(refresher?: HTMLIonRefresherElement): Promise<void> {
         await this.competencies.getSource().invalidateCache();
 
         this.competencies.getSource().setDirty(true);
diff --git a/src/addons/competency/pages/competency/competency.page.ts b/src/addons/competency/pages/competency/competency.page.ts
index bf14914ac..9431a03e9 100644
--- a/src/addons/competency/pages/competency/competency.page.ts
+++ b/src/addons/competency/pages/competency/competency.page.ts
@@ -30,7 +30,6 @@ import {
     AddonCompetencyProvider,
 } from '@addons/competency/services/competency';
 import { CoreNavigator } from '@services/navigator';
-import { IonRefresher } from '@ionic/angular';
 import { ContextLevel } from '@/core/constants';
 import { CoreUtils } from '@services/utils/utils';
 import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/competency.module';
@@ -173,7 +172,7 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshCompetency(refresher: IonRefresher): Promise<void> {
+    async refreshCompetency(refresher: HTMLIonRefresherElement): Promise<void> {
         const source = this.competencies.getSource();
 
         await CoreUtils.ignoreErrors(
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.page.ts b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
index 1495a9e6e..00dd18b0c 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.page.ts
+++ b/src/addons/competency/pages/competencysummary/competencysummary.page.ts
@@ -15,7 +15,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ContextLevel } from '@/core/constants';
 import { AddonCompetencySummary, AddonCompetency } from '@addons/competency/services/competency';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -113,7 +112,7 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    refreshCompetency(refresher: IonRefresher): void {
+    refreshCompetency(refresher: HTMLIonRefresherElement): void {
         AddonCompetency.invalidateCompetencySummary(this.competencyId).finally(() => {
             this.fetchCompetency().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
index cf780f27d..665842828 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts
@@ -18,7 +18,6 @@ import {
     AddonCompetencyDataForCourseCompetenciesPageCompetency,
 } from '@addons/competency/services/competency';
 import { CoreUserProfile } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { ContextLevel } from '@/core/constants';
@@ -148,7 +147,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit, OnDestroy
      *
      * @param refresher Refresher.
      */
-    async refreshCourseCompetencies(refresher?: IonRefresher): Promise<void> {
+    async refreshCourseCompetencies(refresher?: HTMLIonRefresherElement): Promise<void> {
         await this.competencies.getSource().invalidateCache();
 
         this.fetchCourseCompetencies().finally(() => {
diff --git a/src/addons/competency/pages/plan/plan.ts b/src/addons/competency/pages/plan/plan.ts
index 5c57a659b..9f1d1f540 100644
--- a/src/addons/competency/pages/plan/plan.ts
+++ b/src/addons/competency/pages/plan/plan.ts
@@ -17,7 +17,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForPlanPageWSResponse } from '../../services/competency';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUserProfile } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { AddonCompetencyPlansSource } from '@addons/competency/classes/competency-plans-source';
@@ -111,7 +110,7 @@ export class AddonCompetencyPlanPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshLearningPlan(refresher: IonRefresher): Promise<void> {
+    async refreshLearningPlan(refresher: HTMLIonRefresherElement): Promise<void> {
         await this.competencies.getSource().invalidateCache();
 
         this.fetchLearningPlan().finally(() => {
diff --git a/src/addons/competency/pages/planlist/planlist.ts b/src/addons/competency/pages/planlist/planlist.ts
index db2030b98..c725a372c 100644
--- a/src/addons/competency/pages/planlist/planlist.ts
+++ b/src/addons/competency/pages/planlist/planlist.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreNavigator } from '@services/navigator';
@@ -86,7 +85,7 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshLearningPlans(refresher: IonRefresher): Promise<void> {
+    async refreshLearningPlans(refresher: HTMLIonRefresherElement): Promise<void> {
         await this.plans.getSource().invalidateCache();
 
         this.plans.getSource().setDirty(true);
diff --git a/src/addons/coursecompletion/pages/report/report.ts b/src/addons/coursecompletion/pages/report/report.ts
index b58921aa3..6449ec701 100644
--- a/src/addons/coursecompletion/pages/report/report.ts
+++ b/src/addons/coursecompletion/pages/report/report.ts
@@ -18,7 +18,6 @@ import {
 } from '@addons/coursecompletion/services/coursecompletion';
 import { Component, OnInit } from '@angular/core';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -112,7 +111,7 @@ export class AddonCourseCompletionReportPage implements OnInit {
      *
      * @param refresher Refresher instance.
      */
-    async refreshCompletion(refresher?: IonRefresher): Promise<void> {
+    async refreshCompletion(refresher?: HTMLIonRefresherElement): Promise<void> {
         await AddonCourseCompletion.invalidateCourseCompletion(this.courseId, this.userId).finally(() => {
             this.fetchCompletion().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.ts b/src/addons/messageoutput/airnotifier/pages/devices/devices.ts
index 6c7b1087d..829d4f798 100644
--- a/src/addons/messageoutput/airnotifier/pages/devices/devices.ts
+++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
@@ -123,7 +122,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnInit, OnDestr
      *
      * @param refresher Refresher.
      */
-    async refreshDevices(refresher: IonRefresher): Promise<void> {
+    async refreshDevices(refresher: HTMLIonRefresherElement): Promise<void> {
         try {
             await CoreUtils.ignoreErrors(AddonMessageOutputAirnotifier.invalidateUserDevices());
 
diff --git a/src/addons/messages/components/conversation-info/conversation-info.component.ts b/src/addons/messages/components/conversation-info/conversation-info.component.ts
index bfca2d625..8ce92e481 100644
--- a/src/addons/messages/components/conversation-info/conversation-info.component.ts
+++ b/src/addons/messages/components/conversation-info/conversation-info.component.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, Input, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import {
     AddonMessagesConversationFormatted,
     AddonMessagesConversationMember,
@@ -116,7 +115,7 @@ export class AddonMessagesConversationInfoComponent implements OnInit {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async refreshData(refresher?: IonRefresher): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement): Promise<void> {
         const promises: Promise<void>[] = [];
 
         promises.push(AddonMessages.invalidateConversation(this.conversationId));
diff --git a/src/addons/messages/pages/contacts-35/contacts.ts b/src/addons/messages/pages/contacts-35/contacts.ts
index a5dd98e8a..d69838ec0 100644
--- a/src/addons/messages/pages/contacts-35/contacts.ts
+++ b/src/addons/messages/pages/contacts-35/contacts.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import {
     AddonMessagesProvider,
@@ -129,7 +128,7 @@ export class AddonMessagesContacts35Page implements OnInit, OnDestroy {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async refreshData(refresher?: IonRefresher): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement): Promise<void> {
         try {
             if (this.searchString) {
                 // User has searched, update the search.
diff --git a/src/addons/messages/pages/contacts/contacts.ts b/src/addons/messages/pages/contacts/contacts.ts
index 187a39293..94766b892 100644
--- a/src/addons/messages/pages/contacts/contacts.ts
+++ b/src/addons/messages/pages/contacts/contacts.ts
@@ -23,7 +23,6 @@ import {
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
-import { IonRefresher } from '@ionic/angular';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 
 /**
@@ -216,7 +215,7 @@ export class AddonMessagesContactsPage implements OnInit, OnDestroy {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async refreshData(refresher?: IonRefresher): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement): Promise<void> {
         try {
             if (this.selected == 'confirmed') {
                 // No need to invalidate contacts, we always try to get the latest.
diff --git a/src/addons/messages/pages/discussions-35/discussions.ts b/src/addons/messages/pages/discussions-35/discussions.ts
index f82f985ae..5dfa7cac3 100644
--- a/src/addons/messages/pages/discussions-35/discussions.ts
+++ b/src/addons/messages/pages/discussions-35/discussions.ts
@@ -29,7 +29,6 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { Subscription } from 'rxjs';
 import { Translate } from '@singletons';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
@@ -166,7 +165,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
      * @param refreshUnreadCounts Whteher to refresh unread counts.
      * @returns Promise resolved when done.
      */
-    async refreshData(refresher?: IonRefresher, refreshUnreadCounts: boolean = true): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement, refreshUnreadCounts: boolean = true): Promise<void> {
         const promises: Promise<void>[] = [];
         promises.push(AddonMessages.invalidateDiscussionsCache(this.siteId));
 
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.ts b/src/addons/messages/pages/group-conversations/group-conversations.ts
index 0250072b8..c27a34d7d 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import {
@@ -719,7 +719,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param refreshUnreadCounts Whether to refresh unread counts.
      * @returns Promise resolved when done.
      */
-    async refreshData(refresher?: IonRefresher, refreshUnreadCounts: boolean = true): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement, refreshUnreadCounts: boolean = true): Promise<void> {
         // Don't invalidate conversations and so, they always try to get latest data.
         try {
             await AddonMessages.invalidateContactRequestsCountCache(this.siteId);
diff --git a/src/addons/messages/pages/settings/settings.ts b/src/addons/messages/pages/settings/settings.ts
index 8b0a1ab78..91d9e6c2b 100644
--- a/src/addons/messages/pages/settings/settings.ts
+++ b/src/addons/messages/pages/settings/settings.ts
@@ -25,7 +25,6 @@ import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreConstants } from '@/core/constants';
-import { IonRefresher } from '@ionic/angular';
 import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 import { CorePlatform } from '@services/platform';
 
@@ -251,7 +250,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshPreferences(refresher?: IonRefresher): void {
+    refreshPreferences(refresher?: HTMLIonRefresherElement): void {
         AddonMessages.invalidateMessagePreferences().finally(() => {
             this.fetchPreferences().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.ts b/src/addons/mod/assign/pages/submission-list/submission-list.ts
index d0a59e2e0..a92830987 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.ts
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.ts
@@ -16,7 +16,6 @@ import { Component, OnDestroy, AfterViewInit, ViewChild } from '@angular/core';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -208,7 +207,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
      *
      * @param refresher Refresher.
      */
-    refreshList(refresher?: IonRefresher): void {
+    refreshList(refresher?: HTMLIonRefresherElement): void {
         this.refreshAllData(true).finally(() => {
             refresher?.complete();
         });
diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts
index 6749d9f1b..699ff3013 100644
--- a/src/addons/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts
@@ -18,7 +18,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -210,7 +209,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
      *
      * @param refresher Refresher.
      */
-    refreshSubmission(refresher?: IonRefresher): void {
+    refreshSubmission(refresher?: HTMLIonRefresherElement): void {
         this.refreshAllData().finally(() => {
             refresher?.complete();
         });
diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 3d22145cf..0581eae1d 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -24,7 +24,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -232,7 +231,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
         if (this.manager) {
             await CoreUtils.ignoreErrors(Promise.all([
                 this.manager.getSource().invalidateContent(),
diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.ts b/src/addons/mod/chat/pages/session-messages/session-messages.ts
index 8401d485d..e3143eec7 100644
--- a/src/addons/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addons/mod/chat/pages/session-messages/session-messages.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreUser } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -158,7 +157,7 @@ export class AddonModChatSessionMessagesPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshMessages(refresher: IonRefresher): Promise<void> {
+    async refreshMessages(refresher: HTMLIonRefresherElement): Promise<void> {
         try {
             await CoreUtils.ignoreErrors(AddonModChat.invalidateSessionMessages(this.chatId, this.sessionStart, this.groupId));
 
diff --git a/src/addons/mod/chat/pages/sessions/sessions.ts b/src/addons/mod/chat/pages/sessions/sessions.ts
index ac3ce499b..10fb146b2 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.ts
+++ b/src/addons/mod/chat/pages/sessions/sessions.ts
@@ -16,7 +16,6 @@ import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -143,7 +142,7 @@ export class AddonModChatSessionsPage implements OnInit, AfterViewInit, OnDestro
      *
      * @param refresher Refresher.
      */
-    async refreshSessions(refresher: IonRefresher): Promise<void> {
+    async refreshSessions(refresher: HTMLIonRefresherElement): Promise<void> {
         try {
             this.sessions.getSource().setDirty(true);
 
diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts
index 0fff2c131..c8bd10562 100644
--- a/src/addons/mod/data/pages/entry/entry.ts
+++ b/src/addons/mod/data/pages/entry/entry.ts
@@ -17,7 +17,7 @@ import { CoreCommentsCommentsComponent } from '@features/comments/components/com
 import { CoreComments } from '@features/comments/services/comments';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreRatingInfo } from '@features/rating/services/rating';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreGroups, CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -286,7 +286,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshDatabase(refresher?: IonRefresher): void {
+    refreshDatabase(refresher?: HTMLIonRefresherElement): void {
         if (!this.entryLoaded) {
             return;
         }
diff --git a/src/addons/mod/feedback/pages/attempts/attempts.ts b/src/addons/mod/feedback/pages/attempts/attempts.ts
index 817fd2500..17114add8 100644
--- a/src/addons/mod/feedback/pages/attempts/attempts.ts
+++ b/src/addons/mod/feedback/pages/attempts/attempts.ts
@@ -18,7 +18,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
 import { CorePromisedValue } from '@classes/promised-value';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -175,7 +174,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshFeedback(refresher: IonRefresher): Promise<void> {
+    async refreshFeedback(refresher: HTMLIonRefresherElement): Promise<void> {
         const attempts = await this.promisedAttempts;
 
         try {
diff --git a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
index 2046106ff..66a88cd4f 100644
--- a/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -174,7 +173,7 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshFeedback(refresher: IonRefresher): Promise<void> {
+    async refreshFeedback(refresher: HTMLIonRefresherElement): Promise<void> {
         try {
             const promises: Promise<void>[] = [];
 
diff --git a/src/addons/mod/forum/pages/discussion/discussion.ts b/src/addons/mod/forum/pages/discussion/discussion.ts
index 02c77a6c2..3d40cf2da 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.ts
@@ -23,7 +23,7 @@ import { CoreRatingOffline } from '@features/rating/services/rating-offline';
 import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { CoreUser } from '@features/user/services/user';
 import { CanLeave } from '@guards/can-leave';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
@@ -650,7 +650,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
      * @param showErrors If show errors to the user of hide them.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher | null, done?: () => void, showErrors: boolean = false): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement | null, done?: () => void, showErrors: boolean = false): Promise<void> {
         if (this.discussionLoaded) {
             await this.refreshPosts(true, showErrors).finally(() => {
                 refresher?.complete();
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
index 4f3c43b73..c69537590 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts
@@ -34,7 +34,6 @@ import { CoreSync } from '@services/sync';
 import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/forum-offline';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
-import { IonRefresher } from '@ionic/angular';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreTextUtils } from '@services/utils/text';
 import { CanLeave } from '@guards/can-leave';
@@ -453,7 +452,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
      *
      * @param refresher Refresher.
      */
-    refreshGroups(refresher?: IonRefresher): void {
+    refreshGroups(refresher?: HTMLIonRefresherElement): void {
         const promises = [
             CoreGroups.invalidateActivityGroupMode(this.cmId),
             CoreGroups.invalidateActivityAllowedGroups(this.cmId),
diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts
index bed205888..d40f875d6 100644
--- a/src/addons/mod/glossary/pages/entry/entry.ts
+++ b/src/addons/mod/glossary/pages/entry/entry.ts
@@ -24,7 +24,6 @@ import { CoreComments } from '@features/comments/services/comments';
 import { CoreRatingInfo } from '@features/rating/services/rating';
 import { CoreTag } from '@features/tag/services/tag';
 import { FileEntry } from '@ionic-native/file/ngx';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
 import { CoreDomUtils, ToastDuration } from '@services/utils/dom';
@@ -228,7 +227,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
         if (this.onlineEntry && this.glossary?.allowcomments && this.onlineEntry.id > 0 && this.commentsEnabled && this.comments) {
             // Refresh comments asynchronously (without blocking the current promise).
             CoreUtils.ignoreErrors(this.comments.doRefresh());
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
index 3142c9637..6e43c7092 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
@@ -94,7 +93,7 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher: IonRefresher): void {
+    doRefresh(refresher: HTMLIonRefresherElement): void {
         this.refreshData().finally(() => {
             refresher.complete();
         });
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
index f0c2c9faf..dba3a8e9d 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
@@ -97,7 +96,7 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher: IonRefresher): void {
+    doRefresh(refresher: HTMLIonRefresherElement): void {
         this.refreshData().finally(() => {
             refresher.complete();
         });
diff --git a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
index f5eff6eb1..f9b2369cb 100644
--- a/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
+++ b/src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -90,7 +89,7 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher: IonRefresher): void {
+    doRefresh(refresher: HTMLIonRefresherElement): void {
         this.refreshData().finally(() => {
             refresher.complete();
         });
diff --git a/src/addons/mod/imscp/pages/view/view.ts b/src/addons/mod/imscp/pages/view/view.ts
index ccc01af8e..6fb1d7d6b 100644
--- a/src/addons/mod/imscp/pages/view/view.ts
+++ b/src/addons/mod/imscp/pages/view/view.ts
@@ -20,7 +20,6 @@ import { CoreCourseResourceDownloadResult } from '@features/course/classes/main-
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -214,7 +213,7 @@ export class AddonModImscpViewPage implements OnInit {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(Promise.all([
             AddonModImscp.invalidateContent(this.cmId, this.courseId),
             CoreCourseModulePrefetchDelegate.invalidateCourseUpdates(this.courseId), // To detect if IMSCP was updated.
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.ts
index 7ea3706a7..eeb58ea30 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.ts
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreError } from '@classes/errors/error';
 import { CoreUser } from '@features/user/services/user';
@@ -114,7 +113,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher: IonRefresher): void {
+    doRefresh(refresher: HTMLIonRefresherElement): void {
         this.refreshData().finally(() => {
             refresher?.complete();
         });
diff --git a/src/addons/mod/quiz/pages/attempt/attempt.ts b/src/addons/mod/quiz/pages/attempt/attempt.ts
index 7972ac3c5..71f6c87b5 100644
--- a/src/addons/mod/quiz/pages/attempt/attempt.ts
+++ b/src/addons/mod/quiz/pages/attempt/attempt.ts
@@ -15,7 +15,6 @@
 import { isSafeNumber } from '@/core/utils/types';
 import { Component, OnInit } from '@angular/core';
 import { CoreError } from '@classes/errors/error';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -75,7 +74,7 @@ export class AddonModQuizAttemptPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher: IonRefresher): void {
+    doRefresh(refresher: HTMLIonRefresherElement): void {
         this.refreshData().finally(() => {
             refresher.complete();
         });
diff --git a/src/addons/mod/quiz/pages/review/review.ts b/src/addons/mod/quiz/pages/review/review.ts
index 63eeaf7d7..d24d5068b 100644
--- a/src/addons/mod/quiz/pages/review/review.ts
+++ b/src/addons/mod/quiz/pages/review/review.ts
@@ -15,7 +15,7 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { CoreQuestionQuestionParsed } from '@features/question/services/question';
 import { CoreQuestionHelper } from '@features/question/services/question-helper';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -222,7 +222,7 @@ export class AddonModQuizReviewPage implements OnInit {
      *
      * @param refresher Refresher
      */
-    async refreshData(refresher: IonRefresher): Promise<void> {
+    async refreshData(refresher: HTMLIonRefresherElement): Promise<void> {
         const promises: Promise<void>[] = [];
 
         promises.push(AddonModQuiz.invalidateQuizData(this.courseId));
diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts
index 82592509b..ecc6ddad3 100644
--- a/src/addons/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addons/mod/workshop/pages/assessment/assessment.ts
@@ -18,7 +18,6 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreGradesHelper, CoreGradesMenuItem } from '@features/grades/services/grades-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CanLeave } from '@guards/can-leave';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreSync } from '@services/sync';
@@ -343,7 +342,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
      *
      * @param refresher Refresher.
      */
-    refreshAssessment(refresher: IonRefresher): void {
+    refreshAssessment(refresher: HTMLIonRefresherElement): void {
         if (this.loaded) {
             this.refreshAllData().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts
index 81db1a141..08fda91ba 100644
--- a/src/addons/mod/workshop/pages/submission/submission.ts
+++ b/src/addons/mod/workshop/pages/submission/submission.ts
@@ -20,7 +20,7 @@ import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreGradesHelper, CoreGradesMenuItem } from '@features/grades/services/grades-helper';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CanLeave } from '@guards/can-leave';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreSync } from '@services/sync';
@@ -460,7 +460,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy, CanLea
      *
      * @param refresher Refresher.
      */
-    refreshSubmission(refresher: IonRefresher): void {
+    refreshSubmission(refresher: HTMLIonRefresherElement): void {
         if (this.loaded) {
             this.refreshAllData().finally(() => {
                 refresher?.complete();
diff --git a/src/addons/notes/pages/list/list.ts b/src/addons/notes/pages/list/list.ts
index badf1372e..ef174a017 100644
--- a/src/addons/notes/pages/list/list.ts
+++ b/src/addons/notes/pages/list/list.ts
@@ -20,7 +20,7 @@ import { AddonNotesSync, AddonNotesSyncProvider } from '@addons/notes/services/n
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { CoreAnimations } from '@components/animations';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -156,7 +156,7 @@ export class AddonNotesListPage implements OnInit, OnDestroy {
      * @param showSyncErrors Whether to display sync errors or not.
      * @param refresher Refresher instance.
      */
-    refreshNotes(showSyncErrors: boolean, refresher?: IonRefresher): void {
+    refreshNotes(showSyncErrors: boolean, refresher?: HTMLIonRefresherElement): void {
         this.refreshIcon = CoreConstants.ICON_LOADING;
         this.syncIcon = CoreConstants.ICON_LOADING;
 
diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts
index dc935a079..b496b4ea7 100644
--- a/src/addons/notifications/pages/list/list.ts
+++ b/src/addons/notifications/pages/list/list.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { Subscription } from 'rxjs';
 
 import { CoreDomUtils } from '@services/utils/dom';
@@ -205,7 +204,7 @@ export class AddonNotificationsListPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshNotifications(refresher?: IonRefresher): Promise<void> {
+    async refreshNotifications(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationsList());
         await CoreUtils.ignoreErrors(this.fetchNotifications(true));
 
diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts
index 17a87fe72..7b9b891ca 100644
--- a/src/addons/notifications/pages/settings/settings.ts
+++ b/src/addons/notifications/pages/settings/settings.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreConfig } from '@services/config';
 import { CoreLocalNotifications } from '@services/local-notifications';
@@ -192,7 +191,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshPreferences(refresher?: IonRefresher): Promise<void> {
+    async refreshPreferences(refresher?: HTMLIonRefresherElement): Promise<void> {
         try {
             await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationPreferences());
 
diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts
index 4eca6fd5f..43d699e15 100644
--- a/src/addons/privatefiles/pages/index/index.ts
+++ b/src/addons/privatefiles/pages/index/index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { Md5 } from 'ts-md5/dist/md5';
 
 import { CoreNetwork } from '@services/network';
@@ -140,7 +139,7 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         this.refreshFiles().finally(() => {
             refresher?.complete();
         });
diff --git a/src/core/features/block/components/side-blocks/side-blocks.ts b/src/core/features/block/components/side-blocks/side-blocks.ts
index e3c75876c..5a317c800 100644
--- a/src/core/features/block/components/side-blocks/side-blocks.ts
+++ b/src/core/features/block/components/side-blocks/side-blocks.ts
@@ -19,7 +19,6 @@ import { CoreCourse, CoreCourseBlock } from '@features/course/services/course';
 import { CoreBlockHelper } from '../../services/block-helper';
 import { CoreBlockComponent } from '../block/block';
 import { CoreUtils } from '@services/utils/utils';
-import { IonRefresher } from '@ionic/angular';
 import { CoreCoursesDashboard } from '@features/courses/services/dashboard';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreDom } from '@singletons/dom';
@@ -110,7 +109,7 @@ export class CoreBlockSideBlocksComponent implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(this.invalidateBlocks());
 
         await this.loadContent().finally(() => {
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index f1401ecb6..b5f4d3c4e 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -26,7 +26,7 @@ import {
     CoreCommentsSync,
     CoreCommentsSyncProvider,
 } from '@features/comments/services/comments-sync';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { ContextLevel, CoreConstants } from '@/core/constants';
 import { CoreNavigator } from '@services/navigator';
 import { NgZone, Translate } from '@singletons';
@@ -249,7 +249,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
      * @param refresher Refresher.
      * @returns Resolved when done.
      */
-    async refreshComments(showErrors: boolean, refresher?: IonRefresher): Promise<void> {
+    async refreshComments(showErrors: boolean, refresher?: HTMLIonRefresherElement): Promise<void> {
         this.commentsLoaded = false;
         this.refreshIcon = CoreConstants.ICON_LOADING;
         this.syncIcon = CoreConstants.ICON_LOADING;
diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts
index 80b58ad71..8acc3e872 100644
--- a/src/core/features/course/classes/main-resource-component.ts
+++ b/src/core/features/course/classes/main-resource-component.ts
@@ -15,7 +15,6 @@
 import { CoreConstants } from '@/core/constants';
 import { OnInit, OnDestroy, Input, Output, EventEmitter, Component, Optional, Inject } from '@angular/core';
 import { CoreAnyError } from '@classes/errors/error';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -121,7 +120,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      * @param showErrors If show errors to the user of hide them.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher | null, showErrors = false): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement | null, showErrors = false): Promise<void> {
         if (!this.module) {
             // Module can be undefined if course format changes from single activity to weekly/topics.
             return;
diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts
index 341f3d215..784a0d09a 100644
--- a/src/core/features/course/components/course-format/course-format.ts
+++ b/src/core/features/course/components/course-format/course-format.ts
@@ -39,7 +39,7 @@ import {
 } from '@features/course/services/course-helper';
 import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreCourseCourseIndexComponent, CoreCourseIndexSectionWithModule } from '../course-index/course-index';
 import { CoreBlockHelper } from '@features/block/services/block-helper';
@@ -567,7 +567,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
      * @param afterCompletionChange Whether the refresh is due to a completion change.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
         const promises = this.dynamicComponents?.map(async (component) => {
             await component.callComponentMethod('doRefresh', refresher, done, afterCompletionChange);
         }) || [];
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index fc31f9ffe..0cfe37c73 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -18,7 +18,6 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
 import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { IonRefresher } from '@ionic/angular';
 import { CoreCourseModuleCompletionData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourse } from '@features/course/services/course';
 import type { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
@@ -80,7 +79,7 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
      * @param afterCompletionChange Whether the refresh is due to a completion change.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
         if (afterCompletionChange) {
             // Don't refresh the view after a completion change since completion isn't displayed.
             return;
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 88345545b..ba640a94f 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, ViewChild, OnInit, OnDestroy, forwardRef, ChangeDetectorRef } from '@angular/core';
-import { IonContent, IonRefresher } from '@ionic/angular';
+import { IonContent } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -291,7 +291,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(this.invalidateData());
 
         try {
diff --git a/src/core/features/course/pages/course-summary/course-summary.page.ts b/src/core/features/course/pages/course-summary/course-summary.page.ts
index 4e6c5547b..73512e822 100644
--- a/src/core/features/course/pages/course-summary/course-summary.page.ts
+++ b/src/core/features/course/pages/course-summary/course-summary.page.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
-import { ActionSheetButton, IonRefresher } from '@ionic/angular';
+import { ActionSheetButton } from '@ionic/angular';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -402,7 +402,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
      *
      * @param refresher The refresher if this was triggered by a Pull To Refresh.
      */
-    async refreshData(refresher?: IonRefresher): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement): Promise<void> {
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCourses.invalidateUserCourses());
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.ts
index d10977796..d93fa4788 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.ts
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.ts
@@ -20,7 +20,6 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreConstants } from '@/core/constants';
-import { IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
@@ -167,7 +166,7 @@ export class CoreCourseListModTypePage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshData(refresher: IonRefresher): Promise<void> {
+    async refreshData(refresher: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreCourse.invalidateSections(this.courseId));
 
         try {
diff --git a/src/core/features/course/pages/module-preview/module-preview.ts b/src/core/features/course/pages/module-preview/module-preview.ts
index fc154b4bd..c5192b9d6 100644
--- a/src/core/features/course/pages/module-preview/module-preview.ts
+++ b/src/core/features/course/pages/module-preview/module-preview.ts
@@ -20,7 +20,6 @@ import {
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -140,7 +139,7 @@ export class CoreCourseModulePreviewPage implements OnInit {
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement): Promise<void> {
 
         await CoreCourse.invalidateModule(this.module.id);
 
diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts
index dbd4b224d..694743908 100644
--- a/src/core/features/course/services/module-delegate.ts
+++ b/src/core/features/course/services/module-delegate.ts
@@ -14,7 +14,6 @@
 
 import { Injectable, Type } from '@angular/core';
 import { SafeUrl } from '@angular/platform-browser';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSite } from '@classes/site';
 import { CoreCourseModuleDefaultHandler } from './handlers/default-module';
@@ -234,7 +233,7 @@ export interface CoreCourseModuleMainComponent {
      * @param showErrors If show errors to the user of hide them.
      * @returns Promise resolved when done.
      */
-    doRefresh(refresher?: IonRefresher | null, showErrors?: boolean): Promise<void>;
+    doRefresh(refresher?: HTMLIonRefresherElement | null, showErrors?: boolean): Promise<void>;
 }
 
 /**
diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts
index f081616d8..f770425d2 100644
--- a/src/core/features/courses/pages/categories/categories.ts
+++ b/src/core/features/courses/pages/categories/categories.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -163,7 +162,7 @@ export class CoreCoursesCategoriesPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshCategories(refresher?: IonRefresher): void {
+    refreshCategories(refresher?: HTMLIonRefresherElement): void {
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCourses.invalidateUserCourses());
diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts
index a459879ee..5db3bed54 100644
--- a/src/core/features/courses/pages/dashboard/dashboard.ts
+++ b/src/core/features/courses/pages/dashboard/dashboard.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreCourses } from '../../services/courses';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -146,7 +145,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshDashboard(refresher: IonRefresher): void {
+    refreshDashboard(refresher: HTMLIonRefresherElement): void {
         const promises: Promise<void>[] = [];
 
         promises.push(CoreCoursesDashboard.invalidateDashboardBlocks());
diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts
index f61ba3d0a..0a3d460ec 100644
--- a/src/core/features/courses/pages/list/list.ts
+++ b/src/core/features/courses/pages/list/list.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfo } from '@features/courses/services/courses-helper';
-import { IonRefresher } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -215,7 +214,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshCourses(refresher: IonRefresher): void {
+    refreshCourses(refresher: HTMLIonRefresherElement): void {
         const promises: Promise<void>[] = [];
 
         if (!this.searchMode) {
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 23612dac6..ddac3c1ed 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -22,7 +22,6 @@ import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { CoreCourseBlock } from '@features/course/services/course';
 import { CoreCoursesDashboard, CoreCoursesDashboardProvider } from '@features/courses/services/dashboard';
 import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager';
-import { IonRefresher } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
@@ -181,7 +180,7 @@ export class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective {
      *
      * @param refresher Refresher.
      */
-    async refresh(refresher?: IonRefresher): Promise<void> {
+    async refresh(refresher?: HTMLIonRefresherElement): Promise<void> {
 
         const promises: Promise<void>[] = [];
 
diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts
index d4383aa78..40d8d4ee4 100644
--- a/src/core/features/grades/pages/course/course.page.ts
+++ b/src/core/features/grades/pages/course/course.page.ts
@@ -14,7 +14,6 @@
 
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { AfterViewInit, Component, ElementRef, OnDestroy } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreGrades } from '@features/grades/services/grades';
@@ -185,7 +184,7 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshGrades(refresher: IonRefresher): Promise<void> {
+    async refreshGrades(refresher: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreGrades.invalidateCourseGradesData(this.courseId, this.userId));
         await CoreUtils.ignoreErrors(this.fetchGrades());
 
diff --git a/src/core/features/grades/pages/courses/courses.ts b/src/core/features/grades/pages/courses/courses.ts
index 79e55d35a..91f309cbb 100644
--- a/src/core/features/grades/pages/courses/courses.ts
+++ b/src/core/features/grades/pages/courses/courses.ts
@@ -19,7 +19,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreGradesCoursesSource } from '@features/grades/classes/grades-courses-source';
 import { CoreGrades } from '@features/grades/services/grades';
-import { IonRefresher } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -66,7 +65,7 @@ export class CoreGradesCoursesPage implements OnDestroy, AfterViewInit {
      *
      * @param refresher Refresher.
      */
-    async refreshCourses(refresher: IonRefresher): Promise<void> {
+    async refreshCourses(refresher: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreGrades.invalidateCoursesGradesData());
         await CoreUtils.ignoreErrors(this.courses.reload());
 
diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.ts b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
index 0e48d1701..5be288272 100644
--- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts
+++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
@@ -20,7 +20,6 @@ import {
     CoreReportBuilderRetrieveReportMapped,
     REPORT_ROWS_LIMIT,
 } from '@features/reportbuilder/services/reportbuilder';
-import { IonRefresher } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
@@ -170,7 +169,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
      *
      * @param ionRefresher ionic refresher.
      */
-    async refreshReport(ionRefresher?: IonRefresher): Promise<void> {
+    async refreshReport(ionRefresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreReportBuilder.invalidateReport());
         this.updateState({ page: 0, canLoadMoreRows: false });
         await CoreUtils.ignoreErrors(this.getReport());
diff --git a/src/core/features/reportbuilder/pages/list/list.ts b/src/core/features/reportbuilder/pages/list/list.ts
index d67c23af3..6d951d1a9 100644
--- a/src/core/features/reportbuilder/pages/list/list.ts
+++ b/src/core/features/reportbuilder/pages/list/list.ts
@@ -17,7 +17,6 @@ import { CoreListItemsManager } from '@classes/items-management/list-items-manag
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreReportBuilderReportsSource } from '@features/reportbuilder/classes/reports-source';
 import { CoreReportBuilder, CoreReportBuilderReport, REPORTS_LIST_LIMIT } from '@features/reportbuilder/services/reportbuilder';
-import { IonRefresher } from '@ionic/angular';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -114,7 +113,7 @@ export class CoreReportBuilderListPage implements AfterViewInit, OnDestroy {
      *
      * @param ionRefresher ionRefresher.
      */
-    async refreshReports(ionRefresher?: IonRefresher): Promise<void> {
+    async refreshReports(ionRefresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreReportBuilder.invalidateReportsList());
         await CoreUtils.ignoreErrors(this.fetchReports(true));
         await ionRefresher?.complete();
diff --git a/src/core/features/search/components/global-search-filters/global-search-filters.component.ts b/src/core/features/search/components/global-search-filters/global-search-filters.component.ts
index ca7d6c3b9..75eae485b 100644
--- a/src/core/features/search/components/global-search-filters/global-search-filters.component.ts
+++ b/src/core/features/search/components/global-search-filters/global-search-filters.component.ts
@@ -22,7 +22,6 @@ import {
 } from '@features/search/services/global-search';
 import { CoreEvents } from '@singletons/events';
 import { ModalController } from '@singletons';
-import { IonRefresher } from '@ionic/angular';
 import { CoreUtils } from '@services/utils/utils';
 
 type Filter<T=unknown> = T & { checked: boolean };
@@ -145,7 +144,7 @@ export class CoreSearchGlobalSearchFiltersComponent implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshFilters(refresher?: IonRefresher): Promise<void> {
+    async refreshFilters(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(Promise.all([
             CoreSearchGlobalSearch.invalidateSearchAreas(),
             CoreCourses.invalidateUserCourses(),
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index bfe1dd30a..847054437 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSettingsHandlerToDisplay, CoreSettingsPageHandlerToDisplay } from '../../services/settings-delegate';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -140,7 +139,7 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         this.handlers.getSource().setDirty(true);
         this.fetchData().finally(() => {
             refresher?.complete();
diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts
index 7a3265a2c..48afef177 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.ts
+++ b/src/core/features/settings/pages/space-usage/space-usage.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
@@ -155,7 +154,7 @@ export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher event.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         this.loadSiteData().finally(() => {
             refresher?.complete();
         });
diff --git a/src/core/features/sharedfiles/components/list/list.ts b/src/core/features/sharedfiles/components/list/list.ts
index 694301ea7..b2d802af2 100644
--- a/src/core/features/sharedfiles/components/list/list.ts
+++ b/src/core/features/sharedfiles/components/list/list.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, OnDestroy, Input, Output, EventEmitter } from '@angular/core';
 import { FileEntry, DirectoryEntry } from '@ionic-native/file/ngx';
-import { IonRefresher } from '@ionic/angular';
 import { Md5 } from 'ts-md5';
 
 import { CoreSharedFiles } from '@features/sharedfiles/services/sharedfiles';
@@ -82,7 +81,7 @@ export class CoreSharedFilesListComponent implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    refreshFiles(refresher: IonRefresher): void {
+    refreshFiles(refresher: HTMLIonRefresherElement): void {
         this.loadFiles().finally(() => {
             refresher.complete();
         });
diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts
index 3d2d72c7b..3bfda7dc0 100644
--- a/src/core/features/sitehome/pages/index/index.ts
+++ b/src/core/features/sitehome/pages/index/index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { ActivatedRoute } from '@angular/router';
 
 import { CoreSite, CoreSiteConfig } from '@classes/site';
@@ -163,7 +162,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    doRefresh(refresher?: IonRefresher): void {
+    doRefresh(refresher?: HTMLIonRefresherElement): void {
         const promises: Promise<unknown>[] = [];
 
         promises.push(CoreCourse.invalidateSections(this.siteHomeId));
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index efe971370..26e2de463 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnChanges, Input, ViewChild, HostBinding } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreCourseFormatComponent } from '@features/course/components/course-format/course-format';
 import { CoreCourseSection } from '@features/course/services/course-helper';
@@ -93,7 +92,7 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
      * @param afterCompletionChange Whether the refresh is due to a completion change.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void, afterCompletionChange?: boolean): Promise<void> {
         await this.content?.refreshContent(afterCompletionChange);
     }
 
diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts
index 5fded906b..71f1934f4 100644
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@@ -30,7 +30,6 @@ import {
     CoreSitePluginsContent,
     CoreSitePluginsCourseModuleHandlerData,
 } from '@features/siteplugins/services/siteplugins';
-import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSitePluginsPluginContentComponent, CoreSitePluginsPluginContentLoadedData } from '../plugin-content/plugin-content';
@@ -122,7 +121,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      * @param refresher Refresher.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher | null): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement | null): Promise<void> {
         try {
             await this.content?.refreshContent(false);
         } finally {
diff --git a/src/core/features/siteplugins/pages/course-option/course-option.ts b/src/core/features/siteplugins/pages/course-option/course-option.ts
index 564b3ea57..890bcbe23 100644
--- a/src/core/features/siteplugins/pages/course-option/course-option.ts
+++ b/src/core/features/siteplugins/pages/course-option/course-option.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSitePluginsPluginContentComponent } from '@features/siteplugins/components/plugin-content/plugin-content';
 import { CoreSitePlugins, CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
@@ -70,7 +69,7 @@ export class CoreSitePluginsCourseOptionPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshData(refresher: IonRefresher): Promise<void> {
+    async refreshData(refresher: HTMLIonRefresherElement): Promise<void> {
         try {
             await this.content?.refreshContent(false);
         } finally {
diff --git a/src/core/features/siteplugins/pages/module-index/module-index.ts b/src/core/features/siteplugins/pages/module-index/module-index.ts
index 053eb374f..3a37e712d 100644
--- a/src/core/features/siteplugins/pages/module-index/module-index.ts
+++ b/src/core/features/siteplugins/pages/module-index/module-index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CanLeave } from '@guards/can-leave';
@@ -73,7 +72,7 @@ export class CoreSitePluginsModuleIndexPage implements OnInit, CanLeave {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher: IonRefresher): void {
+    refreshData(refresher: HTMLIonRefresherElement): void {
         this.content?.doRefresh().finally(() => {
             refresher.complete();
         });
diff --git a/src/core/features/siteplugins/pages/plugin/plugin.ts b/src/core/features/siteplugins/pages/plugin/plugin.ts
index 644325866..6ad96e620 100644
--- a/src/core/features/siteplugins/pages/plugin/plugin.ts
+++ b/src/core/features/siteplugins/pages/plugin/plugin.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSiteWSPreSets } from '@classes/site';
 import { CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
@@ -61,7 +60,7 @@ export class CoreSitePluginsPluginPage implements OnInit, CanLeave {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher: IonRefresher): void {
+    refreshData(refresher: HTMLIonRefresherElement): void {
         this.content?.refreshContent(false).finally(() => {
             refresher.complete();
         });
diff --git a/src/core/features/tag/pages/index-area/index-area.ts b/src/core/features/tag/pages/index-area/index-area.ts
index 0c8577e05..567baa48b 100644
--- a/src/core/features/tag/pages/index-area/index-area.ts
+++ b/src/core/features/tag/pages/index-area/index-area.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, Type } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTag } from '@features/tag/services/tag';
 import { ActivatedRoute } from '@angular/router';
@@ -153,7 +152,7 @@ export class CoreTagIndexAreaPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    async refreshData(refresher?: IonRefresher): Promise<void> {
+    async refreshData(refresher?: HTMLIonRefresherElement): Promise<void> {
         try {
             await CoreTag.invalidateTagIndexPerArea(
                 this.tagId,
diff --git a/src/core/features/tag/pages/index/index.ts b/src/core/features/tag/pages/index/index.ts
index 84dcd5bb9..fba315863 100644
--- a/src/core/features/tag/pages/index/index.ts
+++ b/src/core/features/tag/pages/index/index.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTag } from '@features/tag/services/tag';
 import { CoreTagAreaDelegate } from '@features/tag/services/tag-area-delegate';
@@ -149,7 +148,7 @@ export class CoreTagIndexPage implements OnInit {
      *
      * @param refresher Refresher.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         CoreTag.invalidateTagIndexPerArea(
             this.tagId,
             this.tagName,
diff --git a/src/core/features/tag/pages/search/search.ts b/src/core/features/tag/pages/search/search.ts
index a608bd197..f6ce23666 100644
--- a/src/core/features/tag/pages/search/search.ts
+++ b/src/core/features/tag/pages/search/search.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -130,7 +129,7 @@ export class CoreTagSearchPage implements OnInit {
      *
      * @param refresher Refresher event.
      */
-    refreshData(refresher?: IonRefresher): void {
+    refreshData(refresher?: HTMLIonRefresherElement): void {
         CoreUtils.allPromises([
             CoreTag.invalidateTagCollections(),
             CoreTag.invalidateTagCloud(this.collectionId, undefined, undefined, this.query),
diff --git a/src/core/features/user/pages/about/about.ts b/src/core/features/user/pages/about/about.ts
index a43734ce4..e6e38c9ee 100644
--- a/src/core/features/user/pages/about/about.ts
+++ b/src/core/features/user/pages/about/about.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -202,7 +201,7 @@ export class CoreUserAboutPage implements OnInit, OnDestroy {
      * @param event Event.
      * @returns Promise resolved when done.
      */
-    async refreshUser(event?: IonRefresher): Promise<void> {
+    async refreshUser(event?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreUser.invalidateUserCache(this.userId));
 
         await this.fetchUser();
diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts
index 78c4d81ca..12aff7f44 100644
--- a/src/core/features/user/pages/participants/participants.page.ts
+++ b/src/core/features/user/pages/participants/participants.page.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 
 import { CoreApp } from '@services/app';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -136,7 +135,7 @@ export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestro
      *
      * @param refresher Refresher.
      */
-    async refreshParticipants(refresher: IonRefresher): Promise<void> {
+    async refreshParticipants(refresher: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(CoreUser.invalidateParticipantsList(this.courseId));
         await CoreUtils.ignoreErrors(this.fetchParticipants(true));
 
diff --git a/src/core/features/user/pages/profile/profile.ts b/src/core/features/user/pages/profile/profile.ts
index dd299b24f..cbbb6e5c5 100644
--- a/src/core/features/user/pages/profile/profile.ts
+++ b/src/core/features/user/pages/profile/profile.ts
@@ -14,7 +14,6 @@
 
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { Subscription } from 'rxjs';
 
 import { CoreSite } from '@classes/site';
@@ -188,7 +187,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
      * @param event Event.
      * @returns Promise resolved when done.
      */
-    async refreshUser(event?: IonRefresher): Promise<void> {
+    async refreshUser(event?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(Promise.all([
             CoreUser.invalidateUserCache(this.userId),
             CoreCourses.invalidateUserNavigationOptions(),

From 258d12f4d074dad26d835e16ecb4738c2332b070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 14 Nov 2023 11:56:13 +0100
Subject: [PATCH 11/17] MOBILE-3947 styles: Improve drop shadows

---
 .../components/split-view/split-view.scss     |  13 +++++--------
 .../components/user-tour/user-tour.scss       |   4 ++++
 ...nt-navigate-in-grades-tab-on-tablet_14.png | Bin 34294 -> 34146 bytes
 src/theme/theme.base.scss                     |   1 +
 src/theme/theme.light.scss                    |   2 ++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss
index 1024e55a1..7ff93d8e5 100644
--- a/src/core/components/split-view/split-view.scss
+++ b/src/core/components/split-view/split-view.scss
@@ -3,10 +3,8 @@
 :host {
     --menu-min-width: 270px;
     --menu-max-width: 28%;
-    --menu-box-shadow: var(--core-menu-box-shadow-end);
+    --menu-box-shadow: var(--drop-shadow-end);
     --menu-z: 2;
-    --menu-border-width: 1px;
-    --menu-border-color: var(--stroke);
     --menu-display: flex;
     --content-display: block;
     --content-outlet-display: none;
@@ -35,16 +33,17 @@
     }
 
     .menu {
-        box-shadow: var(--menu-box-shadow);
         z-index: var(--menu-z);
         display: var(--menu-display);
         flex-shrink: 0;
         order: -1;
         width: 100%;
-        @include border-start(0);
-        @include border-end(var(--menu-border-width), solid, var(--menu-border-color));
         min-width: var(--menu-min-width);
         max-width: var(--menu-max-width);
+
+        &::part(scroll) {
+            box-shadow: var(--menu-box-shadow);
+        }
     }
 
     .content-outlet {
@@ -71,7 +70,6 @@
     --menu-max-width: 100%;
     --content-display: none;
     --content-placeholder-display: none;
-    --menu-border-width: 0px;
     --menu-box-shadow: none;
     --menu-z: 0px;
     --selected-item-border-width: 0px;
@@ -80,7 +78,6 @@
 
 :host(.content-only) {
     --menu-display: none;
-    --menu-border-width: 0px;
 }
 
 :host(.outlet-activated) {
diff --git a/src/core/features/usertours/components/user-tour/user-tour.scss b/src/core/features/usertours/components/user-tour/user-tour.scss
index 50e03506d..84600c0d3 100644
--- a/src/core/features/usertours/components/user-tour/user-tour.scss
+++ b/src/core/features/usertours/components/user-tour/user-tour.scss
@@ -55,6 +55,10 @@
         justify-content: center;
     }
 
+    h1 {
+        margin-top: 0px;
+    }
+
 }
 
 :host-context(html.dark) {
diff --git a/src/tests/behat/snapshots/it-navigates-properly-in-pages-with-a-split-view-component-navigate-in-grades-tab-on-tablet_14.png b/src/tests/behat/snapshots/it-navigates-properly-in-pages-with-a-split-view-component-navigate-in-grades-tab-on-tablet_14.png
index f1033553a107e3fd0c7882aa18da49f847baa527..956b8790ca287e4d8c7c7a23662676568a333c4a 100644
GIT binary patch
literal 34146
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

literal 34294
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%0A|+t`
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

diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 58cbb603c..c6ef546ae 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1720,6 +1720,7 @@ ion-grid.core-no-grid > ion-row {
 
 .core-footer-shadow [collapsible-footer] {
     box-shadow: var(--drop-shadow-top, none);
+    clip-path: inset(-8px 0px 0px 0px); // Only show shadow at top.
 }
 [collapsible-footer] {
     transition: box-shadow 0.5s;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 2077ad9d7..4778e4428 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -86,6 +86,8 @@ html {
     --drop-shadow-color: 0, 0, 0, 0.5;
     --drop-shadow-top: 0px 2px 5px rgba(var(--drop-shadow-color));
     --drop-shadow-bottom: 0px -2px 5px rgba(var(--drop-shadow-color));
+    --drop-shadow-end: -2px 0px 5px rgba(var(--drop-shadow-color));
+    --drop-shadow-start: 2px 0px 5px rgba(var(--drop-shadow-color));
 
     --ion-text-color: var(--text-color);
     --ion-text-color-rgb: #{$text-color-rgb};

From 6569547cdd56f879dc3c82aa0ba4a12f34f5b8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Nov 2023 16:01:08 +0100
Subject: [PATCH 12/17] MOBILE-3947 dev: Remove non existing sites file storage

---
 src/core/features/settings/pages/dev/dev.html | 10 ++++++
 src/core/features/settings/pages/dev/dev.ts   | 12 +++++++
 src/core/services/file.ts                     | 32 +++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index b817c61ce..0daa68c2b 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -79,6 +79,16 @@
             </ion-label>
         </ion-item>
 
+        <ion-item class="ion-text-wrap">
+            <ion-label>
+                <p class="item-heading">Clean file storage</p>
+                <p>Clear deleted sites from file storage and temp folder</p>
+            </ion-label>
+            <ion-button (click)="clearFileStorage()" aria-label="Clear File Storage" fill="clear" slot="end">
+                <ion-icon slot="icon-only" aria-hidden="true" name="fas-broom"></ion-icon>
+            </ion-button>
+        </ion-item>
+
         <ng-container *ngIf="siteId">
             <ion-item-divider>
                 <ion-label>
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
index dd4a6f48e..3a7072d9a 100644
--- a/src/core/features/settings/pages/dev/dev.ts
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -20,6 +20,7 @@ import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreUserTours } from '@features/usertours/services/user-tours';
 import { CoreCacheManager } from '@services/cache-manager';
 import { CoreConfig } from '@services/config';
+import { CoreFile } from '@services/file';
 import { CoreNavigator } from '@services/navigator';
 import { CorePlatform } from '@services/platform';
 import { CoreSites } from '@services/sites';
@@ -196,6 +197,17 @@ export class CoreSettingsDevPage implements OnInit {
         await CoreDomUtils.showToast('Caches invalidated', true, ToastDuration.LONG);
     }
 
+    /**
+     * Delete all data from the app.
+     */
+    async clearFileStorage(): Promise<void> {
+        const sites = await CoreSites.getSitesIds();
+        await CoreFile.clearDeletedSitesFolder(sites);
+        await CoreFile.clearTmpFolder();
+
+        CoreDomUtils.showToast('File storage cleared');
+    }
+
     async setEnabledStagingSites(enabled: boolean): Promise<void> {
         if (this.enableStagingSites === this.previousEnableStagingSites) {
             return;
diff --git a/src/core/services/file.ts b/src/core/services/file.ts
index 0f3798ce0..939cea4ee 100644
--- a/src/core/services/file.ts
+++ b/src/core/services/file.ts
@@ -1134,6 +1134,38 @@ export class CoreFileProvider {
         await CoreUtils.ignoreErrors(this.removeDir(CoreFileProvider.TMPFOLDER));
     }
 
+    /**
+     * Remove deleted sites folders.
+     *
+     * @returns Promise resolved when done.
+     */
+    async clearDeletedSitesFolder(existingSiteNames: string[]): Promise<void> {
+        // Ignore errors because the folder might not exist.
+        const dirPath = CoreFileProvider.SITESFOLDER;
+
+        // Get the directory contents.
+        try {
+            const contents = await this.getDirectoryContents(dirPath);
+
+            if (!contents.length) {
+                return;
+            }
+
+            const promises: Promise<void>[] = contents.map(async (file) => {
+                if (file.isDirectory) {
+                    if (!existingSiteNames.includes(file.name)) {
+                        // Site does not exist... delete it.
+                        await CoreUtils.ignoreErrors(this.removeDir(this.getSiteFolder(file.name)));
+                    }
+                }
+            });
+
+            await Promise.all(promises);
+        } catch {
+            // Ignore errors, maybe it doesn't exist.
+        }
+    }
+
     /**
      * Given a folder path and a list of used files, remove all the files of the folder that aren't on the list of used files.
      *

From 7a4bf21d3cc69454b763a320ee4275b77ebb042a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Nov 2023 15:22:23 +0100
Subject: [PATCH 13/17] MOBILE-3947 progressbar: Fix progress bar strict types

---
 .../progress-bar/core-progress-bar.html       |  8 +--
 .../components/progress-bar/progress-bar.ts   | 60 +++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/core/components/progress-bar/core-progress-bar.html b/src/core/components/progress-bar/core-progress-bar.html
index dc7dc744e..2739ea78b 100644
--- a/src/core/components/progress-bar/core-progress-bar.html
+++ b/src/core/components/progress-bar/core-progress-bar.html
@@ -1,6 +1,6 @@
-<ng-container *ngIf="progress >= 0">
-    <progress max="100" [value]="progress" role="progressbar" [attr.aria-valuenow]="progress" [attr.aria-valuetext]="progressBarValueText"
-        [attr.aria-describedby]="ariaDescribedBy">
+<ng-container *ngIf="progressNumber >= 0">
+    <progress max="100" [value]="progressNumber" role="progressbar" [attr.aria-valuenow]="progressNumber"
+        [attr.aria-valuetext]="progressBarValueText" [attr.aria-describedby]="ariaDescribedBy">
     </progress>
     <div class="core-progress-text">
         <span class="sr-only" *ngIf="a11yText">{{ a11yText | translate }}</span>
@@ -8,4 +8,4 @@
     </div>
 </ng-container>
 
-<ion-progress-bar *ngIf="progress < 0" [color]="color" type="indeterminate"></ion-progress-bar>
+<ion-progress-bar *ngIf="progressNumber < 0" [color]="color" type="indeterminate"></ion-progress-bar>
diff --git a/src/core/components/progress-bar/progress-bar.ts b/src/core/components/progress-bar/progress-bar.ts
index 357d948e5..932e63ddc 100644
--- a/src/core/components/progress-bar/progress-bar.ts
+++ b/src/core/components/progress-bar/progress-bar.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, OnChanges, SimpleChange, ChangeDetectionStrategy, ElementRef, OnInit } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChange, ChangeDetectionStrategy, ElementRef } from '@angular/core';
 import { SafeStyle } from '@angular/platform-browser';
 import { DomSanitizer, Translate } from '@singletons';
 
@@ -28,7 +28,7 @@ import { DomSanitizer, Translate } from '@singletons';
     styleUrls: ['progress-bar.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CoreProgressBarComponent implements OnInit, OnChanges {
+export class CoreProgressBarComponent implements OnChanges {
 
     @Input() progress!: number | string; // Percentage from 0 to 100. Negative number will show an indeterminate progress bar.
     @Input() text?: string; // Percentage in text to be shown at the right. If not defined, progress will be used.
@@ -38,6 +38,7 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
 
     width?: SafeStyle;
     progressBarValueText?: string;
+    progressNumber = 0;
 
     protected textSupplied = false;
     protected element: HTMLElement;
@@ -46,21 +47,14 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
         this.element = elementRef.nativeElement;
     }
 
-    /**
-     * @inheritdoc
-     */
-    ngOnInit(): void {
-        if (this.color) {
-            this.element.classList.add('ion-color', 'ion-color-' + this.color);
-        }
-    }
-
     /**
      * @inheritdoc
      */
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
         if (changes.color) {
-            this.element.classList.remove('ion-color', 'ion-color-' + changes.color.previousValue);
+            if (changes.color.previousValue) {
+                this.element.classList.remove('ion-color', 'ion-color-' + changes.color.previousValue);
+            }
             if (changes.color.currentValue) {
                 this.element.classList.add('ion-color', 'ion-color-' + changes.color.currentValue);
             }
@@ -73,24 +67,7 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
 
         if (changes.progress) {
             // Progress has changed.
-            if (typeof this.progress == 'string') {
-                this.progress = parseInt(this.progress, 10);
-            }
-
-            if (this.progress < 0 || isNaN(this.progress)) {
-                this.progress = -1;
-            }
-
-            if (this.progress != -1) {
-                // Remove decimals.
-                this.progress = Math.floor(this.progress);
-
-                if (!this.textSupplied) {
-                    this.text = Translate.instant('core.percentagenumber', { $a: this.progress });
-                }
-
-                this.width = DomSanitizer.bypassSecurityTrustStyle(this.progress + '%');
-            }
+            this.updateProgress();
         }
 
         if (changes.text || changes.progress || changes.a11yText) {
@@ -98,4 +75,27 @@ export class CoreProgressBarComponent implements OnInit, OnChanges {
         }
     }
 
+    /**
+     * Update progress because it has changed.
+     */
+    protected updateProgress(): void {
+        // Progress has changed.
+        this.progressNumber = Number(this.progress);
+
+        if (this.progressNumber < 0 || isNaN(this.progressNumber)) {
+            this.progressNumber = -1;
+
+            return;
+        }
+
+        // Remove decimals.
+        this.progressNumber = Math.floor(this.progressNumber);
+
+        if (!this.textSupplied) {
+            this.text = Translate.instant('core.percentagenumber', { $a: this.progressNumber });
+        }
+
+        this.width = DomSanitizer.bypassSecurityTrustStyle(this.progressNumber + '%');
+    }
+
 }

From ce36245d8368ebcaf2da5583e07456cf65836a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Nov 2023 23:36:35 +0100
Subject: [PATCH 14/17] MOBILE-3947 chore: Move replaceTags to CoreDom

---
 .../rich-text-editor/rich-text-editor.ts      | 36 +++++---------
 src/core/singletons/dom.ts                    | 48 +++++++++++++++++++
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
index 6df15894d..74bf1f1f5 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts
@@ -189,8 +189,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
         }
 
         // Update tags for a11y.
-        this.replaceTags('b', 'strong');
-        this.replaceTags('i', 'em');
+        this.replaceTags(['b', 'i'], ['strong', 'em']);
 
         if (this.shouldAutoSaveDrafts()) {
             this.restoreDraft();
@@ -476,8 +475,8 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
         // Modify the DOM directly so the keyboard stays open.
         if (this.rteEnabled) {
             // Update tags for a11y.
-            this.replaceTags('b', 'strong');
-            this.replaceTags('i', 'em');
+            this.replaceTags(['b', 'i'], ['strong', 'em']);
+
             this.editorElement?.removeAttribute('hidden');
             const textareaInputElement = await this.textarea?.getInputElement();
             textareaInputElement?.setAttribute('hidden', '');
@@ -647,39 +646,26 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit,
         document.execCommand(command, false);
 
         // Modern browsers are using non a11y tags, so replace them.
-        if (command == 'bold') {
-            this.replaceTags('b', 'strong');
+        if (command === 'bold') {
+            this.replaceTags(['b'], ['strong']);
         } else if (command == 'italic') {
-            this.replaceTags('i', 'em');
+            this.replaceTags(['i'], ['em']);
         }
     }
 
     /**
      * Replace tags for a11y.
      *
-     * @param originTag      Origin tag to be replaced.
-     * @param destinationTag Destination tag to replace.
+     * @param originTag      Origin tags to be replaced.
+     * @param destinationTag Destination tags to replace.
      */
-    protected replaceTags(originTag: string, destinationTag: string): void {
+    protected replaceTags(originTags: string[], destinationTags: string[]): void {
         if (!this.editorElement) {
             return;
         }
 
-        const elems = Array.from(this.editorElement.getElementsByTagName(originTag));
-
-        elems.forEach((elem) => {
-            const newElem = document.createElement(destinationTag);
-            newElem.innerHTML = elem.innerHTML;
-
-            if (elem.hasAttributes()) {
-                const attrs = Array.from(elem.attributes);
-                attrs.forEach((attr) => {
-                    newElem.setAttribute(attr.name, attr.value);
-                });
-            }
-
-            elem.parentNode?.replaceChild(newElem, elem);
-        });
+        this.editorElement =
+            CoreDom.replaceTags(this.editorElement, originTags, destinationTags);
 
         this.onChange();
     }
diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts
index eb3798944..e67b78ba4 100644
--- a/src/core/singletons/dom.ts
+++ b/src/core/singletons/dom.ts
@@ -617,6 +617,54 @@ export class CoreDom {
         return value;
     }
 
+    /**
+     * Replace tags on HTMLElement.
+     *
+     * @param element HTML Element where to replace the tags.
+     * @param originTags Origin tag to be replaced.
+     * @param destinationTags Destination tag to replace.
+     * @returns Element with tags replaced.
+     */
+    static replaceTags<T extends HTMLElement = HTMLElement>(
+        element: T,
+        originTags: string | string[],
+        destinationTags: string | string[],
+    ): T {
+        if (typeof originTags === 'string') {
+            originTags = [originTags];
+        }
+
+        if (typeof destinationTags === 'string') {
+            destinationTags = [destinationTags];
+        }
+
+        if (originTags.length !== destinationTags.length) {
+            // Do nothing, incorrect input.
+            return element;
+        }
+
+        originTags.forEach((originTag, index) => {
+            const destinationTag = destinationTags[index];
+            const elems = Array.from(element.getElementsByTagName(originTag));
+
+            elems.forEach((elem) => {
+                const newElem = document.createElement(destinationTag);
+                newElem.innerHTML = elem.innerHTML;
+
+                if (elem.hasAttributes()) {
+                    const attrs = Array.from(elem.attributes);
+                    attrs.forEach((attr) => {
+                        newElem.setAttribute(attr.name, attr.value);
+                    });
+                }
+
+                elem.parentNode?.replaceChild(newElem, elem);
+            });
+        });
+
+        return element;
+    }
+
 }
 
 /**

From b7322d696d2a2a243c6c13111043ccee102a6f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Nov 2023 13:54:42 +0100
Subject: [PATCH 15/17] MOBILE-3947 lang: Remove usage of Ionic 1 strings types
 (mm and mma)

---
 .../mod/workshop/pages/assessment/assessment.ts     |  2 +-
 src/core/services/lang.ts                           | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts
index ecc6ddad3..61fded7ba 100644
--- a/src/addons/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addons/mod/workshop/pages/assessment/assessment.ts
@@ -268,7 +268,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
                 this.evaluateByProfile = await CoreUser.getProfile(this.assessment.gradinggradeoverby, this.courseId, true);
             }
         } catch (error) {
-            CoreDomUtils.showErrorModalDefault(error, 'mm.course.errorgetmodule', true);
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.loaded = true;
         }
diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts
index 78fd63355..f7e14e911 100644
--- a/src/core/services/lang.ts
+++ b/src/core/services/lang.ts
@@ -381,7 +381,7 @@ export class CoreLangProvider {
      * @param strings Custom strings to load (tool_mobile_customlangstrings).
      */
     loadCustomStrings(strings: string): void {
-        if (strings == this.customStringsRaw) {
+        if (strings === this.customStringsRaw) {
             // Strings haven't changed, stop.
             return;
         }
@@ -404,9 +404,9 @@ export class CoreLangProvider {
                 return;
             }
 
-            const lang = values[2].replace(/_/g, '-'); // Use the app format instead of Moodle format.
+            const lang = this.formatLanguage(values[2], CoreLangFormat.App); // Use the app format instead of Moodle format.
 
-            if (lang == this.currentLanguage) {
+            if (lang === this.currentLanguage) {
                 currentLangChanged = true;
             }
 
@@ -414,12 +414,7 @@ export class CoreLangProvider {
                 this.customStrings[lang] = {};
             }
 
-            // Convert old keys format to new one.
-            const key = values[0].replace(/^mm\.core/, 'core').replace(/^mm\./, 'core.').replace(/^mma\./, 'addon.')
-                .replace(/^core\.sidemenu/, 'core.mainmenu').replace(/^addon\.grades/, 'core.grades')
-                .replace(/^addon\.participants/, 'core.user');
-
-            this.loadString(this.customStrings, lang, key, values[1]);
+            this.loadString(this.customStrings, lang, values[0], values[1]);
         });
 
         this.customStringsRaw = strings;

From 1fcbd4f2ce98fce5858e13323d334430e52569e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Nov 2023 14:14:39 +0100
Subject: [PATCH 16/17] MOBILE-3947 dev: Improve error log styling

---
 .../settings/pages/error-log/error-log.html       | 14 +++++++-------
 .../settings/pages/error-log/error-log.scss       |  4 ----
 .../settings/pages/error-log/error-log.ts         | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 src/core/features/settings/pages/error-log/error-log.scss

diff --git a/src/core/features/settings/pages/error-log/error-log.html b/src/core/features/settings/pages/error-log/error-log.html
index 3a8f56dee..7647af8c7 100644
--- a/src/core/features/settings/pages/error-log/error-log.html
+++ b/src/core/features/settings/pages/error-log/error-log.html
@@ -9,7 +9,7 @@
         </ion-title>
 
         <ion-buttons slot="end" *ngIf="errorLogs.length">
-            <ion-button fill="clear" (click)="copyInfo()" [attr.aria-label]="'core.settings.copyinfo' | translate">
+            <ion-button fill="clear" (click)="copyError()" [attr.aria-label]="'core.settings.copyinfo' | translate">
                 <ion-icon slot="icon-only" name="fas-clipboard" aria-hidden="true"></ion-icon>
             </ion-button>
         </ion-buttons>
@@ -18,8 +18,8 @@
 
 <ion-content>
     <ion-list *ngIf="errorLogs.length; else noLogs">
-        <ion-item button lines="full" class="ion-text-wrap" *ngFor="let error of errorLogs">
-            <div class="ion-padding" [collapsible-item]="96">
+        <ion-item button lines="full" class="ion-text-wrap" *ngFor="let error of errorLogs" (click)="copyError(error)">
+            <ion-label class="ion-padding" [collapsible-item]="96">
                 <p class="item-heading">Trace</p>
                 <p class="ion-text-wrap">{{ error.message }}</p>
 
@@ -38,10 +38,10 @@
                     <p class="ion-text-wrap">{{ error.data | json }}</p>
                 </ng-container>
 
-                <div *ngIf="error.time">
-                    <span class="ion-text-end">{{ error.time | coreFormatDate :'strftimedatetimeshort' }}</span>
-                </div>
-            </div>
+                <p *ngIf="error.time" class="ion-text-end">
+                    {{ error.time | coreFormatDate :'strftimedatetimeshort' }}
+                </p>
+            </ion-label>
         </ion-item>
     </ion-list>
     <ng-template #noLogs>
diff --git a/src/core/features/settings/pages/error-log/error-log.scss b/src/core/features/settings/pages/error-log/error-log.scss
deleted file mode 100644
index 588b78e22..000000000
--- a/src/core/features/settings/pages/error-log/error-log.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.timestamp {
-    display: flex;
-    justify-content: end;
-}
diff --git a/src/core/features/settings/pages/error-log/error-log.ts b/src/core/features/settings/pages/error-log/error-log.ts
index 19c9adb4d..65a6e3c38 100644
--- a/src/core/features/settings/pages/error-log/error-log.ts
+++ b/src/core/features/settings/pages/error-log/error-log.ts
@@ -22,18 +22,27 @@ import { CoreErrorLogs, CoreSettingsErrorLog } from '@singletons/error-logs';
 @Component({
     selector: 'page-core-app-settings-error-log',
     templateUrl: 'error-log.html',
-    styleUrls: ['./error-log.scss'],
 })
 export class CoreSettingsErrorLogPage implements OnInit {
 
     errorLogs: CoreSettingsErrorLog[] = [];
 
+    /**
+     * @inheritdoc
+     */
     ngOnInit(): void {
         this.errorLogs = CoreErrorLogs.getErrorLogs();
     }
 
-    copyInfo(): void {
-        CoreUtils.copyToClipboard(JSON.stringify({ errors: this.errorLogs }));
+    /**
+     * Copy Info of all the errors.
+     */
+    async copyError(error?: CoreSettingsErrorLog): Promise<void> {
+        if (error) {
+            await CoreUtils.copyToClipboard(JSON.stringify(error));
+        } else {
+            await CoreUtils.copyToClipboard(JSON.stringify({ errors: this.errorLogs }));
+        }
     }
 
 }

From bd8dd8ed0373a29d861c6d51a850ff71759fcfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 10 Nov 2023 15:51:36 +0100
Subject: [PATCH 17/17] MOBILE-3947 config: Increase version to 4.4.0

---
 config.xml         | 6 +++---
 moodle.config.json | 4 ++--
 package-lock.json  | 2 +-
 package.json       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.xml b/config.xml
index d49d38325..faeac4d64 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="43001" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.3.0.1" version="4.3.0" versionCode="43001" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="44000" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.4.0.0" version="4.4.0" versionCode="44000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@@ -28,7 +28,7 @@
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="prerendered-icon" value="true" />
-    <preference name="AppendUserAgent" value="MoodleMobile 4.3.0 (43001)" />
+    <preference name="AppendUserAgent" value="MoodleMobile 4.4.0 (44000)" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
@@ -220,7 +220,7 @@
             <true />
         </edit-config>
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>4.3.0</string>
+            <string>4.4.0</string>
         </edit-config>
         <edit-config file="*-Info.plist" mode="overwrite" target="CFBundleLocalizations">
             <array>
diff --git a/moodle.config.json b/moodle.config.json
index 52774b16a..dbf81aa21 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -1,8 +1,8 @@
 {
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode": 43001,
-    "versionname": "4.3.0",
+    "versioncode": 44000,
+    "versionname": "4.4.0",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
diff --git a/package-lock.json b/package-lock.json
index 951be9d5f..d2f9d1159 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 702ef4428..1e932876f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",