.github/workflows/testing.yml

@@ -69,7 +69,7 @@ jobs:
         cat circular-dependencies
         lines=$(cat circular-dependencies | wc -l)
         echo "Total circular dependencies: $lines"
-        test $lines -eq 93
+        test $lines -eq 90
     - name: JavaScript code compatibility
       run: |
         npx check-es-compat www/*.js --polyfills="\{Array,String,TypedArray\}.prototype.at,Object.hasOwn"

.nvmrc

@@ -1 +1 @@
-v20.18.1
+v18.18.2

config.xml

@@ -1,9 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.vmeda.online" android-versionCode="50000" id="com.vmeda.online" ios-CFBundleVersion="5.0.0.0" version="5.0.0" versionCode="50000" 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="50000" id="com.moodle.moodlemobile" ios-CFBundleVersion="5.0.0.0" version="5.0.0" versionCode="50000" 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>ВМедА Онлайн</name>
+    <name>Moodle</name>
-    <description>ВМедА Онлайн</description>
+    <description>Moodle official app</description>
-    <icon src="resources/android/icon/logo.png" />
+    <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
-    <author email="mobile@vmeda.org" href="https://online.vmeda.org">Военная Медицинская Академия им. Кирова</author>
     <content src="index.html" />
     <access origin="*" />
     <access launch-external="yes" origin="tel:*" />
@@ -63,6 +62,10 @@
         <preference name="AndroidWindowSplashScreenBackground" value="#FFFFFF" />
         <preference name="AndroidWindowSplashScreenIconBackgroundColor" value="#FFFFFF" />
         <resource-file src="google-services.json" target="app/google-services.json" />
+        <resource-file src="resources/android/icon/drawable-ldpi-smallicon.png" target="app/src/main/res/mipmap-ldpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-mdpi-smallicon.png" target="app/src/main/res/mipmap-mdpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-hdpi-smallicon.png" target="app/src/main/res/mipmap-hdpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" />
         <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
         <resource-file src="resources/android/xml/backup_rules.xml" target="app/src/main/res/xml/backup_rules.xml" />
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">

google-services.json

@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:111111111111:android:1111111111111111",
         "android_client_info": {
-          "package_name": "com.vmeda.online"
+          "package_name": "com.moodle.moodlemobile"
         }
       },
       "oauth_client": [
@@ -42,4 +42,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

ionic.config.json

@@ -1,5 +1,5 @@
 {
-  "name": "vmedaonline",
+  "name": "moodlemobile",
   "integrations": {
     "cordova": {}
   },

moodle.config.json

@@ -1,16 +1,71 @@
 {
-    "app_id": "com.vmeda.online",
+    "app_id": "com.moodle.moodlemobile",
-    "appname": "ВМедА Онлайн",
+    "appname": "Moodle Mobile",
     "versioncode": 50000,
     "versionname": "5.0.0",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
     "cache_update_frequency_rarely": 43200000,
-    "default_lang": "ru",
+    "default_lang": "en",
     "languages": {
+        "af": "Afrikaans",
+        "ar": "العربية",
+        "az": "Azərbaycanca",
+        "bg": "Български",
+        "ca": "Català",
+        "cs": "Čeština",
+        "da": "Dansk",
+        "de": "Deutsch",
+        "de-du": "Deutsch (du)",
+        "el": "Ελληνικά",
         "en": "English",
-        "ru": "Русский"
+        "en-us": "English (United States)",
+        "es": "Español - Internacional",
+        "es-mx": "Español - México",
+        "eu": "Euskara",
+        "fa": "فارسی",
+        "fi": "Suomi",
+        "fr": "Français",
+        "gl": "Galego",
+        "he": "עברית",
+        "hi": "हिंदी",
+        "hr": "Hrvatski",
+        "hsb": "Hornjoserbsce",
+        "hu": "magyar",
+        "hy": "Հայերեն",
+        "id": "Bahasa Indonesia",
+        "it": "Italiano",
+        "ja": "日本語",
+        "km": "ខ្មែរ",
+        "kn": "ಕನ್ನಡ",
+        "ko": "한국어",
+        "lo": "ລາວ",
+        "lt": "Lietuvių",
+        "lv": "Latviešu",
+        "mn": "Монгол",
+        "mr": "मराठी",
+        "nl": "Nederlands",
+        "no": "Norsk",
+        "pl": "Polski",
+        "ps": "لیسي",
+        "pt": "Português - Portugal",
+        "pt-br": "Português - Brasil",
+        "ro": "Română",
+        "ru": "Русский",
+        "sl": "Slovenščina",
+        "sq": "Shqip",
+        "sr-cr": "Српски",
+        "sr-lt": "Srpski",
+        "sv": "Svenska",
+        "szl": "Ślōnski",
+        "tg": "Тоҷикӣ",
+        "tr": "Türkçe",
+        "uk": "Українська",
+        "uz": "O'zbekcha",
+        "vi": "Vietnamese",
+        "zh-cn": "简体中文",
+        "zh-tw": "正體中文"
     },
     "wsservice": "moodle_mobile_app",
     "demo_sites": {
@@ -32,15 +87,13 @@
         "high": 120
     },
     "customurlscheme": "moodlemobile",
-    "sites": [{
+    "sites": [],
-        "url": "https://online.vmeda.org"
-    }],
     "multisitesdisplay": "",
     "sitefindersettings": {},
     "onlyallowlistedsites": false,
     "forcedefaultlanguage": false,
     "privacypolicy": "https://moodle.net/moodle-app-privacy/",
-    "notificoncolor": "#007aff",
+    "notificoncolor": "#f98012",
     "enableanalytics": false,
     "enableonboarding": true,
     "forceColorScheme": "",
@@ -48,7 +101,7 @@
     "showTopLogo": "hidden",
     "ioswebviewscheme": "moodleappfs",
     "appstores": {
-        "android": "com.vmeda.online",
+        "android": "com.moodle.moodlemobile",
         "ios": "id633359593"
     },
     "wsrequestqueuelimit": 10,

package.json

@@ -72,7 +72,7 @@
         "@awesome-cordova-plugins/sqlite": "^6.9.0",
         "@awesome-cordova-plugins/status-bar": "^6.9.0",
         "@awesome-cordova-plugins/web-intent": "^6.9.0",
-        "@ionic/angular": "^8.4.1",
+        "@ionic/angular": "^8.3.1",
         "@ionic/cordova-builders": "^11.0.0",
         "@moodlehq/cordova-plugin-advanced-http": "3.3.1-moodle.1",
         "@moodlehq/cordova-plugin-camera": "7.0.0-moodle.1",
@@ -81,7 +81,6 @@
         "@moodlehq/cordova-plugin-inappbrowser": "6.0.0-moodle.1",
         "@moodlehq/cordova-plugin-intent": "2.2.0-moodle.3",
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.5",
-        "@moodlehq/cordova-plugin-media-capture": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.5",
         "@moodlehq/cordova-plugin-statusbar": "4.0.0-moodle.3",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
@@ -94,7 +93,7 @@
         "@types/dom-mediacapture-record": "1.0.7",
         "chart.js": "^2.9.4",
         "cordova": "^12.0.0",
-        "cordova-android": "13.0.0",
+        "cordova-android": "^13.0.0",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^7.1.1",
         "cordova-plugin-add-swift-support": "^2.0.2",
@@ -107,6 +106,7 @@
         "cordova-plugin-geolocation": "^5.0.0",
         "cordova-plugin-ionic-keyboard": "^2.2.0",
         "cordova-plugin-local-notification": "1.0.0",
+        "cordova-plugin-media-capture": "^5.0.0",
         "cordova-plugin-network-information": "^3.0.0",
         "cordova-plugin-prevent-override": "^1.0.1",
         "cordova-plugin-screen-orientation": "^3.0.4",
@@ -182,12 +182,12 @@
         "vinyl": "^3.0.0"
     },
     "engines": {
-        "node": ">=v20.18 <21"
+        "node": ">=18.18.2 <19"
     },
     "cordova": {
         "platforms": [
-            "ios",
+            "android",
-            "android"
+            "ios"
         ],
         "plugins": {
             "@moodlehq/cordova-plugin-advanced-http": {
@@ -201,7 +201,6 @@
             "@moodlehq/cordova-plugin-inappbrowser": {},
             "@moodlehq/cordova-plugin-intent": {},
             "@moodlehq/cordova-plugin-ionic-webview": {},
-            "@moodlehq/cordova-plugin-media-capture": {},
             "@moodlehq/cordova-plugin-qrscanner": {},
             "@moodlehq/cordova-plugin-statusbar": {},
             "@moodlehq/cordova-plugin-zip": {},
@@ -228,6 +227,7 @@
             "cordova-plugin-local-notification": {
                 "ANDROID_SUPPORT_V4_VERSION": "26.+"
             },
+            "cordova-plugin-media-capture": {},
             "cordova-plugin-moodleapp": {},
             "cordova-plugin-network-information": {},
             "cordova-plugin-prevent-override": {},
@@ -238,4 +238,4 @@
             "nl.kingsquare.cordova.background-audio": {}
         }
     }
-}
+}

patches/@ionic+core+8.2.7.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/@ionic/core/components/popover.js b/node_modules/@ionic/core/components/popover.js
-index 394d7e6..1f36f24 100644
+index ec31d43..6be0b28 100644
 --- a/node_modules/@ionic/core/components/popover.js
 +++ b/node_modules/@ionic/core/components/popover.js
 @@ -763,8 +763,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -29,7 +29,7 @@ index 394d7e6..1f36f24 100644
      const contentEl = root.querySelector('.popover-content');
      const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
 diff --git a/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js b/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
-index 004effa..84389bf 100644
+index 2e169dc..ddd9daa 100644
 --- a/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
 +++ b/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
 @@ -769,8 +769,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -93,7 +93,7 @@ index 603923a..ff10a25 100644
      const contentEl = root.querySelector('.popover-content');
      const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
 diff --git a/node_modules/@ionic/core/dist/esm/ion-popover.entry.js b/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
-index 9b06217..70b4015 100644
+index a88d216..bc09959 100644
 --- a/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
 +++ b/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
 @@ -765,8 +765,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -123,10 +123,10 @@ index 9b06217..70b4015 100644
      const contentEl = root.querySelector('.popover-content');
      const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
 diff --git a/node_modules/@ionic/core/hydrate/index.js b/node_modules/@ionic/core/hydrate/index.js
-index c3d2d8e..bc40d4f 100644
+index 06501b6..a6ee24e 100644
 --- a/node_modules/@ionic/core/hydrate/index.js
 +++ b/node_modules/@ionic/core/hydrate/index.js
-@@ -23882,8 +23882,10 @@ const iosEnterAnimation$1 = (baseEl, opts) => {
+@@ -23747,8 +23747,10 @@ const iosEnterAnimation$1 = (baseEl, opts) => {
      const { event: ev, size, trigger, reference, side, align } = opts;
      const doc = baseEl.ownerDocument;
      const isRTL = doc.dir === 'rtl';
@@ -139,7 +139,7 @@ index c3d2d8e..bc40d4f 100644
      const root = getElementRoot(baseEl);
      const contentEl = root.querySelector('.popover-content');
      const arrowEl = root.querySelector('.popover-arrow');
-@@ -24003,8 +24005,10 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
+@@ -23868,8 +23870,10 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
      const { event: ev, size, trigger, reference, side, align } = opts;
      const doc = baseEl.ownerDocument;
      const isRTL = doc.dir === 'rtl';

scripts/langindex.json

@@ -1561,9 +1561,9 @@
   "core.completion-alt-manual-n-override": "completion",
   "core.completion-alt-manual-y": "completion",
   "core.completion-alt-manual-y-override": "completion",
+  "core.confirmcanceledit": "local_moodlemobileapp",
   "core.confirmdeletefile": "repository",
-  "core.confirmleavepagedescription": "local_moodlemobileapp",
+  "core.confirmleaveunknownchanges": "local_moodlemobileapp",
-  "core.confirmleavepagetitle": "local_moodlemobileapp",
   "core.confirmloss": "local_moodlemobileapp",
   "core.confirmopeninbrowser": "local_moodlemobileapp",
   "core.confirmremoveselectedfile": "local_moodlemobileapp",
@@ -2091,7 +2091,6 @@
   "core.lastmodified": "moodle",
   "core.lastsync": "local_moodlemobileapp",
   "core.layoutgrid": "workshopform_rubric",
-  "core.leave": "local_moodlemobileapp",
   "core.list": "moodle",
   "core.listsep": "langconfig",
   "core.loading": "moodle",

src/addons/badges/pages/badge-class/badge-class.ts

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreNavigator } from '@services/navigator';
 import { ActivatedRoute } from '@angular/router';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { AddonBadges, AddonBadgesBadgeClass } from '../../services/badges';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a badge class.
@@ -71,7 +71,7 @@ export class AddonBadgesBadgeClassPage implements OnInit {
 
             this.logView(this.badge);
         } catch (message) {
-            CoreAlerts.showError(message, { default: 'Error getting badge data.' });
+            CoreDomUtils.showErrorModalDefault(message, 'Error getting badge data.');
         }
     }
 

src/addons/badges/pages/issued-badge/issued-badge.ts

@@ -14,6 +14,7 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreTimeUtils } from '@services/utils/time';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CoreUser } from '@features/user/services/user';
 import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
@@ -27,7 +28,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays an issued badge.
@@ -141,7 +141,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
 
             this.logView(badge);
         } catch (message) {
-            CoreAlerts.showError(message, { default: 'Error getting badge data.' });
+            CoreDomUtils.showErrorModalDefault(message, 'Error getting badge data.');
         }
     }
 

src/addons/badges/pages/user-badges/user-badges.ts

@@ -15,6 +15,7 @@
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
 import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
 import { CoreTimeUtils } from '@services/utils/time';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
@@ -25,7 +26,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of calendar events.
@@ -112,7 +112,7 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
 
             this.logView();
         } catch (message) {
-            CoreAlerts.showError(message, { default: 'Error loading badges' });
+            CoreDomUtils.showErrorModalDefault(message, 'Error loading badges');
 
             this.badges.reset();
         }

src/addons/block/myoverview/components/myoverview/myoverview.ts

@@ -27,6 +27,7 @@ import { CoreCourseOptionsDelegate } from '@features/course/services/course-opti
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import { CoreSite } from '@classes/sites/site';
 import { CorePromiseUtils } from '@singletons/promise-utils';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreText } from '@singletons/text';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
 import { IonSearchbar } from '@ionic/angular';
@@ -42,8 +43,6 @@ import {
     CORE_COURSES_STATE_FAVOURITE,
     CORE_COURSES_STATE_HIDDEN,
 } from '@features/courses/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] =
     ['all', 'inprogress', 'future', 'past', 'favourite', 'allincludinghidden', 'hidden', 'custom'];
@@ -505,7 +504,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             await CoreCourseHelper.prefetchCourses(this.filteredCourses, this.prefetchCoursesData);
         } catch (error) {
             if (!this.isDestroyed) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.course.errordownloadingcourse') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.course.errordownloadingcourse', true);
                 this.prefetchCoursesData.icon = initialIcon;
             }
         }
@@ -567,7 +566,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
                         throw error; // Pass the error to the caller so it's treated there.
                     }
 
-                    CoreAlerts.showError(error, { default: this.fetchContentDefaultError });
+                    CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
                 } finally {
                     if (!alreadyLoading) {
                         // Only set loaded to true if there was no other data being loaded.

src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts

@@ -20,7 +20,7 @@ import {
     AddonBlockRecentlyAccessedItemsItemCalculatedData,
 } from '../../services/recentlyaccesseditems';
 import { CoreText } from '@singletons/text';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreUtils } from '@singletons/utils';
 import { CoreSharedModule } from '@/core/shared.module';
 

src/addons/block/timeline/components/events/events.ts

@@ -14,7 +14,7 @@
 
 import { Component, Input, Output, EventEmitter, OnInit, HostBinding } from '@angular/core';
 import { CoreSites } from '@services/sites';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreText } from '@singletons/text';
 import { CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
 import { AddonBlockTimelineDayEvents } from '@addons/block/timeline/classes/section';

src/addons/block/timeline/components/timeline/timeline.ts

@@ -17,6 +17,7 @@ import { CoreSites } from '@services/sites';
 import { ICoreBlockComponent } from '@features/block/classes/base-block-component';
 import { AddonBlockTimeline } from '../../services/timeline';
 import { CorePromiseUtils } from '@singletons/promise-utils';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCoursesHelper, CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper';
 import { CoreCourses } from '@features/courses/services/courses';
 import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
@@ -29,7 +30,6 @@ import { CoreLogger } from '@singletons/logger';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreSearchComponentsModule } from '@features/search/components/components.module';
 import { AddonBlockTimelineEventsComponent } from '../events/events';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component to render a timeline block.
@@ -211,7 +211,9 @@ export class AddonBlockTimelineComponent implements OnInit, ICoreBlockComponent
             catchError(error => {
                 // An error ocurred in the function, log the error and just resolve the observable so the workflow continues.
                 this.logger.error(error);
-                CoreAlerts.showError(error, { default: this.fetchContentDefaultError });
+
+                // Error getting data, fail.
+                CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError, true);
 
                 return of([] as AddonBlockTimelineSection[]);
             }),

src/addons/blog/pages/edit-entry/edit-entry.ts

@@ -35,18 +35,19 @@ import { CoreEditorComponentsModule } from '@features/editor/components/componen
 import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader';
 import { CoreTagComponentsModule } from '@features/tag/components/components.module';
 import { CanLeave } from '@guards/can-leave';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSync } from '@services/sync';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreWSError } from '@classes/errors/wserror';
+import { Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CoreForms } from '@singletons/form';
 import { CoreFileEntry } from '@services/file-helper';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 @Component({
     selector: 'addon-blog-edit-entry',
@@ -163,7 +164,7 @@ export default class AddonBlogEditEntryPage implements CanLeave, OnInit, OnDestr
                     this.associatedCourse = course;
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: 'Error getting associations, they may not be displayed correctly.' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error getting associations, they may not be displayed correctly.');
             }
 
             return;
@@ -203,7 +204,7 @@ export default class AddonBlogEditEntryPage implements CanLeave, OnInit, OnDestr
                 this.associatedModule = await CoreCourse.getModule(this.modId);
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error retrieving data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error retrieving data.');
             this.forceLeave = true;
             CoreNavigator.back();
 
@@ -337,7 +338,7 @@ export default class AddonBlogEditEntryPage implements CanLeave, OnInit, OnDestr
             } catch (error) {
                 if (CoreWSError.isWebServiceError(error)) {
                     // It's a WebService error, the user cannot send the message so don't store it.
-                    CoreAlerts.showError(error, { default: 'Error updating entry.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error updating entry.');
 
                     return;
                 }
@@ -362,7 +363,7 @@ export default class AddonBlogEditEntryPage implements CanLeave, OnInit, OnDestr
         } catch (error) {
             if (CoreWSError.isWebServiceError(error)) {
                 // It's a WebService error, the user cannot send the message so don't store it.
-                CoreAlerts.showError(error, { default: 'Error creating entry.' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error creating entry.');
 
                 return;
             }
@@ -411,7 +412,7 @@ export default class AddonBlogEditEntryPage implements CanLeave, OnInit, OnDestr
 
         if ((!this.entry && this.hasDataChangedForNewEntry) || (this.entry && this.hasDataChangedForEdit)) {
             // Modified, confirm user wants to go back.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());

src/addons/blog/pages/index/index.ts

@@ -34,16 +34,15 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrl } from '@singletons/url';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreArray } from '@singletons/array';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTime } from '@singletons/time';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { Subscription } from 'rxjs';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays the list of blog entries.
@@ -237,7 +236,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
                 const result = await AddonBlogSync.syncEntriesForSite(CoreSites.getCurrentSiteId());
 
                 if (result.warnings && result.warnings.length) {
-                    CoreAlerts.show({ message: result.warnings[0] });
+                    CoreDomUtils.showAlert(undefined, result.warnings[0]);
                 }
 
                 if (result.updated) {
@@ -245,7 +244,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
                 }
             } catch (error) {
                 if (showSyncErrors) {
-                    CoreAlerts.showError(error, { default: Translate.instant('core.errorsync') });
+                    CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
                 }
             }
         }
@@ -282,7 +281,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
             this.pageLoaded++;
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.blog.errorloadentries') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.blog.errorloadentries', true);
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
         } finally {
             this.loaded.set(true);
@@ -339,7 +338,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
             this.filter.userid = !enabled ? undefined : this.currentUserId;
             await this.fetchEntries(true);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.blog.errorloadentries') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.blog.errorloadentries', true);
             this.onlyMyEntries = !enabled;
             this.filter.userid = !enabled ? this.currentUserId : undefined;
         } finally {
@@ -419,7 +418,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
      */
     async deleteEntry(entryToRemove: AddonBlogOfflinePostFormatted | AddonBlogPostFormatted): Promise<void> {
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('addon.blog.blogdeleteconfirm', { $a: entryToRemove.subject }));
+            await CoreDomUtils.showDeleteConfirm('addon.blog.blogdeleteconfirm', { $a: entryToRemove.subject });
         } catch {
             return;
         }
@@ -435,7 +434,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
 
             CoreEvents.trigger(ADDON_BLOG_ENTRY_UPDATED);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.blog.errorloadentries') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.blog.errorloadentries', true);
         } finally {
             loading.dismiss();
         }

src/addons/calendar/calendar-lazy.module.ts

@@ -26,7 +26,6 @@ import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/comp
 
 import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { ADDON_CALENDAR_PAGE_NAME } from './constants';
-import { canLeaveGuard } from '@guards/can-leave';
 
 /**
  * Build module routes.
@@ -56,7 +55,6 @@ function buildRoutes(injector: Injector): Routes {
         {
             path: 'edit/:eventId',
             component: AddonCalendarEditEventPage,
-            canDeactivate: [canLeaveGuard],
         },
         ...buildTabMainRoutes(injector, {
             redirectTo: 'index',

src/addons/calendar/components/calendar/calendar.ts

@@ -27,6 +27,7 @@ import {
 } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreArray } from '@singletons/array';
 import {
@@ -53,7 +54,6 @@ import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
 import { toBoolean } from '@/core/transforms/boolean';
 import { ADDON_CALENDAR_UNDELETED_EVENT_EVENT } from '@addons/calendar/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays a calendar.
@@ -204,7 +204,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
 
         this.loaded = true;
@@ -358,7 +358,7 @@ export class AddonCalendarCalendarComponent implements OnInit, DoCheck, OnDestro
 
             this.swipeSlidesComponent.slideToItem(item);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         } finally {
             this.loaded = true;
         }

src/addons/calendar/components/upcoming-events/upcoming-events.ts

@@ -15,6 +15,7 @@
 import { Component, OnDestroy, OnInit, Input, DoCheck, Output, EventEmitter, KeyValueDiffers, KeyValueDiffer } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import {
     AddonCalendarEventToDisplay,
     AddonCalendar,
@@ -28,7 +29,6 @@ import { CoreUrl } from '@singletons/url';
 import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
 import { ADDON_CALENDAR_UNDELETED_EVENT_EVENT } from '@addons/calendar/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays upcoming events.
@@ -174,7 +174,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, On
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
 
         this.loaded = true;

src/addons/calendar/pages/day/day.ts

@@ -16,6 +16,7 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { CoreNetwork } from '@services/network';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import {
     AddonCalendar,
@@ -45,7 +46,7 @@ import { AddonCalendarEventsSource } from '@addons/calendar/classes/events-sourc
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreUrl } from '@singletons/url';
 import { CoreTime } from '@singletons/time';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
 import {
     ADDON_CALENDAR_AUTO_SYNCED,
     ADDON_CALENDAR_DELETED_EVENT_EVENT,
@@ -58,7 +59,6 @@ import {
     AddonCalendarEventType,
 } from '@addons/calendar/constants';
 import { CoreObject } from '@singletons/object';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the calendar events for a certain day.
@@ -277,7 +277,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
 
         this.loaded = true;
@@ -343,7 +343,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             const result = await AddonCalendarSync.syncEvents();
 
             if (result.warnings && result.warnings.length) {
-                CoreAlerts.show({ message: result.warnings[0] });
+                CoreDomUtils.showAlert(undefined, result.warnings[0]);
             }
 
             if (result.updated) {
@@ -357,7 +357,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             }
         } catch (error) {
             if (showErrors) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.errorsync') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
             }
         }
     }
@@ -454,7 +454,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
             this.swipeSlidesComponent.slideToItem(currentDay);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         } finally {
             this.loaded = true;
         }

src/addons/calendar/pages/edit-event/edit-event.ts

@@ -18,6 +18,7 @@ import { CoreEvents } from '@singletons/events';
 import { CoreGroup, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
 import { CoreSync } from '@services/sync';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@singletons/utils';
 import { CoreCategoryData, CoreCourses, CoreCourseSearchedData, CoreEnrolledCourseData } from '@features/courses/services/courses';
@@ -49,11 +50,10 @@ import {
     AddonCalendarEventType,
 } from '@addons/calendar/constants';
 import { ContextLevel } from '@/core/constants';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { REMINDERS_DISABLED, CoreRemindersUnits } from '@features/reminders/constants';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a form to create/edit an event.
@@ -253,7 +253,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
             this.eventTypes = eventTypes;
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting data.');
             this.error = true;
         }
     }
@@ -421,7 +421,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
             this.groupControl.setValue(null);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting data.');
         }
 
         modal.dismiss();
@@ -475,7 +475,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
         if (error) {
             // Show error and stop.
-            CoreAlerts.showError(Translate.instant(error));
+            CoreDomUtils.showErrorModal(Translate.instant(error));
 
             return;
         }
@@ -548,7 +548,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
 
             this.returnToList(event);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error sending data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error sending data.');
         }
 
         modal.dismiss();
@@ -593,7 +593,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
     async canLeave(): Promise<boolean> {
         if (AddonCalendarHelper.hasEventDataChanged(this.form.value, this.originalData)) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         CoreForms.triggerFormCancelledEvent(this.formElement, this.currentSite.getId());

src/addons/calendar/pages/event/event.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
+import { AlertOptions } from '@ionic/core';
 import {
     AddonCalendar,
     AddonCalendarEventToDisplay,
@@ -22,6 +23,7 @@ import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { AddonCalendarSync, AddonCalendarSyncEvents } from '../../services/calendar-sync';
 import { CoreNetwork } from '@services/network';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreText } from '@singletons/text';
 import { CoreSites } from '@services/sites';
 import { CoreCourse } from '@features/course/services/course';
@@ -39,9 +41,9 @@ import { CoreReminders } from '@features/reminders/services/reminders';
 import { CoreLocalNotifications } from '@services/local-notifications';
 import { CorePlatform } from '@services/platform';
 import { CoreConfig } from '@services/config';
-import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
+import { CoreToasts, ToastDuration } from '@services/toasts';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreUrl } from '@singletons/url';
 import {
     ADDON_CALENDAR_AUTO_SYNCED,
@@ -53,7 +55,6 @@ import {
     ADDON_CALENDAR_UNDELETED_EVENT_EVENT,
 } from '@addons/calendar/constants';
 import { REMINDERS_DEFAULT_NOTIFICATION_TIME_CHANGED } from '@features/reminders/constants';
-import { CoreAlerts, CoreAlertsConfirmOptions } from '@services/overlays/alerts';
 
 /**
  * Page that displays a single calendar event.
@@ -190,7 +191,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         try {
             this.eventId = CoreNavigator.getRequiredRouteNumberParam('id');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             CoreNavigator.back();
 
@@ -242,7 +243,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
                 if (this.eventId < 0) {
                     // It's an offline event, but it wasn't found. Shouldn't happen.
-                    CoreAlerts.showError('Event not found.');
+                    CoreDomUtils.showErrorModal('Event not found.');
                     CoreNavigator.back();
 
                     return;
@@ -317,7 +318,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
             await Promise.all(promises);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevent') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevent', true);
         }
 
         this.eventLoaded = true;
@@ -356,7 +357,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         try {
             const result = await AddonCalendarSync.syncEvents();
             if (result.warnings && result.warnings.length) {
-                CoreAlerts.show({ message: result.warnings[0] });
+                CoreDomUtils.showAlert(undefined, result.warnings[0]);
             }
 
             if (result.deleted && result.deleted.indexOf(this.eventId) != -1) {
@@ -379,7 +380,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             }
         } catch (error) {
             if (showErrors) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.errorsync') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
             }
         }
 
@@ -426,7 +427,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
         e.stopPropagation();
 
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('core.areyousure'));
+            await CoreDomUtils.showDeleteConfirm();
 
             const modal = await CoreLoadings.show('core.deleting', true);
 
@@ -434,7 +435,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 await CoreReminders.removeReminder(id);
                 await this.loadReminders();
             } catch (error) {
-                CoreAlerts.showError(error, { default: 'Error deleting reminder' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error deleting reminder');
             } finally {
                 modal.dismiss();
             }
@@ -499,10 +500,9 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             return;
         }
 
+        const title = Translate.instant('addon.calendar.deleteevent');
+        const options: AlertOptions = {};
         let message: string;
-        const options: CoreAlertsConfirmOptions = {
-            header: Translate.instant('addon.calendar.deleteevent'),
-        };
 
         if (this.event.eventcount > 1) {
             // It's a repeated event.
@@ -534,7 +534,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
 
         let deleteAll = false;
         try {
-            deleteAll = await CoreAlerts.confirm(message, options);
+            deleteAll = await CoreDomUtils.showConfirm(message, title, undefined, undefined, options);
         } catch {
             // User canceled.
             return;
@@ -583,7 +583,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
                 this.event.deleted = true;
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error deleting event.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error deleting event.');
         }
 
         modal.dismiss();
@@ -611,7 +611,7 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy {
             this.event.deleted = false;
 
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error undeleting event.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error undeleting event.');
         }
 
         modal.dismiss();

src/addons/calendar/pages/index/index.ts

@@ -16,12 +16,13 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { CoreNetwork } from '@services/network';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCoursesHelper } from '@features/courses/services/courses-helper';
 import { AddonCalendar } from '../../services/calendar';
 import { AddonCalendarOffline } from '../../services/calendar-offline';
 import { AddonCalendarSync } from '../../services/calendar-sync';
 import { AddonCalendarFilter, AddonCalendarHelper } from '../../services/calendar-helper';
-import { NgZone, Translate } from '@singletons';
+import { NgZone } from '@singletons';
 import { Subscription } from 'rxjs';
 import { CoreEnrolledCourseData } from '@features/courses/services/courses';
 import { ActivatedRoute, Params } from '@angular/router';
@@ -29,7 +30,7 @@ import { AddonCalendarCalendarComponent } from '../../components/calendar/calend
 import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events';
 import { CoreNavigator } from '@services/navigator';
 import { CoreConstants } from '@/core/constants';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
 import {
     ADDON_CALENDAR_AUTO_SYNCED,
     ADDON_CALENDAR_DELETED_EVENT_EVENT,
@@ -40,7 +41,6 @@ import {
     ADDON_CALENDAR_NEW_EVENT_EVENT,
     ADDON_CALENDAR_UNDELETED_EVENT_EVENT,
 } from '@addons/calendar/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the calendar events.
@@ -207,7 +207,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             try {
                 const result = await AddonCalendarSync.syncEvents();
                 if (result.warnings && result.warnings.length) {
-                    CoreAlerts.show({ message: result.warnings[0] });
+                    CoreDomUtils.showAlert(undefined, result.warnings[0]);
                 }
 
                 if (result.updated) {
@@ -222,7 +222,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
                 }
             } catch (error) {
                 if (showErrors) {
-                    CoreAlerts.showError(error, { default: Translate.instant('core.errorsync') });
+                    CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
                 }
             }
         }
@@ -255,7 +255,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
 
             await Promise.all(promises);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.calendar.errorloadevents') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.calendar.errorloadevents', true);
         }
 
         this.loaded = true;

src/addons/calendar/pages/settings/settings.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
 import {
     CoreReminders,
     CoreRemindersService,

src/addons/competency/pages/competencies/competencies.page.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import {
     AddonCompetencyDataForPlanPageCompetency,
@@ -29,7 +30,6 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreSites } from '@services/sites';
 import { CoreTime } from '@singletons/time';
 import { ContextLevel } from '@/core/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of competencies of a learning plan.
@@ -111,7 +111,7 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting competencies data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting competencies data.');
         }
     }
 

src/addons/competency/pages/competency/competency.page.ts

@@ -17,6 +17,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CoreCourseModuleSummary } from '@features/course/services/course';
 import { CoreUserSummary } from '@features/user/services/user';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import {
     AddonCompetencyDataForUserCompetencySummaryWSResponse,
@@ -40,7 +41,6 @@ import { AddonCompetencyCourseCompetenciesSource } from '@addons/competency/clas
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreUrl } from '@singletons/url';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the competency information.
@@ -86,7 +86,8 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
 
             this.competencies = new AddonCompetencyCompetenciesSwipeManager(source);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -162,7 +163,7 @@ export class AddonCompetencyCompetencyPage implements OnInit, OnDestroy {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting competency data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting competency data.');
         }
     }
 

src/addons/competency/pages/competencysummary/competencysummary.page.ts

@@ -16,11 +16,11 @@ import { Component, OnInit } from '@angular/core';
 import { ContextLevel } from '@/core/constants';
 import { AddonCompetencySummary, AddonCompetency } from '@addons/competency/services/competency';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/constants';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the competency summary.
@@ -71,7 +71,8 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
             this.contextLevel = CoreNavigator.getRouteParam<ContextLevel>('contextLevel');
             this.contextInstanceId = CoreNavigator.getRouteNumberParam('contextInstanceId');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -102,7 +103,7 @@ export class AddonCompetencyCompetencySummaryPage implements OnInit {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting competency summary data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting competency summary data.');
         }
     }
 

src/addons/competency/pages/coursecompetencies/coursecompetencies.page.ts

@@ -19,6 +19,7 @@ import {
 } from '@addons/competency/services/competency';
 import { CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { ContextLevel } from '@/core/constants';
 import { ADDON_COMPETENCY_SUMMARY_PAGE } from '@addons/competency/constants';
 import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
@@ -28,7 +29,6 @@ import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreSites } from '@services/sites';
 import { Translate } from '@singletons';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of competencies of a course.
@@ -59,7 +59,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit, OnDestroy
 
             this.competencies = new CoreListItemsManager(source, AddonCompetencyCourseCompetenciesPage);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
@@ -121,7 +121,7 @@ export class AddonCompetencyCourseCompetenciesPage implements OnInit, OnDestroy
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting course competencies data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting course competencies data.');
         }
     }
 

src/addons/competency/pages/plan/plan.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
 import { AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForPlanPageWSResponse } from '../../services/competency';
 import { CoreNavigator } from '@services/navigator';
 import { CoreUserProfile } from '@features/user/services/user';
@@ -23,7 +24,6 @@ import { CoreListItemsManager } from '@classes/items-management/list-items-manag
 import { AddonCompetencyPlanCompetenciesSource } from '@addons/competency/classes/competency-plan-competencies-source';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a learning plan.
@@ -57,7 +57,8 @@ export class AddonCompetencyPlanPage implements OnInit, OnDestroy {
             this.competencies = new CoreListItemsManager(competenciesSource, AddonCompetencyPlanPage);
             this.plans = new CoreSwipeNavigationItemsManager(plansSource);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -100,7 +101,7 @@ export class AddonCompetencyPlanPage implements OnInit, OnDestroy {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting learning plan data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting learning plan data.');
         }
     }
 

src/addons/competency/pages/planlist/planlist.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreNavigator } from '@services/navigator';
 import { AddonCompetencyPlanFormatted, AddonCompetencyPlansSource } from '@addons/competency/classes/competency-plans-source';
@@ -22,7 +23,6 @@ import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreSites } from '@services/sites';
 import { Translate } from '@singletons';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of learning plans.
@@ -76,7 +76,7 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting learning plans data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting learning plans data.');
         }
     }
 

src/addons/coursecompletion/pages/report/report.ts

@@ -19,12 +19,12 @@ import {
 import { Component, OnInit } from '@angular/core';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreTime } from '@singletons/time';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the course completion report.
@@ -69,7 +69,8 @@ export class AddonCourseCompletionReportPage implements OnInit {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -101,7 +102,7 @@ export class AddonCourseCompletionReportPage implements OnInit {
                 // Not enrolled error, probably a teacher.
                 this.tracked = false;
             } else {
-                CoreAlerts.showError(error, { default: Translate.instant('addon.coursecompletion.couldnotloadreport') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.coursecompletion.couldnotloadreport', true);
             }
         }
     }
@@ -130,7 +131,7 @@ export class AddonCourseCompletionReportPage implements OnInit {
 
             await this.refreshCompletion();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }

src/addons/enrol/guest/services/enrol-handler.ts

@@ -22,10 +22,10 @@ import {
 import { makeSingleton } from '@singletons';
 import { AddonEnrolGuest } from './guest';
 import { CorePasswordModalResponse } from '@components/password-modal/password-modal';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreEnrol, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol';
-import { CorePrompts } from '@services/overlays/prompts';
+import { CoreModals } from '@services/modals';
 
 /**
  * Enrol handler.
@@ -119,7 +119,7 @@ export class AddonEnrolGuestHandlerService implements CoreEnrolGuestHandler {
         };
 
         try {
-            const response = await CorePrompts.promptPassword<CorePasswordModalResponse>({
+            const response = await CoreModals.promptPassword<CorePasswordModalResponse>({
                 title: method.name,
                 validator: validatePassword,
             });

src/addons/enrol/self/services/enrol-handler.ts

@@ -17,11 +17,11 @@ import { CoreEnrolAction, CoreEnrolSelfHandler, CoreEnrolInfoIcon } from '@featu
 import { Translate, makeSingleton } from '@singletons';
 import { AddonEnrolSelf } from './self';
 import { CorePasswordModalResponse } from '@components/password-modal/password-modal';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEnrol, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreModals } from '@services/modals';
+import { CoreLoadings } from '@services/loadings';
 import { CORE_COURSES_ENROL_INVALID_KEY } from '@features/courses/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { CorePrompts } from '@services/overlays/prompts';
 
 /**
  * Enrol handler.
@@ -87,10 +87,11 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler {
         // Don't allow self access if it requires a password if not supported.
         if (!info.enrolpassword) {
             try {
-                await CoreAlerts.confirm(Translate.instant('addon.enrol_self.confirmselfenrol'), {
+                await CoreDomUtils.showConfirm(
-                    header: method.name,
+                    Translate.instant('addon.enrol_self.confirmselfenrol'),
-                    okText: Translate.instant('core.courses.enrolme'),
+                    method.name,
-                });
+                    Translate.instant('core.courses.enrolme'),
+                );
             } catch {
                 // User cancelled.
                 return false;
@@ -125,7 +126,7 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler {
                     response.validated = false;
                     response.error = error.message;
                 } else {
-                    CoreAlerts.showError(error, { default: Translate.instant('addon.enrol_self.errorselfenrol') });
+                    CoreDomUtils.showErrorModalDefault(error, 'addon.enrol_self.errorselfenrol', true);
 
                     throw error;
                 }
@@ -146,7 +147,7 @@ export class AddonEnrolSelfHandlerService implements CoreEnrolSelfHandler {
 
         if (!response.validated) {
             try {
-                const response = await CorePrompts.promptPassword({
+                const response = await CoreModals.promptPassword({
                     validator: validatePassword,
                     title: method.name,
                     placeholder: 'addon.enrol_self.password',

src/addons/messageoutput/airnotifier/pages/devices/devices.ts

@@ -13,10 +13,11 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
+
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications';
 import { AddonMessageOutputAirnotifier, AddonMessageOutputAirnotifierDevice } from '../../services/airnotifier';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of devices.
@@ -49,7 +50,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnInit, OnDestr
             const devices = await AddonMessageOutputAirnotifier.getUserDevices();
             this.formatDevices(devices);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             this.loaded = true;
         }
@@ -147,7 +148,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnInit, OnDestr
             this.updateDevicesAfterDelay();
         } catch (error) {
             // Show error and revert change.
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             device.enable = !device.enable;
         } finally {
             device.updating = false;

src/addons/messageoutput/airnotifier/services/airnotifier.ts

@@ -21,10 +21,10 @@ import { CoreError } from '@classes/errors/error';
 import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Translate } from '@singletons';
 import { CoreEvents, CoreEventSiteData } from '@singletons/events';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreOpener } from '@singletons/opener';
 import { CorePath } from '@singletons/path';
 import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site';
-import { CorePrompts } from '@services/overlays/prompts';
 
 const ROOT_CACHE_KEY = 'mmaMessageOutputAirnotifier:';
 
@@ -200,35 +200,34 @@ export class AddonMessageOutputAirnotifierProvider {
             }
 
             // Warn the admin.
-            const dontShowAgain = await CorePrompts.show(
+            const dontShowAgain = await CoreDomUtils.showPrompt(
                 Translate.instant('addon.messageoutput_airnotifier.pushdisabledwarning'),
+                undefined,
+                Translate.instant('core.dontshowagain'),
                 'checkbox',
-                {
+                [
-                    placeholderOrLabel: Translate.instant('core.dontshowagain'),
+                    {
-                    buttons: [
+                        text: Translate.instant('core.ok'),
-                        {
+                    },
-                            text: Translate.instant('core.ok'),
+                    {
-                        },
+                        text: Translate.instant('core.goto', { $a: Translate.instant('core.settings.settings') }),
-                        {
+                        handler: (data, resolve) => {
-                            text: Translate.instant('core.goto', { $a: Translate.instant('core.settings.settings') }),
+                            resolve(data[0]);
-                            handler: (data, resolve) => {
-                                resolve(data[0]);
 
-                                const url = CorePath.concatenatePaths(
+                            const url = CorePath.concatenatePaths(
-                                    site.getURL(),
+                                site.getURL(),
-                                    site.isVersionGreaterEqualThan('3.11') ?
+                                site.isVersionGreaterEqualThan('3.11') ?
-                                        'message/output/airnotifier/checkconfiguration.php' :
+                                    'message/output/airnotifier/checkconfiguration.php' :
-                                        'admin/message.php',
+                                    'admin/message.php',
-                                );
+                            );
 
-                                // Don't try auto-login, admins cannot use it.
+                            // Don't try auto-login, admins cannot use it.
-                                CoreOpener.openInBrowser(url, {
+                            CoreOpener.openInBrowser(url, {
-                                    showBrowserWarning: false,
+                                showBrowserWarning: false,
-                                });
+                            });
-                            },
                         },
-                    ],
+                    },
-                },
+                ],
             );
 
             if (dontShowAgain) {

src/addons/messages/components/conversation-info/conversation-info.component.ts

@@ -18,9 +18,9 @@ import {
     AddonMessagesConversationMember,
     AddonMessages,
 } from '../../services/messages';
+import { CoreDomUtils } from '@services/utils/dom';
 import { ActivatedRoute } from '@angular/router';
 import { ModalController } from '@singletons';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays the list of conversations, including group conversations.
@@ -67,7 +67,7 @@ export class AddonMessagesConversationInfoComponent implements OnInit {
             // Now get the members.
             await this.fetchMembers();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting members.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting members.');
         }
     }
 
@@ -102,7 +102,7 @@ export class AddonMessagesConversationInfoComponent implements OnInit {
         try {
             await this.fetchMembers(true);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting members.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting members.');
             this.loadMoreError = true;
         } finally {
             infiniteComplete && infiniteComplete();

src/addons/messages/pages/contacts-35/contacts.ts

@@ -20,6 +20,7 @@ import {
     AddonMessagesGetContactsContact,
     AddonMessages,
 } from '../../services/messages';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { ActivatedRoute } from '@angular/router';
 import { Translate } from '@singletons';
@@ -28,7 +29,6 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreKeyboard } from '@singletons/keyboard';
 import { ADDON_MESSAGES_MEMBER_INFO_CHANGED_EVENT } from '@addons/messages/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of contacts.
@@ -163,7 +163,7 @@ export class AddonMessagesContacts35Page implements OnInit, OnDestroy {
 
             this.clearSearch();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingcontacts') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingcontacts', true);
         }
     }
 
@@ -233,7 +233,7 @@ export class AddonMessagesContacts35Page implements OnInit, OnDestroy {
 
             this.contacts.search = this.sortUsers(result);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingcontacts') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingcontacts', true);
         }
     }
 

src/addons/messages/pages/contacts/contacts.ts

@@ -21,10 +21,9 @@ import {
 } from '../../services/messages';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { ADDON_MESSAGES_CONTACT_REQUESTS_COUNT_EVENT, ADDON_MESSAGES_MEMBER_INFO_CHANGED_EVENT } from '@addons/messages/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays contacts and contact requests.
@@ -178,7 +177,7 @@ export class AddonMessagesContactsPage implements OnInit, OnDestroy {
             this.confirmedCanLoadMore = result.canLoadMore;
         } catch (error) {
             this.confirmedLoadMoreError = true;
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingcontacts') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingcontacts', true);
         }
     }
 
@@ -204,7 +203,7 @@ export class AddonMessagesContactsPage implements OnInit, OnDestroy {
             this.requestsCanLoadMore = result.canLoadMore;
         } catch (error) {
             this.requestsLoadMoreError = true;
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingcontacts') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingcontacts', true);
         }
     }
 

src/addons/messages/pages/discussion/discussion.ts

@@ -14,6 +14,7 @@
 
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { IonContent } from '@ionic/angular';
+import { AlertOptions } from '@ionic/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import {
@@ -27,6 +28,7 @@ import {
 import { AddonMessagesOffline, AddonMessagesOfflineMessagesDBRecordFormatted } from '../../services/messages-offline';
 import { AddonMessagesSync } from '../../services/messages-sync';
 import { CoreUser } from '@features/user/services/user';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreLogger } from '@singletons/logger';
 import { CoreInfiniteLoadingComponent } from '@components/infinite-loading/infinite-loading';
@@ -42,8 +44,8 @@ import { CoreDom } from '@singletons/dom';
 import { CoreKeyboard } from '@singletons/keyboard';
 import { CoreText } from '@singletons/text';
 import { CoreWait } from '@singletons/wait';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import {
     ADDON_MESSAGES_AUTO_SYNCED,
     ADDON_MESSAGES_LIMIT_MESSAGES,
@@ -56,7 +58,6 @@ import {
     AddonMessagesMessageConversationType,
     AddonMessagesUpdateConversationAction,
 } from '@addons/messages/constants';
-import { CoreAlerts, CoreAlertsConfirmOptions } from '@services/overlays/alerts';
 
 /**
  * Page that displays a message discussion page.
@@ -142,7 +143,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
 
                 // Show first warning if any.
                 if (data.warnings && data.warnings[0]) {
-                    CoreAlerts.show({ message: data.warnings[0] });
+                    CoreDomUtils.showAlert(undefined, data.warnings[0]);
                 }
             }
         }, this.siteId);
@@ -263,7 +264,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         try {
             const syncResult = await AddonMessagesSync.syncDiscussion(this.conversationId, this.userId);
             if (syncResult.warnings && syncResult.warnings[0]) {
-                CoreAlerts.show({ message: syncResult.warnings[0] });
+                CoreDomUtils.showAlert(undefined, syncResult.warnings[0]);
             }
         } catch {
             // Ignore errors;
@@ -349,7 +350,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
 
             await Promise.all(promises);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingmessages') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingmessages', true);
         } finally {
             this.checkCanDelete();
             this.loaded = true;
@@ -952,7 +953,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         const canDeleteAll = this.conversation && this.conversation.candeletemessagesforallusers;
         const langKey = message.pending || canDeleteAll || this.isSelf ? 'core.areyousure' :
             'addon.messages.deletemessageconfirmation';
-        const options: CoreAlertsConfirmOptions = {};
+        const options: AlertOptions = {};
 
         if (canDeleteAll && !message.pending) {
             // Show delete for all checkbox.
@@ -966,7 +967,13 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         }
 
         try {
-            const data = await CoreAlerts.confirm<boolean[]>(Translate.instant(langKey), options);
+            const data: boolean[] = await CoreDomUtils.showConfirm(
+                Translate.instant(langKey),
+                undefined,
+                undefined,
+                undefined,
+                options,
+            );
 
             const modal = await CoreLoadings.show('core.deleting', true);
 
@@ -982,7 +989,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 modal.dismiss();
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errordeletemessage') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errordeletemessage', true);
         }
     }
 
@@ -1030,7 +1037,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             } catch (error) {
                 this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
                 this.pagesLoaded--;
-                CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingmessages') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingmessages', true);
             } finally {
                 infiniteComplete && infiniteComplete();
             }
@@ -1185,7 +1192,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 // We want the user to be able to send multiple messages without the keyboard being closed.
                 CoreKeyboard.close();
 
-                CoreAlerts.showError(error, { default: Translate.instant('addon.messages.messagenotsent') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.messages.messagenotsent', true);
                 this.removeMessage(message.hash!);
             }
         }
@@ -1309,7 +1316,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 value: this.conversation.isfavourite,
             }, this.siteId);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error changing favourite state.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error changing favourite state.');
         } finally {
             this.favouriteIcon = 'fas-star';
             done && done();
@@ -1342,7 +1349,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             }, this.siteId);
 
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error changing muted state.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error changing muted state.');
         } finally {
             this.muteIcon = this.conversation.ismuted ? 'fas-bell' : 'fas-bell-slash';
             done && done();
@@ -1397,16 +1404,16 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         }
 
         if (this.otherMember.canmessageevenifblocked) {
-            CoreAlerts.showError(Translate.instant('addon.messages.cantblockuser', { $a: this.otherMember.fullname }));
+            CoreDomUtils.showErrorModal(Translate.instant('addon.messages.cantblockuser', { $a: this.otherMember.fullname }));
 
             return;
         }
 
-        try {
+        const template = Translate.instant('addon.messages.blockuserconfirm', { $a: this.otherMember.fullname });
-            await CoreAlerts.confirm(Translate.instant('addon.messages.blockuserconfirm', { $a: this.otherMember.fullname }), {
+        const okText = Translate.instant('addon.messages.blockuser');
-                okText: Translate.instant('addon.messages.blockuser'),
-            });
 
+        try {
+            await CoreDomUtils.showConfirm(template, undefined, okText);
             this.blockIcon = CoreConstants.ICON_LOADING;
 
             const modal = await CoreLoadings.show('core.sending', true);
@@ -1420,7 +1427,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                     this.showLoadingModal = false;
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             } finally {
                 this.blockIcon = this.otherMember.isblocked ? 'fas-user-check' : 'fas-user-lock';
             }
@@ -1442,7 +1449,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
         const confirmMessage = 'addon.messages.' + (this.isSelf ? 'deleteallselfconfirm' : 'deleteallconfirm');
 
         try {
-            await CoreAlerts.confirmDelete(Translate.instant(confirmMessage));
+            await CoreDomUtils.showDeleteConfirm(confirmMessage);
             this.deleteIcon = CoreConstants.ICON_LOADING;
 
             try {
@@ -1463,7 +1470,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                     done && done();
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: 'Error deleting conversation.' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error deleting conversation.');
             } finally {
                 this.deleteIcon = 'fas-trash';
             }
@@ -1483,10 +1490,11 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             throw new CoreError('No member selected to be unblocked.');
         }
 
+        const template = Translate.instant('addon.messages.unblockuserconfirm', { $a: this.otherMember.fullname });
+        const okText = Translate.instant('addon.messages.unblockuser');
+
         try {
-            await CoreAlerts.confirm(Translate.instant('addon.messages.unblockuserconfirm', { $a: this.otherMember.fullname }), {
+            await CoreDomUtils.showConfirm(template, undefined, okText);
-                okText: Translate.instant('addon.messages.unblockuser'),
-            });
 
             this.blockIcon = CoreConstants.ICON_LOADING;
 
@@ -1501,7 +1509,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                     this.showLoadingModal = false;
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             } finally {
                 this.blockIcon = this.otherMember.isblocked ? 'fas-user-check' : 'fas-user-lock';
             }
@@ -1521,10 +1529,11 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             throw new CoreError('No member selected to be requested.');
         }
 
+        const template = Translate.instant('addon.messages.addcontactconfirm', { $a: this.otherMember.fullname });
+        const okText = Translate.instant('core.add');
+
         try {
-            await CoreAlerts.confirm(Translate.instant('addon.messages.addcontactconfirm', { $a: this.otherMember.fullname }), {
+            await CoreDomUtils.showConfirm(template, undefined, okText);
-                okText: Translate.instant('core.add'),
-            });
 
             this.addRemoveIcon = CoreConstants.ICON_LOADING;
 
@@ -1539,7 +1548,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                     this.showLoadingModal = false;
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             } finally {
                 this.addRemoveIcon = 'fas-user-plus';
             }
@@ -1570,7 +1579,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 this.showLoadingModal = false;
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
         }
     }
 
@@ -1596,7 +1605,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                 this.showLoadingModal = false;
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
         }
     }
 
@@ -1611,10 +1620,11 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
             throw new CoreError('No member selected to be removed.');
         }
 
+        const template = Translate.instant('addon.messages.removecontactconfirm', { $a: this.otherMember.fullname });
+        const okText = Translate.instant('core.remove');
+
         try {
-            await CoreAlerts.confirm(Translate.instant('addon.messages.removecontactconfirm', { $a: this.otherMember.fullname }), {
+            await CoreDomUtils.showConfirm(template, undefined, okText);
-                okText: Translate.instant('core.remove'),
-            });
 
             this.addRemoveIcon = CoreConstants.ICON_LOADING;
 
@@ -1629,7 +1639,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
                     this.showLoadingModal = false;
                 }
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             } finally {
                 this.addRemoveIcon = 'fas-user-plus';
             }

src/addons/messages/pages/discussions-35/discussions.ts

@@ -20,6 +20,7 @@ import {
     AddonMessagesDiscussion,
     AddonMessagesMessageAreaContact,
 } from '../../services/messages';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@singletons/utils';
 import { ActivatedRoute, Params } from '@angular/router';
 import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';
@@ -33,7 +34,6 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreKeyboard } from '@singletons/keyboard';
 import { ADDON_MESSAGES_NEW_MESSAGE_EVENT, ADDON_MESSAGES_READ_CHANGED_EVENT } from '@addons/messages/constants';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the list of discussions.
@@ -207,7 +207,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
         try {
             await Promise.all(promises);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingdiscussions') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
         }
 
         this.loaded = true;
@@ -241,7 +241,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy {
             this.search.showResults = true;
             this.search.results = searchResults.messages;
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingmessages') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingmessages', true);
         }
 
         this.loaded = true;

src/addons/messages/pages/group-conversations/group-conversations.ts

@@ -26,6 +26,7 @@ import {
     AddonMessagesOffline,
     AddonMessagesOfflineAnyMessagesFormatted,
 } from '../../services/messages-offline';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUser } from '@features/user/services/user';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { Translate } from '@singletons';
@@ -48,7 +49,6 @@ import {
     AddonMessagesMessageConversationType,
     AddonMessagesUpdateConversationAction,
 } from '@addons/messages/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 const enum AddonMessagesGroupConversationOptionNames {
     FAVOURITES = 'favourites',
@@ -381,7 +381,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
             // Load the data for the expanded option.
             await this.fetchDataForExpandedOption();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingdiscussions') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
         }
         this.loaded = true;
     }
@@ -611,7 +611,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
         try {
             await this.fetchDataForOption(option, true);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingdiscussions') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
             option.loadMoreError = true;
         }
 
@@ -793,7 +793,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
 
         // Pass getCounts=true to update the counts everytime the user expands an option.
         this.expandOption(option, true).catch((error) => {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingdiscussions') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
         });
     }
 

src/addons/messages/pages/search/search.ts

@@ -20,6 +20,7 @@ import {
     AddonMessagesMessageAreaContact,
     AddonMessages,
 } from '../../services/messages';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
@@ -29,8 +30,6 @@ import {
     ADDON_MESSAGES_LIMIT_SEARCH,
     ADDON_MESSAGES_LIMIT_INITIAL_USER_SEARCH,
 } from '@addons/messages/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page for searching users.
@@ -226,7 +225,7 @@ export class AddonMessagesSearchPage implements OnDestroy {
                 }
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.messages.errorwhileretrievingusers') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingusers', true);
 
             if (loadMore == 'messages') {
                 this.messages.loadMoreError = true;

src/addons/messages/pages/settings/settings.ts

@@ -23,13 +23,13 @@ import { CoreUser } from '@features/user/services/user';
 import { CoreConfig } from '@services/config';
 import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreConstants } from '@/core/constants';
 import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 import { CorePlatform } from '@services/platform';
 import { CoreErrorHelper } from '@services/error-helper';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { ADDON_MESSAGES_NOTIFICATION_PREFERENCES_KEY, AddonMessagesMessagePrivacy } from '@addons/messages/constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the messages settings page.
@@ -118,7 +118,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
                 return;
             }
 
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             this.preferencesLoaded = true;
         }
@@ -171,7 +171,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
             this.previousContactableValue = this.contactablePrivacy;
         } catch (message) {
             // Show error and revert change.
-            CoreAlerts.showError(message);
+            CoreDomUtils.showErrorModal(message);
             this.contactablePrivacy = this.previousContactableValue;
         } finally {
             modal.dismiss();
@@ -214,7 +214,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
             this.updatePreferencesAfterDelay();
         } catch (error) {
             // Show error and revert change.
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             processor.enabled = !processor.enabled;
         } finally {
             notification.updating = false;
@@ -249,7 +249,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
             this.updatePreferencesAfterDelay();
         } catch (error) {
             // Show error and revert change.
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             processorState.checked = !processorState.checked;
         } finally {
             notification['updating'+state] = false;

src/addons/mod/assign/classes/base-feedback-plugin-component.ts

@@ -15,7 +15,7 @@
 import { Component, Input } from '@angular/core';
 import { CoreCanceledError } from '@classes/errors/cancelederror';
 import { CoreError } from '@classes/errors/error';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
 import { AddonModAssignFeedbackCommentsTextData } from '../feedback/comments/services/handler';
 import { AddonModAssignAssign, AddonModAssignPlugin, AddonModAssignSubmission } from '../services/assign';
 import { toBoolean } from '@/core/transforms/boolean';

src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.ts

@@ -14,14 +14,14 @@
 
 import { Component, Input, ViewChild, ElementRef } from '@angular/core';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFormFields, CoreForms } from '@singletons/form';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { ModalController } from '@singletons';
+import { ModalController, Translate } from '@singletons';
 import { AddonModAssignAssign, AddonModAssignPlugin, AddonModAssignSubmission } from '../../services/assign';
 import { AddonModAssignFeedbackDelegate } from '../../services/feedback-delegate';
 import { CoreSharedModule } from '@/core/shared.module';
 import { AddonModAssignComponentsModule } from '../components.module';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Modal that allows editing a feedback plugin.
@@ -50,7 +50,7 @@ export class AddonModAssignEditFeedbackModalComponent {
     async closeModal(): Promise<void> {
         const changed = await this.hasDataChanged();
         if (changed) {
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         CoreForms.triggerFormCancelledEvent(this.formElement, CoreSites.getCurrentSiteId());

src/addons/mod/assign/components/index/index.ts

@@ -22,6 +22,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { Translate } from '@singletons';
@@ -52,7 +53,6 @@ import {
     ADDON_MOD_ASSIGN_WARN_GROUPS_OPTIONAL,
     ADDON_MOD_ASSIGN_WARN_GROUPS_REQUIRED,
 } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays an assignment.
@@ -397,7 +397,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
         }
 
         if (syncEventData.warnings && syncEventData.warnings.length) {
-            CoreAlerts.show({ message: syncEventData.warnings[0] });
+            // Show warnings.
+            CoreDomUtils.showAlert(undefined, syncEventData.warnings[0]);
         }
 
         return true;

src/addons/mod/assign/components/submission/submission.ts

@@ -39,6 +39,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreGradesFormattedItem, CoreGradesHelper } from '@features/grades/services/grades-helper';
 import { CoreMenuItem, CoreUtils } from '@singletons/utils';
 import { AddonModAssignHelper, AddonModAssignSubmissionFormatted } from '../../services/assign-helper';
+import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreText } from '@singletons/text';
 import { CoreCourse, CoreCourseModuleGradeInfo, CoreCourseModuleGradeOutcome } from '@features/course/services/course';
@@ -68,9 +69,8 @@ import {
     ADDON_MOD_ASSIGN_UNLIMITED_ATTEMPTS,
 } from '../../constants';
 import { CoreViewer } from '@features/viewer/services/viewer';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays an assignment submission.
@@ -296,7 +296,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
         if (modified) {
             // Modified, confirm user wants to go back.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
 
             await this.discardDrafts();
         }
@@ -315,7 +315,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         if (!CoreNetwork.isOnline()) {
-            CoreAlerts.showError(Translate.instant('core.networkerrormsg'));
+            CoreDomUtils.showErrorModal('core.networkerrormsg', true);
 
             return;
         }
@@ -363,7 +363,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                 await this.invalidateAndRefresh(true);
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
         } finally {
             modal.dismiss();
         }
@@ -388,11 +388,12 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
     async goToEdit(afterCopyPrevious = false): Promise<void> {
         if (!afterCopyPrevious && this.assign?.timelimit && (!this.userSubmission || !this.userSubmission.timestarted)) {
             try {
-                await CoreAlerts.confirm(
+                await CoreDomUtils.showConfirm(
                     Translate.instant('addon.mod_assign.confirmstart', {
                         $a: CoreTime.formatTime(this.assign.timelimit),
                     }),
-                    { okText: Translate.instant('addon.mod_assign.beginassignment') },
+                    undefined,
+                    Translate.instant('addon.mod_assign.beginassignment'),
                 );
             } catch {
                 return; // User canceled.
@@ -420,7 +421,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
             'addon.mod_assign.removesubmissionconfirmwithtimelimit' :
             'addon.mod_assign.removesubmissionconfirm';
         try {
-            await CoreAlerts.confirmDelete(Translate.instant(message));
+            await CoreDomUtils.showDeleteConfirm(message);
         } catch {
             return;
         }
@@ -444,7 +445,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                 CoreSites.getCurrentSiteId(),
             );
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error removing submission.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error removing submission.');
         } finally {
             modal.dismiss();
         }
@@ -649,7 +650,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
 
             await Promise.all(promises);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting assigment data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting assigment data.');
         } finally {
             this.loaded = true;
         }
@@ -935,14 +936,14 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
         }
 
         if (this.assign.requiresubmissionstatement && !acceptStatement) {
-            CoreAlerts.showError(Translate.instant('addon.mod_assign.acceptsubmissionstatement'));
+            CoreDomUtils.showErrorModal('addon.mod_assign.acceptsubmissionstatement', true);
 
             return;
         }
 
         try {
             // Ask for confirmation. @todo plugin precheck_submission
-            await CoreAlerts.confirm(Translate.instant('addon.mod_assign.confirmsubmission'));
+            await CoreDomUtils.showConfirm(Translate.instant('addon.mod_assign.confirmsubmission'));
 
             const modal = await CoreLoadings.show('core.sending', true);
 
@@ -962,7 +963,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                     userId: this.currentUserId,
                 }, this.siteId);
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
             } finally {
                 modal.dismiss();
             }

src/addons/mod/assign/pages/edit/edit.ts

@@ -20,6 +20,7 @@ import { CanLeave } from '@guards/can-leave';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSync } from '@services/sync';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFormFields, CoreForms } from '@singletons/form';
 import { Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
@@ -44,10 +45,9 @@ import {
     ADDON_MOD_ASSIGN_SUBMISSION_SAVED_EVENT,
     ADDON_MOD_ASSIGN_SUBMITTED_FOR_GRADING_EVENT,
 } from '../../constants';
-import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
+import { CoreToasts, ToastDuration } from '@services/toasts';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that allows adding or editing an assigment submission.
@@ -101,7 +101,8 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.isBlind = !!CoreNavigator.getRouteNumberParam('blindId');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -125,7 +126,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
         // Check if data has changed.
         const changed = await this.hasDataChanged();
         if (changed) {
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Nothing has changed or user confirmed to leave. Clear temporary data from plugins.
@@ -245,7 +246,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
                 url: `/mod/assign/view.php?action=editsubmission&id=${this.moduleId}`,
             });
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting assigment data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting assigment data.');
 
             // Leave the player.
             this.leaveWithoutCheck();
@@ -375,7 +376,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy, CanLeave {
             await this.saveSubmission();
             this.leaveWithoutCheck();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error saving submission.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error saving submission.');
         }
     }
 

src/addons/mod/assign/pages/submission-list/submission-list.ts

@@ -19,6 +19,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
@@ -33,7 +34,6 @@ import {
 } from '../../services/assign-sync';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_ASSIGN_AUTO_SYNCED, ADDON_MOD_ASSIGN_GRADED_EVENT, ADDON_MOD_ASSIGN_MANUAL_SYNCED } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a list of submissions of an assignment.
@@ -107,7 +107,8 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
                 AddonModAssignSubmissionListPage,
             );
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -183,7 +184,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro
                 url: `/mod/assign/view.php?id=${this.assign.cmid}&action=grading`,
             });
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting assigment data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting assigment data.');
         }
     }
 

src/addons/mod/assign/pages/submission-review/submission-review.ts

@@ -20,13 +20,13 @@ import { CoreCourse } from '@features/course/services/course';
 import { CanLeave } from '@guards/can-leave';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
+import { CoreDomUtils } from '@services/utils/dom';
 import { AddonModAssignListFilterName, AddonModAssignSubmissionsSource } from '../../classes/submissions-source';
 import { AddonModAssignSubmissionComponent } from '../../components/submission/submission';
 import { AddonModAssign, AddonModAssignAssign } from '../../services/assign';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { Translate } from '@singletons';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a submission.
@@ -99,7 +99,8 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
 
                 this.submissions.start();
             } catch (error) {
-                CoreAlerts.showError(error);
+                CoreDomUtils.showErrorModal(error);
+
                 CoreNavigator.back();
 
                 return;
@@ -230,7 +231,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, OnDestroy, Ca
                 CoreNavigator.back();
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.error') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.error', true);
         }
     }
 

src/addons/mod/bigbluebuttonbn/components/index/index.ts

@@ -20,6 +20,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreApp } from '@services/app';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreText } from '@singletons/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreArray } from '@singletons/array';
@@ -31,11 +32,10 @@ import {
     AddonModBBBRecordingPlaybackTypes,
 } from '../../services/bigbluebuttonbn';
 import { ADDON_MOD_BBB_COMPONENT } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { convertTextToHTMLElement } from '@/core/utils/create-html-element';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreOpener } from '@singletons/opener';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays a Big Blue Button activity.
@@ -287,7 +287,7 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
 
             await this.fetchRecordings();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             this.showLoading = false;
         }
@@ -313,7 +313,7 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
 
             this.updateMeetingInfo(true);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }
@@ -330,10 +330,11 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
         }
 
         try {
-            await CoreAlerts.confirm(Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm'), {
+            await CoreDomUtils.showConfirm(
-                header: Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm_title'),
+                Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm'),
-                okText: Translate.instant('core.yes'),
+                Translate.instant('addon.mod_bigbluebuttonbn.end_session_confirm_title'),
-            });
+                Translate.instant('core.yes'),
+            );
         } catch {
             // User canceled.
             return;
@@ -346,7 +347,7 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
 
             this.updateMeetingInfo();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }

src/addons/mod/book/pages/contents/contents.ts

@@ -24,6 +24,7 @@ import { CoreCourseModulePrefetchDelegate } from '@features/course/services/modu
 import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreErrorHelper } from '@services/error-helper';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { Translate } from '@singletons';
@@ -36,8 +37,7 @@ import {
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreUrl } from '@singletons/url';
 import { ADDON_MOD_BOOK_COMPONENT, AddonModBookNavStyle } from '../../constants';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a book contents.
@@ -79,7 +79,8 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.initialChapterId = CoreNavigator.getRouteNumberParam('chapterId');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -135,7 +136,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
 
             await source.load();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.loaded = true;
         }

src/addons/mod/chat/components/users-modal/users-modal.ts

@@ -14,11 +14,11 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { CoreNetwork } from '@services/network';
 import { CoreSites } from '@services/sites';
-import { ModalController, NgZone, Translate } from '@singletons';
+import { CoreDomUtils } from '@services/utils/dom';
+import { ModalController, NgZone } from '@singletons';
 import { Subscription } from 'rxjs';
 import { AddonModChat, AddonModChatUser } from '../../services/chat';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * MMdal that displays the chat session users.
@@ -63,7 +63,7 @@ export class AddonModChatUsersModalComponent implements OnInit, OnDestroy {
 
             this.users = data.users;
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_chat.errorwhilegettingchatusers') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhilegettingchatusers', true);
         } finally {
             this.usersLoaded = true;
         }

src/addons/mod/chat/pages/chat/chat.ts

@@ -19,6 +19,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { NgZone, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
@@ -30,9 +31,8 @@ import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreKeyboard } from '@singletons/keyboard';
 import { CoreWait } from '@singletons/wait';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a chat session.
@@ -108,7 +108,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
             this.startPolling();
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_chat.errorwhileconnecting') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhileconnecting', true);
             CoreNavigator.back();
         } finally {
             this.loaded = true;
@@ -294,7 +294,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
             } catch (error) {
                 // Fail again. Stop polling if needed.
                 this.stopPolling();
-                CoreAlerts.showError(error, { default: Translate.instant('addon.mod_chat.errorwhileretrievingmessages') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhileretrievingmessages', true);
 
                 throw error;
             }
@@ -331,7 +331,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
             CoreKeyboard.close();
 
             this.newMessage = text;
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_chat.errorwhilesendingmessage') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhilesendingmessage', true);
         } finally {
             this.sending = false;
         }
@@ -380,7 +380,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
         }
 
         // Modified, confirm user wants to go back.
-        await CoreAlerts.confirm(Translate.instant('addon.mod_chat.confirmloss'));
+        await CoreDomUtils.showConfirm(Translate.instant('addon.mod_chat.confirmloss'));
 
         return true;
     }

src/addons/mod/chat/pages/session-messages/session-messages.ts

@@ -16,13 +16,13 @@ import { Component, OnInit } from '@angular/core';
 import { CoreUser } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { AddonModChat } from '../../services/chat';
 import { AddonModChatFormattedSessionMessage, AddonModChatHelper } from '../../services/chat-helper';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { Translate } from '@singletons';
 import { CoreTime } from '@singletons/time';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays list of chat session messages.
@@ -75,7 +75,8 @@ export class AddonModChatSessionMessagesPage implements OnInit {
             this.chatId = CoreNavigator.getRequiredRouteNumberParam('chatId');
             this.groupId = CoreNavigator.getRouteNumberParam('groupId') || 0;
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -118,7 +119,7 @@ export class AddonModChatSessionMessagesPage implements OnInit {
 
             this.messages[this.messages.length - 1].showTail = true;
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.errorloadingcontent') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         } finally {
             this.loaded = true;
         }

src/addons/mod/chat/pages/sessions/sessions.ts

@@ -18,14 +18,14 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { AddonModChatSessionFormatted, AddonModChatSessionsSource } from '../../classes/chat-sessions-source';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
 import { AddonModChat } from '@addons/mod/chat/services/chat';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays list of chat sessions.
@@ -73,7 +73,8 @@ export class AddonModChatSessionsPage implements OnInit, AfterViewInit, OnDestro
 
             this.sessions = new CoreListItemsManager(source, AddonModChatSessionsPage);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -118,7 +119,7 @@ export class AddonModChatSessionsPage implements OnInit, AfterViewInit, OnDestro
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.errorloadingcontent') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         }
     }
 
@@ -131,7 +132,7 @@ export class AddonModChatSessionsPage implements OnInit, AfterViewInit, OnDestro
         try {
             await this.sessions.reload();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.errorloadingcontent') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         } finally {
             modal.dismiss();
         }

src/addons/mod/choice/components/index/index.ts

@@ -18,6 +18,7 @@ import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { IonContent } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTimeUtils } from '@services/utils/time';
 import { Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
@@ -40,8 +41,7 @@ import {
     ADDON_MOD_CHOICE_PUBLISH_ANONYMOUS,
     AddonModChoiceShowResults,
 } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays a choice.
@@ -370,7 +370,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
 
         // Only show confirm if choice doesn't allow update.
         if (!this.choice.allowupdate) {
-            await CoreAlerts.confirm(Translate.instant('core.areyousure'));
+            await CoreDomUtils.showConfirm(Translate.instant('core.areyousure'));
         }
 
         const responses: number[] = [];
@@ -401,7 +401,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
 
             await this.dataUpdated(online);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_choice.cannotsubmit') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_choice.cannotsubmit', true);
         } finally {
             modal.dismiss();
         }
@@ -416,7 +416,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         }
 
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('core.areyousure'));
+            await CoreDomUtils.showDeleteConfirm();
         } catch {
             // User cancelled.
             return;
@@ -434,7 +434,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
             // Refresh the data. Don't call dataUpdated because deleting an answer doesn't mark the choice as outdated.
             await this.refreshContent(false);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_choice.cannotsubmit') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_choice.cannotsubmit', true);
         } finally {
             modal.dismiss();
         }

src/addons/mod/data/components/action/action.ts

@@ -26,7 +26,7 @@ import {
 } from '../../services/data';
 import { AddonModDataHelper } from '../../services/data-helper';
 import { AddonModDataOffline } from '../../services/data-offline';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
 import { AddonModDataActionsMenuItem } from '../actionsmenu/actionsmenu';
 import {
     ADDON_MOD_DATA_ENTRY_CHANGED,

src/addons/mod/data/components/index/index.ts

@@ -51,11 +51,9 @@ import {
     AddonModDataTemplateType,
     AddonModDataTemplateMode,
 } from '../../constants';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreObject } from '@singletons/object';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 const contentToken = '<!-- CORE-DATABASE-CONTENT-GOES-HERE -->';
 
@@ -438,7 +436,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
             this.logSearch?.();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.showLoading = false;
         }
@@ -486,7 +484,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         try {
             await this.fetchEntriesData();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         }
     }
 

src/addons/mod/data/fields/latlong/component/latlong.ts

@@ -19,10 +19,10 @@ import { FormBuilder } from '@angular/forms';
 import { SafeUrl } from '@angular/platform-browser';
 import { CoreAnyError } from '@classes/errors/error';
 import { CoreGeolocation, CoreGeolocationError, CoreGeolocationErrorReason } from '@services/geolocation';
-import { CoreAlerts } from '@services/overlays/alerts';
+import { CoreLoadings } from '@services/loadings';
-import { CoreLoadings } from '@services/overlays/loadings';
 import { CorePlatform } from '@services/platform';
-import { DomSanitizer, Translate } from '@singletons';
+import { CoreDomUtils } from '@services/utils/dom';
+import { DomSanitizer } from '@singletons';
 
 /**
  * Component to render data latlong field.
@@ -140,12 +140,12 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginBa
      */
     protected showLocationErrorModal(error: CoreAnyError | CoreGeolocationError): void {
         if (error instanceof CoreGeolocationError) {
-            CoreAlerts.showError(Translate.instant(this.getGeolocationErrorMessage(error)));
+            CoreDomUtils.showErrorModal(this.getGeolocationErrorMessage(error), true);
 
             return;
         }
 
-        CoreAlerts.showError(error, { default: 'Error getting location' });
+        CoreDomUtils.showErrorModalDefault(error, 'Error getting location');
     }
 
     /**

src/addons/mod/data/pages/edit/edit.ts

@@ -21,6 +21,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreForms } from '@singletons/form';
 import { CoreUtils } from '@singletons/utils';
 import { Translate } from '@singletons';
@@ -43,10 +44,9 @@ import { CoreText } from '@singletons/text';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_DATA_COMPONENT, ADDON_MOD_DATA_ENTRY_CHANGED, AddonModDataTemplateType } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreArray } from '@singletons/array';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the view edit page.
@@ -126,7 +126,7 @@ export class AddonModDataEditPage implements OnInit {
             this.entryId = CoreNavigator.getRouteNumberParam('entryId') || undefined;
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             CoreNavigator.back();
 
@@ -156,7 +156,7 @@ export class AddonModDataEditPage implements OnInit {
 
         if (changed) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.
@@ -238,7 +238,7 @@ export class AddonModDataEditPage implements OnInit {
 
                 if (!haveAccess) {
                     // You shall not pass, go back.
-                    CoreAlerts.showError(Translate.instant('addon.mod_data.noaccess'));
+                    CoreDomUtils.showErrorModal('addon.mod_data.noaccess', true);
 
                     // Go back to entry list.
                     this.forceLeave = true;
@@ -251,7 +251,7 @@ export class AddonModDataEditPage implements OnInit {
             this.editFormRender = this.displayEditFields();
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         }
 
         this.loaded = true;
@@ -395,9 +395,10 @@ export class AddonModDataEditPage implements OnInit {
                     this.scrollToFirstError();
 
                     if (updateEntryResult.generalnotifications?.length) {
-                        CoreAlerts.show({
+                        CoreDomUtils.showAlertWithOptions({
                             header: Translate.instant('core.notice'),
                             message: CoreText.buildMessage(updateEntryResult.generalnotifications),
+                            buttons: [Translate.instant('core.ok')],
                         });
                     }
                 }
@@ -405,7 +406,7 @@ export class AddonModDataEditPage implements OnInit {
                 modal.dismiss();
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Cannot edit entry' });
+            CoreDomUtils.showErrorModalDefault(error, 'Cannot edit entry', true);
         }
     }
 

src/addons/mod/data/pages/entry/entry.ts

@@ -21,6 +21,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreGroups, CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreArray } from '@singletons/array';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { AddonModDataComponentsCompileModule } from '../../components/components-compile.module';
@@ -43,8 +44,6 @@ import {
     AddonModDataTemplateMode,
 } from '../../constants';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays the view entry page.
@@ -157,7 +156,8 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
             const sortBy = Number(CoreNavigator.getRouteParam('sortBy'));
             this.sortBy = isNaN(sortBy) ? this.sortBy : sortBy;
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -236,7 +236,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
                 return this.refreshAllData(isPtr);
             }
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.content?.scrollToTop();
             this.entryLoaded = true;

src/addons/mod/data/services/data-helper.ts

@@ -47,9 +47,8 @@ import {
     AddonModDataTemplateType,
     AddonModDataTemplateMode,
 } from '../constants';
-import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
+import { CoreToasts, ToastDuration } from '@services/toasts';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Service that provides helper functions for datas.
@@ -165,7 +164,7 @@ export class AddonModDataHelperProvider {
                 // Approve/disapprove entry.
                 await AddonModData.approveEntry(dataId, entryId, approve, courseId, siteId);
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('addon.mod_data.errorapproving') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_data.errorapproving', true);
 
                 throw error;
             }
@@ -857,7 +856,7 @@ export class AddonModDataHelperProvider {
         siteId = siteId || CoreSites.getCurrentSiteId();
 
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('addon.mod_data.confirmdeleterecord'));
+            await CoreDomUtils.showDeleteConfirm('addon.mod_data.confirmdeleterecord');
 
             const modal = await CoreLoadings.show();
 
@@ -870,7 +869,7 @@ export class AddonModDataHelperProvider {
                     await AddonModData.deleteEntry(dataId, entryId, courseId, siteId);
                 }
             } catch (message) {
-                CoreAlerts.showError(message, { default: Translate.instant('addon.mod_data.errordeleting') });
+                CoreDomUtils.showErrorModalDefault(message, 'addon.mod_data.errordeleting', true);
 
                 modal.dismiss();
 

src/addons/mod/data/services/handlers/edit-link-lazy.ts

@@ -17,7 +17,7 @@ import { Params } from '@angular/router';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_DATA_FEATURE_NAME, ADDON_MOD_DATA_PAGE_NAME } from '../../constants';
 import { AddonModDataEditLinkHandlerService } from '@addons/mod/data/services/handlers/edit-link';

src/addons/mod/data/services/handlers/show-link-lazy.ts

@@ -17,7 +17,7 @@ import { Params } from '@angular/router';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_DATA_PAGE_NAME } from '../../constants';
 import { AddonModDataShowLinkHandlerService } from '@addons/mod/data/services/handlers/show-link';

src/addons/mod/feedback/pages/attempt/attempt.ts

@@ -17,6 +17,7 @@ import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
 import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFileHelper } from '@services/file-helper';
 import { AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
 import {
@@ -28,8 +29,6 @@ import { AddonModFeedbackAttempt, AddonModFeedbackFormItem, AddonModFeedbackHelp
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_FEEDBACK_COMPONENT } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays a feedback attempt review.
@@ -90,7 +89,8 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
         try {
             await this.attempts.start();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -156,7 +156,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy {
             this.logView();
         } catch (message) {
             // Some call failed on fetch, go back.
-            CoreAlerts.showError(message, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
             CoreNavigator.back();
         } finally {
             this.loaded = true;

src/addons/mod/feedback/pages/attempts/attempts.ts

@@ -20,13 +20,12 @@ import { CorePromisedValue } from '@classes/promised-value';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreGroupInfo } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { AddonModFeedbackAttemptItem, AddonModFeedbackAttemptsSource } from '../../classes/feedback-attempts-source';
 import { AddonModFeedbackWSAnonAttempt, AddonModFeedbackWSAttempt } from '../../services/feedback';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays feedback attempts.
@@ -117,7 +116,8 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
 
             this.promisedAttempts.resolve(new AddonModFeedbackAttemptsManager(source, this.route.component));
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -135,7 +135,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
         } catch (error) {
             this.fetchFailed = true;
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         }
 
         await attempts.start(this.splitView);
@@ -163,7 +163,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
         } catch (error) {
             this.fetchFailed = true;
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             infiniteComplete && infiniteComplete();
         }
@@ -186,7 +186,7 @@ export class AddonModFeedbackAttemptsPage implements AfterViewInit, OnDestroy {
         } catch (error) {
             this.fetchFailed = true;
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             refresher.complete();
         }

src/addons/mod/feedback/pages/form/form.ts

@@ -21,6 +21,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@singletons/utils';
 import { NgZone, Translate } from '@singletons';
 import { CoreEvents } from '@singletons/events';
@@ -41,12 +42,11 @@ import {
     ADDON_MOD_FEEDBACK_PAGE_NAME,
     AddonModFeedbackIndexTabName,
 } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreError } from '@classes/errors/error';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreObject } from '@singletons/object';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays feedback form.
@@ -109,7 +109,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
             this.preview = !!CoreNavigator.getRouteBooleanParam('preview');
             this.fromIndex = !!CoreNavigator.getRouteBooleanParam('fromIndex');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             CoreNavigator.back();
 
@@ -119,7 +119,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
         await this.fetchData();
 
         if (!this.access || this.access.isempty && (!this.access.canedititems && !this.access.canviewreports)) {
-            CoreAlerts.showError(Translate.instant('core.nopermissiontoaccesspage'));
+            CoreDomUtils.showErrorModal(Translate.instant('core.nopermissiontoaccesspage'));
 
             CoreNavigator.back();
 
@@ -160,7 +160,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
             if (this.items && !this.completed && this.originalData) {
                 // Form submitted. Check if there is any change.
                 if (!CoreObject.basicLeftCompare(responses, this.originalData, 3)) {
-                    await CoreAlerts.confirmLeaveWithChanges();
+                    await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
                 }
             }
         }
@@ -200,7 +200,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
 
             await this.fetchFeedbackPageData(page);
         } catch (message) {
-            CoreAlerts.showError(message, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
             this.forceLeave = true;
             CoreNavigator.back();
         } finally {
@@ -405,7 +405,7 @@ export class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
                 await this.fetchFeedbackPageData(response.jumpto);
             }
         } catch (message) {
-            CoreAlerts.showError(message, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
         } finally {
             this.feedbackLoaded = true;
         }

src/addons/mod/feedback/pages/nonrespondents/nonrespondents.ts

@@ -15,13 +15,12 @@
 import { Component, OnInit } from '@angular/core';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { AddonModFeedback, AddonModFeedbackWSFeedback } from '../../services/feedback';
 import { AddonModFeedbackHelper, AddonModFeedbackNonRespondent } from '../../services/feedback-helper';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { Translate } from '@singletons';
 
 /**
  * Page that displays feedback non respondents.
@@ -71,7 +70,8 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.selectedGroup = CoreNavigator.getRouteNumberParam('group') || 0;
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -102,7 +102,7 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
 
             this.logView();
         } catch (message) {
-            CoreAlerts.showError(message, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
 
             if (!refresh) {
                 // Some call failed on first fetch, go back.
@@ -162,7 +162,7 @@ export class AddonModFeedbackNonRespondentsPage implements OnInit {
         try {
             await this.loadGroupUsers(groupId);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             infiniteComplete && infiniteComplete();
         }

src/addons/mod/feedback/services/feedback-helper.ts

@@ -17,6 +17,7 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreUser } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils } from '@singletons/utils';
@@ -39,9 +40,8 @@ import {
     ADDON_MOD_FEEDBACK_MULTICHOICE_HIDENOSELECT,
     ADDON_MOD_FEEDBACK_PAGE_NAME,
 } from '../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreText } from '@singletons/text';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 const MODE_RESPONSETIME = 1;
 const MODE_COURSE = 2;
@@ -216,7 +216,7 @@ export class AddonModFeedbackHelperProvider {
                 },
             );
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error opening link.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
         } finally {
             modal.dismiss();
         }

src/addons/mod/feedback/services/handlers/analysis-link.ts

@@ -17,10 +17,10 @@ import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base
 import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_FEEDBACK_PAGE_NAME, AddonModFeedbackIndexTabName } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Content links handler for a feedback analysis.
@@ -65,7 +65,7 @@ export class AddonModFeedbackAnalysisLinkHandlerService extends CoreContentLinks
                         },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error opening link.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/feedback/services/handlers/complete-link.ts

@@ -18,10 +18,10 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Content links handler for feedback complete questions.
@@ -60,7 +60,7 @@ export class AddonModFeedbackCompleteLinkHandlerService extends CoreContentLinks
                         },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error opening link.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/feedback/services/handlers/print-link.ts

@@ -18,10 +18,10 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Content links handler for feedback print questions.
@@ -60,7 +60,7 @@ export class AddonModFeedbackPrintLinkHandlerService extends CoreContentLinksHan
                         },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error opening link.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts

@@ -18,10 +18,10 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 /**
  * Content links handler for feedback show non respondents.
  * Match mod/feedback/show_nonrespondents.php with a valid feedback id.
@@ -54,7 +54,7 @@ export class AddonModFeedbackShowNonRespondentsLinkHandlerService extends CoreCo
                         { siteId },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error opening link.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts

@@ -14,14 +14,14 @@
 
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { PopoverController } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { AddonModForum, AddonModForumDiscussion } from '../../services/forum';
 import { ADDON_MOD_FORUM_CHANGE_DISCUSSION_EVENT } from '../../constants';
-import { CoreToasts } from '@services/overlays/toasts';
+import { CoreToasts } from '@services/toasts';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * This component is meant to display a popover with the discussion options.
@@ -86,7 +86,7 @@ export class AddonModForumDiscussionOptionsMenuComponent implements OnInit {
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             PopoverController.dismiss();
         } finally {
             modal.dismiss();
@@ -118,7 +118,7 @@ export class AddonModForumDiscussionOptionsMenuComponent implements OnInit {
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             PopoverController.dismiss();
         } finally {
             modal.dismiss();
@@ -150,7 +150,7 @@ export class AddonModForumDiscussionOptionsMenuComponent implements OnInit {
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             PopoverController.dismiss();
         } finally {
             modal.dismiss();

src/addons/mod/forum/components/index/index.ts

@@ -38,6 +38,7 @@ import {
 } from '@addons/mod/forum/services/forum-sync';
 import { CoreSites } from '@services/sites';
 import { CoreUser } from '@features/user/services/user';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreScreen } from '@services/screen';
@@ -64,10 +65,9 @@ import {
     AddonModForumType,
 } from '@addons/mod/forum/constants';
 import { CoreSearchGlobalSearch } from '@features/search/services/global-search';
-import { CoreToasts } from '@services/overlays/toasts';
+import { CoreToasts } from '@services/toasts';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 /**
  * Component that displays a forum entry page.
  */
@@ -475,7 +475,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
 
             await discussions.load();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_forum.errorgetforum') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetforum', true);
 
             this.fetchFailed = true;
         } finally {
@@ -618,7 +618,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 await CoreUser.setUserPreference(ADDON_MOD_FORUM_PREFERENCE_SORTORDER, sortOrder.value.toFixed(0));
                 await this.showLoadingAndFetch();
             } catch (error) {
-                CoreAlerts.showError(error, { default: 'Error updating preference.' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error updating preference.');
             }
         }
     }
@@ -679,7 +679,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 this.discussions?.reload(),
             ]);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.errorloadingcontent') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         } finally {
             modal.dismiss();
         }

src/addons/mod/forum/components/post-options-menu/post-options-menu.ts

@@ -17,9 +17,9 @@ import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreNetwork } from '@services/network';
 import { AddonModForum, AddonModForumPost } from '@addons/mod/forum/services/forum';
 import { PopoverController } from '@singletons';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreNetworkError } from '@classes/errors/network-error';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * This component is meant to display a popover with the post options.
@@ -65,7 +65,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit {
                             readingStrategy: CoreSitesReadingStrategy.ONLY_NETWORK,
                         });
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error getting discussion post.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error getting discussion post.');
                 }
             } else {
                 this.loaded = true;
@@ -111,7 +111,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit {
     deletePost(): void {
         if (!this.offlinePost) {
             if (!CoreNetwork.isOnline()) {
-                CoreAlerts.showError(new CoreNetworkError());
+                CoreDomUtils.showErrorModal(new CoreNetworkError());
 
                 return;
             }
@@ -127,7 +127,7 @@ export class AddonModForumPostOptionsMenuComponent implements OnInit {
      */
     editPost(): void {
         if (!this.offlinePost && !CoreNetwork.isOnline()) {
-            CoreAlerts.showError(new CoreNetworkError());
+            CoreDomUtils.showErrorModal(new CoreNetworkError());
 
             return;
         }

src/addons/mod/forum/components/post/post.ts

@@ -25,6 +25,7 @@ import {
     ViewChild,
 } from '@angular/core';
 import { FormControl } from '@angular/forms';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreEvents } from '@singletons/events';
 import { CoreSites } from '@services/sites';
 import {
@@ -52,14 +53,13 @@ import { AddonModForumSharedPostFormData } from '../../pages/discussion/discussi
 import { CoreDom } from '@singletons/dom';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_FORUM_CHANGE_DISCUSSION_EVENT, ADDON_MOD_FORUM_COMPONENT } from '../../constants';
-import { CoreToasts } from '@services/overlays/toasts';
+import { CoreToasts } from '@services/toasts';
 import { toBoolean } from '@/core/transforms/boolean';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CoreWSFile } from '@services/ws';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreWSError } from '@classes/errors/wserror';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Components that shows a discussion post, its attachments and the action buttons allowed (reply, etc.).
@@ -155,7 +155,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
         this.analyticsLogEvent('mod_forum_delete_post', `/mod/forum/post.php?delete=${this.post.id}`);
 
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('addon.mod_forum.deletesure'));
+            await CoreDomUtils.showDeleteConfirm('addon.mod_forum.deletesure');
 
             const modal = await CoreLoadings.show('core.deleting', true);
 
@@ -181,7 +181,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
                     translateMessage: true,
                 });
             } catch (error) {
-                CoreAlerts.showError(error);
+                CoreDomUtils.showErrorModal(error);
             } finally {
                 modal.dismiss();
             }
@@ -364,7 +364,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             this.analyticsLogEvent('mod_forum_update_discussion_post', `/mod/forum/post.php?edit=${this.post.id}`);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_forum.errorgetpost') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetpost', true);
         } finally {
             modal.dismiss();
         }
@@ -384,13 +384,13 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      */
     async send(): Promise<void> {
         if (!this.formData.subject) {
-            CoreAlerts.showError(Translate.instant('addon.mod_forum.erroremptysubject'));
+            CoreDomUtils.showErrorModal('addon.mod_forum.erroremptysubject', true);
 
             return;
         }
 
         if (!this.formData.message) {
-            CoreAlerts.showError(Translate.instant('addon.mod_forum.erroremptymessage'));
+            CoreDomUtils.showErrorModal('addon.mod_forum.erroremptymessage', true);
 
             return;
         }
@@ -481,9 +481,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
 
             this.unblockOperation();
         } catch (error) {
-            CoreAlerts.showError(error, {
+            CoreDomUtils.showErrorModalDefault(
-                default: Translate.instant(isEditOnline ? 'addon.mod_forum.couldnotupdate' : 'addon.mod_forum.couldnotadd'),
+                error,
-            });
+                isEditOnline ? 'addon.mod_forum.couldnotupdate' : 'addon.mod_forum.couldnotadd',
+                true,
+            );
         } finally {
             modal.dismiss();
         }
@@ -587,7 +589,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
      */
     async discardOfflineReply(): Promise<void> {
         try {
-            await CoreAlerts.confirmDelete(Translate.instant('core.areyousure'));
+            await CoreDomUtils.showDeleteConfirm();
 
             const promises: Promise<void>[] = [];
 
@@ -641,7 +643,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
     protected async confirmDiscard(): Promise<void> {
         if (AddonModForumHelper.hasPostDataChanged(this.formData, this.originalData)) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirm(Translate.instant('core.confirmloss'));
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmloss'));
         }
 
         this.unblockOperation();

src/addons/mod/forum/pages/discussion/discussion.ts

@@ -28,6 +28,7 @@ import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@singletons/utils';
 import { NgZone, Translate } from '@singletons';
 import { CoreDom } from '@singletons/dom';
@@ -59,11 +60,10 @@ import {
     AddonModForumType,
 } from '../../constants';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreToasts } from '@services/overlays/toasts';
+import { CoreToasts } from '@services/toasts';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreObject } from '@singletons/object';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 type SortType = 'flat-newest' | 'flat-oldest' | 'nested';
 
@@ -171,7 +171,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 await this.discussions.start();
             }
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             this.goBack();
 
@@ -303,7 +303,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
     async canLeave(): Promise<boolean> {
         if (AddonModForumHelper.hasPostDataChanged(this.formData, this.originalData)) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.
@@ -571,7 +571,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             this.hasOfflineRatings =
                 await CoreRatingOffline.hasRatings('mod_forum', 'post', ContextLevel.MODULE, this.cmId, this.discussionId);
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             this.discussionLoaded = true;
             this.refreshIcon = CoreConstants.ICON_REFRESH;
@@ -616,7 +616,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 .syncDiscussionReplies(this.discussionId)
                 .then((result) => {
                     if (result.warnings && result.warnings.length) {
-                        CoreAlerts.show({ message: result.warnings[0] });
+                        CoreDomUtils.showAlert(undefined, result.warnings[0]);
                     }
 
                     if (result && result.updated && this.forumId) {
@@ -637,7 +637,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 .syncRatings(this.cmId, this.discussionId)
                 .then((result) => {
                     if (result.warnings && result.warnings.length) {
-                        CoreAlerts.show({ message: result.warnings[0] });
+                        CoreDomUtils.showAlert(undefined, result.warnings[0]);
                     }
 
                     return;
@@ -648,7 +648,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
             await Promise.all(promises);
         } catch (error) {
             if (showErrors) {
-                CoreAlerts.showError(error, { default: Translate.instant('core.errorsync') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.errorsync', true);
             }
 
             throw new Error('Failed syncing discussion');
@@ -740,7 +740,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }
@@ -776,7 +776,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }
@@ -812,7 +812,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes
                 translateMessage: true,
             });
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             modal.dismiss();
         }

src/addons/mod/forum/pages/new-discussion/new-discussion.ts

@@ -27,6 +27,7 @@ import {
 import { CoreEditorRichTextEditorComponent } from '@features/editor/components/rich-text-editor/rich-text-editor';
 import { AddonModForumSync } from '@addons/mod/forum/services/forum-sync';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreSync } from '@services/sync';
 import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/forum-offline';
@@ -51,9 +52,8 @@ import {
     ADDON_MOD_FORUM_NEW_DISCUSSION_EVENT,
 } from '../../constants';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 type NewDiscussionData = {
     subject: string;
@@ -159,7 +159,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
                 await this.discussions.start();
             }
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             this.goBack();
 
@@ -183,10 +183,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
         // Refresh data if this discussion is synchronized automatically.
         this.syncObserver = CoreEvents.on(ADDON_MOD_FORUM_AUTO_SYNCED, data => {
             if (data.forumId == this.forumId && data.userId == CoreSites.getCurrentSiteUserId()) {
-                CoreAlerts.show({
+                CoreDomUtils.showAlertTranslated('core.notice', 'core.contenteditingsynced');
-                    header: Translate.instant('core.notice'),
-                    message: Translate.instant('core.contenteditingsynced'),
-                });
                 this.returnToDiscussions();
             }
         }, CoreSites.getCurrentSiteId());
@@ -339,7 +336,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_forum.errorgetgroups') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.errorgetgroups', true);
 
             this.showForm = false;
         }
@@ -544,12 +541,12 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
         };
 
         if (!subject) {
-            CoreAlerts.showError(Translate.instant('addon.mod_forum.erroremptysubject'));
+            CoreDomUtils.showErrorModal('addon.mod_forum.erroremptysubject', true);
 
             return;
         }
         if (!message) {
-            CoreAlerts.showError(Translate.instant('addon.mod_forum.erroremptymessage'));
+            CoreDomUtils.showErrorModal('addon.mod_forum.erroremptymessage', true);
 
             return;
         }
@@ -587,7 +584,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
 
             if (discussionIds && discussionIds.length < groupIds.length) {
                 // Some discussions could not be created.
-                CoreAlerts.showError(Translate.instant('addon.mod_forum.errorposttoallgroups'));
+                CoreDomUtils.showErrorModalDefault(null, 'addon.mod_forum.errorposttoallgroups', true);
             }
 
             CoreForms.triggerFormSubmittedEvent(
@@ -598,7 +595,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
 
             this.returnToDiscussions(discussionIds, discTimecreated);
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_forum.cannotcreatediscussion') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_forum.cannotcreatediscussion', true);
         } finally {
             modal.dismiss();
         }
@@ -609,7 +606,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
      */
     async discard(): Promise<void> {
         try {
-            await CoreAlerts.confirm(Translate.instant('core.areyousure'));
+            await CoreDomUtils.showConfirm(Translate.instant('core.areyousure'));
 
             const promises: Promise<unknown>[] = [];
 
@@ -662,7 +659,7 @@ export class AddonModForumNewDiscussionPage implements OnInit, OnDestroy, CanLea
 
         if (AddonModForumHelper.hasPostDataChanged(this.newDiscussion, this.originalData)) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.

src/addons/mod/forum/pages/search/search.ts

@@ -26,12 +26,11 @@ import {
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrl } from '@singletons/url';
 import { CoreUtils } from '@singletons/utils';
 import { Translate } from '@singletons';
 import { CorePromiseUtils } from '@singletons/promise-utils';
-import { CoreAlerts } from '@services/overlays/alerts';
-import { CoreLoadings } from '@services/overlays/loadings';
 
 @Component({
     selector: 'page-addon-mod-forum-search',
@@ -83,7 +82,7 @@ export class AddonModForumSearchPage implements OnInit {
             this.resultsSource.setFilters(filters);
             this.ready.resolve();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
@@ -104,7 +103,7 @@ export class AddonModForumSearchPage implements OnInit {
             return;
         }
 
-        await CoreLoadings.showOperationModals('core.searching', true, async () => {
+        await CoreDomUtils.showOperationModals('core.searching', true, async () => {
             await this.resultsSource.reload();
             await CorePromiseUtils.ignoreErrors(
                 CoreSearchGlobalSearch.logViewResults(this.resultsSource.getQuery(), this.resultsSource.getFilters()),

src/addons/mod/forum/services/handlers/post-link.ts

@@ -18,7 +18,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
 import { makeSingleton } from '@singletons';
 import { ADDON_MOD_FORUM_PAGE_NAME } from '../../constants';
 

src/addons/mod/glossary/components/index/index.ts

@@ -28,6 +28,7 @@ import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
 import { IonContent } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreText } from '@singletons/text';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -57,8 +58,7 @@ import {
     ADDON_MOD_GLOSSARY_PAGE_NAME,
     GLOSSARY_AUTO_SYNCED,
 } from '../../constants';
-import { CorePopovers } from '@services/overlays/popovers';
+import { CorePopovers } from '@services/popovers';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays a glossary entry page.
@@ -339,7 +339,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             await entries.load();
         } catch (error) {
             this.loadMoreError = true;
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingentries') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentries', true);
         } finally {
             infiniteComplete && infiniteComplete();
         }

src/addons/mod/glossary/pages/edit/edit.ts

@@ -23,6 +23,7 @@ import { CoreFileEntry } from '@services/file-helper';
 import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreText } from '@singletons/text';
 import { CoreWSError } from '@classes/errors/wserror';
 import { Translate } from '@singletons';
@@ -39,8 +40,7 @@ import { AddonModGlossaryHelper } from '../../services/glossary-helper';
 import { AddonModGlossaryOffline } from '../../services/glossary-offline';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_GLOSSARY_COMPONENT } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays the edit form.
@@ -108,7 +108,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
                 this.handler = new AddonModGlossaryNewFormHandler(this);
             }
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             CoreNavigator.back();
 
             return;
@@ -142,7 +142,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
                 url: '/mod/glossary/edit.php' + (this.entry ? `?cmid=${this.cmId}&id=${this.entry.id}` : ''),
             });
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingglossary') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingglossary', true);
             CoreNavigator.back();
         }
     }
@@ -187,7 +187,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
 
         if (this.hasDataChanged()) {
             // Show confirmation if some data has been modified.
-            await CoreAlerts.confirmLeaveWithChanges();
+            await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
         }
 
         // Delete the local files from the tmp folder.
@@ -203,7 +203,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
      */
     async save(): Promise<void> {
         if (!this.data.concept || !this.data.definition) {
-            CoreAlerts.showError(Translate.instant('addon.mod_glossary.fillfields'));
+            CoreDomUtils.showErrorModal('addon.mod_glossary.fillfields', true);
 
             return;
         }
@@ -223,7 +223,7 @@ export class AddonModGlossaryEditPage implements OnInit, CanLeave {
 
             CoreNavigator.back();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.cannoteditentry') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.cannoteditentry', true);
         } finally {
             modal.dismiss();
         }

src/addons/mod/glossary/pages/entry/entry.ts

@@ -26,6 +26,7 @@ import { CoreTag } from '@features/tag/services/tag';
 import { FileEntry } from '@awesome-cordova-plugins/file/ngx';
 import { CoreNavigator } from '@services/navigator';
 import { CoreNetwork } from '@services/network';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { Translate } from '@singletons';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -39,9 +40,8 @@ import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_GLOSSARY_COMPONENT, ADDON_MOD_GLOSSARY_ENTRY_UPDATED, ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
+import { CoreToasts, ToastDuration } from '@services/toasts';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a glossary entry.
@@ -126,7 +126,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
                 onlineEntryId = Number(this.entrySlug);
             }
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
             this.goBack();
 
             return;
@@ -185,7 +185,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
 
         const glossaryId = this.glossary?.id;
         const cancelled = await CorePromiseUtils.promiseFails(
-            CoreAlerts.confirm(Translate.instant('addon.mod_glossary.areyousuredelete')),
+            CoreDomUtils.showConfirm(Translate.instant('addon.mod_glossary.areyousuredelete')),
         );
 
         if (!glossaryId || cancelled) {
@@ -224,7 +224,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
 
             await this.goBack();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errordeleting') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errordeleting', true);
         } finally {
             modal.dismiss();
         }
@@ -274,7 +274,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingentry') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentry', true);
         }
     }
 
@@ -298,7 +298,7 @@ export class AddonModGlossaryEntryPage implements OnInit, OnDestroy {
             this.canEdit = true;
             this.canDelete = true;
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingentry') });
+            CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentry', true);
         }
     }
 

src/addons/mod/glossary/services/handlers/edit-link.ts

@@ -18,10 +18,10 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
-import { makeSingleton, Translate } from '@singletons';
+import { CoreDomUtils } from '@services/utils/dom';
+import { makeSingleton } from '@singletons';
 import { ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Content links handler for glossary new entry.
@@ -56,7 +56,7 @@ export class AddonModGlossaryEditLinkHandlerService extends CoreContentLinksHand
                         { siteId },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingglossary') });
+                    CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingglossary', true);
                 } finally {
                     // Just in case. In fact we need to dismiss the modal before showing a toast or error message.
                     modal.dismiss();

src/addons/mod/glossary/services/handlers/entry-link.ts

@@ -18,11 +18,11 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
-import { makeSingleton, Translate } from '@singletons';
+import { CoreDomUtils } from '@services/utils/dom';
+import { makeSingleton } from '@singletons';
 import { AddonModGlossary } from '../glossary';
 import { ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Handler to treat links to glossary entries.
@@ -67,7 +67,7 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
                         },
                     );
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: Translate.instant('addon.mod_glossary.errorloadingentry') });
+                    CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentry', true);
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/h5pactivity/components/index/index.ts

@@ -28,6 +28,7 @@ import { CoreNetwork } from '@services/network';
 import { CoreFilepool } from '@services/filepool';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreWSFile } from '@services/ws';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import {
@@ -53,12 +54,10 @@ import {
     ADDON_MOD_H5PACTIVITY_TRACK_COMPONENT,
 } from '../../constants';
 import { CoreH5PMissingDependenciesError } from '@features/h5p/classes/errors/missing-dependencies-error';
-import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
+import { CoreToasts, ToastDuration } from '@services/toasts';
 import { Subscription } from 'rxjs';
 import { NgZone, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
-import { CoreErrorHelper } from '@services/error-helper';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays an H5P activity entry page.
@@ -147,7 +146,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
 
         if (this.playing && !this.fileUrl && !this.isOnline && wasOnline && this.trackComponent) {
             // User lost connection while playing an online package with tracking. Show an error.
-            this.offlineErrorAlert = await CoreAlerts.showError(
+            this.offlineErrorAlert = await CoreDomUtils.showErrorModal(
                 new CoreError(Translate.instant('core.course.changesofflinemaybelost'), {
                     title: Translate.instant('core.youreoffline'),
                 }),
@@ -399,14 +398,14 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         }
 
         if (!CoreNetwork.isOnline()) {
-            CoreAlerts.showError(Translate.instant('core.networkerrormsg'));
+            CoreDomUtils.showErrorModal('core.networkerrormsg', true);
 
             return;
         }
 
         try {
             // Confirm the download if needed.
-            await CoreAlerts.confirmDownloadSize({ size: this.deployedFile.filesize || 0, total: true });
+            await CoreDomUtils.confirmDownloadSize({ size: this.deployedFile.filesize || 0, total: true });
 
             await this.downloadDeployedFile();
 
@@ -415,7 +414,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
             }
 
         } catch (error) {
-            if (CoreErrorHelper.isCanceledError(error) || this.isDestroyed) {
+            if (CoreDomUtils.isCanceledError(error) || this.isDestroyed) {
                 // User cancelled or view destroyed, stop.
                 return;
             }
@@ -434,7 +433,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 return;
             }
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.errordownloading') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
         }
     }
 
@@ -451,7 +450,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 this.play();
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.errordownloading') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
         }
     }
 
@@ -523,7 +522,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
         if (!this.fileUrl && !this.isOnline) {
             this.triedToPlay = true;
 
-            CoreAlerts.showError(new CoreError(Translate.instant('core.connectandtryagain'), {
+            CoreDomUtils.showErrorModal(new CoreError(Translate.instant('core.connectandtryagain'), {
                 title: Translate.instant('core.course.activitynotavailableoffline'),
             }));
 
@@ -698,7 +697,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 }
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error sending tracking data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error sending tracking data.');
         }
     }
 
@@ -758,7 +757,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
 
             this.hasOffline = !sent;
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error sending tracking data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error sending tracking data.');
         }
     }
 
@@ -779,7 +778,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
                 },
             );
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error sending tracking data.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error sending tracking data.');
         }
     }
 

src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.ts

@@ -16,6 +16,7 @@ import { Component, OnInit } from '@angular/core';
 
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import {
     AddonModH5PActivity,
@@ -25,7 +26,6 @@ import {
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_H5PACTIVITY_COMPONENT } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays results of an attempt.
@@ -78,7 +78,8 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.attemptId = CoreNavigator.getRequiredRouteNumberParam('attemptId');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -115,7 +116,7 @@ export class AddonModH5PActivityAttemptResultsPage implements OnInit {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading attempt.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempt.');
         } finally {
             this.loaded = true;
         }

src/addons/mod/h5pactivity/pages/index/index.ts

@@ -16,8 +16,9 @@ import { Component, OnDestroy, ViewChild } from '@angular/core';
 
 import { CoreCourseModuleMainActivityPage } from '@features/course/classes/main-activity-page';
 import { CanLeave } from '@guards/can-leave';
+import { CoreDomUtils } from '@services/utils/dom';
+import { Translate } from '@singletons';
 import { AddonModH5PActivityIndexComponent } from '../../components/index';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays an H5P activity.
@@ -44,7 +45,7 @@ export class AddonModH5PActivityIndexPage extends CoreCourseModuleMainActivityPa
 
         if (!this.canLeaveSafely) {
             try {
-                await CoreAlerts.confirmLeaveWithChanges();
+                await CoreDomUtils.showConfirm(Translate.instant('core.confirmleaveunknownchanges'));
 
                 return true;
             } catch {

src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.ts

@@ -17,6 +17,7 @@ import { Component, OnInit } from '@angular/core';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import {
     AddonModH5PActivity,
@@ -26,7 +27,6 @@ import {
 } from '../../services/h5pactivity';
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays user attempts of a certain user.
@@ -79,7 +79,8 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
             this.userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getCurrentSiteUserId();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -117,7 +118,7 @@ export class AddonModH5PActivityUserAttemptsPage implements OnInit {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading attempts.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
         } finally {
             this.loaded = true;
         }

src/addons/mod/h5pactivity/pages/users-attempts/users-attempts.ts

@@ -16,6 +16,7 @@ import { Component, OnInit } from '@angular/core';
 import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import {
     AddonModH5PActivity,
@@ -25,7 +26,6 @@ import {
 import { CoreTime } from '@singletons/time';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { AddonModH5PActivityGradeMethod } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays all users that can attempt an H5P activity.
@@ -74,7 +74,8 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.cmId = CoreNavigator.getRequiredRouteNumberParam('cmId');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -110,7 +111,7 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
 
             this.logView();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading attempts.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading attempts.');
         } finally {
             this.loaded = true;
         }
@@ -191,7 +192,7 @@ export class AddonModH5PActivityUsersAttemptsPage implements OnInit {
         try {
             await this.fetchUsers(false);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading more users' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading more users');
 
             this.fetchMoreUsersFailed = true;
         }

src/addons/mod/h5pactivity/services/handlers/report-link.ts

@@ -19,12 +19,12 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { makeSingleton } from '@singletons';
 import { AddonModH5PActivity } from '../h5pactivity';
 import { ADDON_MOD_H5PACTIVITY_PAGE_NAME } from '../../constants';
-import { CoreLoadings } from '@services/overlays/loadings';
+import { CoreLoadings } from '@services/loadings';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Handler to treat links to H5P activity report.
@@ -65,7 +65,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
                         await this.openUserAttempts(module.id, module.course, instanceId, siteId, userId);
                     }
                 } catch (error) {
-                    CoreAlerts.showError(error, { default: 'Error processing link.' });
+                    CoreDomUtils.showErrorModalDefault(error, 'Error processing link.');
                 } finally {
                     modal.dismiss();
                 }

src/addons/mod/imscp/pages/view/view.ts

@@ -22,12 +22,12 @@ import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
 import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreErrorHelper } from '@services/error-helper';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { Translate } from '@singletons';
 import { AddonModImscp, AddonModImscpImscp, AddonModImscpTocItem } from '../../services/imscp';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that displays a IMSCP content.
@@ -61,7 +61,8 @@ export class AddonModImscpViewPage implements OnInit {
             this.courseId = CoreNavigator.getRequiredRouteNumberParam('courseId');
             this.initialItemHref = CoreNavigator.getRouteParam('initialHref');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
+
             CoreNavigator.back();
 
             return;
@@ -117,7 +118,7 @@ export class AddonModImscpViewPage implements OnInit {
             try {
                 await this.loadItemHref(this.currentHref);
             } catch (error) {
-                CoreAlerts.showError(error, { default: Translate.instant('addon.mod_imscp.deploymenterror') });
+                CoreDomUtils.showErrorModalDefault(error, 'addon.mod_imscp.deploymenterror', true);
 
                 return;
             }
@@ -129,7 +130,7 @@ export class AddonModImscpViewPage implements OnInit {
                 this.warning = '';
             }
         } catch (error) {
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
         } finally {
             this.loaded = true;
         }

src/addons/mod/lesson/components/index/index.ts

@@ -22,6 +22,7 @@ import { CoreUser } from '@features/user/services/user';
 import { IonContent, IonInput } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreForms } from '@singletons/form';
 import { CoreText } from '@singletons/text';
 import { CorePromiseUtils } from '@singletons/promise-utils';
@@ -51,7 +52,6 @@ import {
     ADDON_MOD_LESSON_DATA_SENT_EVENT,
     ADDON_MOD_LESSON_PAGE_NAME,
 } from '../../constants';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Component that displays a lesson entry page.
@@ -126,7 +126,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
         try {
             await this.setGroup(groupId);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error getting report.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error getting report.');
         } finally {
             this.reportLoaded = true;
         }
@@ -464,7 +464,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
 
         if (!this.groupInfo) {
             this.fetchReportData().catch((error) => {
-                CoreAlerts.showError(error, { default: 'Error getting report.' });
+                CoreDomUtils.showErrorModalDefault(error, 'Error getting report.');
             });
         }
 
@@ -613,7 +613,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
                 // Error downloading but there is something offline, allow continuing it.
                 this.playLesson(continueLast);
             } else {
-                CoreAlerts.showError(error, { default: Translate.instant('core.errordownloading') });
+                CoreDomUtils.showErrorModalDefault(error, 'core.errordownloading', true);
             }
         } finally {
             this.showSpinner = false;
@@ -632,7 +632,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
 
         const password = passwordEl?.value;
         if (!password) {
-            CoreAlerts.showError(Translate.instant('addon.mod_lesson.emptypassword'));
+            CoreDomUtils.showErrorModal('addon.mod_lesson.emptypassword', true);
 
             return;
         }
@@ -652,7 +652,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             // Log view now that we have the password.
             this.logActivity();
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
         } finally {
             this.showLoading = false;
 

src/addons/mod/lesson/pages/player/player.ts

@@ -22,6 +22,7 @@ import { CoreNetwork } from '@services/network';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreSync } from '@services/sync';
+import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUrl } from '@singletons/url';
 import { CoreObject } from '@singletons/object';
 import { CoreWSExternalFile } from '@services/ws';
@@ -53,11 +54,10 @@ import { AddonModLessonSync } from '../../services/lesson-sync';
 import { CoreFormFields, CoreForms } from '@singletons/form';
 import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { ADDON_MOD_LESSON_COMPONENT, AddonModLessonJumpTo } from '../../constants';
-import { CoreModals } from '@services/overlays/modals';
+import { CoreModals } from '@services/modals';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreWSError } from '@classes/errors/wserror';
 import { CoreDom } from '@singletons/dom';
-import { CoreAlerts } from '@services/overlays/alerts';
 
 /**
  * Page that allows attempting and reviewing a lesson.
@@ -131,7 +131,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
             this.currentPage = CoreNavigator.getRouteNumberParam('pageId');
             this.retakeToReview = CoreNavigator.getRouteNumberParam('retake');
         } catch (error) {
-            CoreAlerts.showError(error);
+            CoreDomUtils.showErrorModal(error);
 
             CoreNavigator.back();
 
@@ -173,7 +173,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
         if (this.question && !this.eolData && !this.processData && this.originalData) {
             // Question shown. Check if there is any change.
             if (!CoreObject.basicLeftCompare(this.questionForm.getRawValue(), this.originalData, 3)) {
-                await CoreAlerts.confirmLeaveWithChanges();
+                await CoreDomUtils.showConfirm(Translate.instant('core.confirmcanceledit'));
             }
         }
 
@@ -258,7 +258,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
         try {
             await this.loadPage(pageId);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading page' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading page');
         } finally {
             this.loaded = true;
         }
@@ -363,7 +363,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
                 await AddonModLessonSync.deleteRetakeFinishedInSync(this.lesson!.id);
             }
 
-            CoreAlerts.showError(error, { default: Translate.instant('core.course.errorgetmodule') });
+            CoreDomUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
             this.forceLeave = true;
             CoreNavigator.back();
 
@@ -406,7 +406,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
                 }
 
                 // Retake hasn't changed, show the warning and finish the retake in offline.
-                CoreAlerts.show({ message: result.warnings[0] });
+                CoreDomUtils.showAlert(undefined, result.warnings[0]);
             }
 
             this.offline = false;
@@ -546,7 +546,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
 
             this.lessonPages = pages.map((entry) => entry.page);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading menu.' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading menu.');
         } finally {
             this.loadingMenu = false;
         }
@@ -763,7 +763,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
 
             this.logContinuePageLoaded();
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error processing page' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error processing page');
         } finally {
             this.loaded = true;
         }
@@ -782,7 +782,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
         try {
             await this.loadPage(pageId);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error loading page' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error loading page');
         } finally {
             this.loaded = true;
         }
@@ -818,7 +818,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy, CanLeave {
         try {
             await this.finishRetake(true);
         } catch (error) {
-            CoreAlerts.showError(error, { default: 'Error finishing attempt' });
+            CoreDomUtils.showErrorModalDefault(error, 'Error finishing attempt');
         } finally {
             this.loaded = true;
         }