From a5dfe53fcf0b06aa046ee3fa1ed22fdf3bf384d0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 19 May 2021 12:38:59 +0200
Subject: [PATCH 1/2] MOBILE-3320 a11y: Fix search labels

---
 src/addons/mod/data/components/search/search.html               | 2 +-
 .../features/search/components/search-box/core-search-box.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/data/components/search/search.html b/src/addons/mod/data/components/search/search.html
index 74f6e28ca..f4eb45f86 100644
--- a/src/addons/mod/data/components/search/search.html
+++ b/src/addons/mod/data/components/search/search.html
@@ -19,7 +19,7 @@
     <form (ngSubmit)="searchEntries($event)" [formGroup]="searchForm" #searchFormEl>
         <ion-list class="ion-no-margin">
             <ion-item [hidden]="search.searchingAdvanced">
-                <ion-label></ion-label>
+                <ion-label class="sr-only">{{ 'addon.mod_data.search' | translate}}</ion-label>
                 <ion-input type="text" placeholder="{{ 'addon.mod_data.search' | translate}}"
                     [(ngModel)]="search.text" name="text" formControlName="text">
                 </ion-input>
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index eec04febf..8ac3dbdfc 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -1,7 +1,7 @@
 <ion-card>
     <form (ngSubmit)="submitForm($event)" role="search" #searchForm>
         <ion-item>
-            <ion-label></ion-label>
+            <ion-label class="sr-only">{{ placeholder }}</ion-label>
             <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder"
                 [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus"
                 [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">

From 5f7e18c2b3b2a4176385991fb835f19ed85c5616 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 19 May 2021 12:39:56 +0200
Subject: [PATCH 2/2] MOBILE-3320 messages: Fix settings button

---
 src/addons/messages/messages-lazy.module.ts                   | 4 ++++
 .../pages/group-conversations/group-conversations.page.ts     | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/addons/messages/messages-lazy.module.ts b/src/addons/messages/messages-lazy.module.ts
index 9d3af46bf..ae0d95b6c 100644
--- a/src/addons/messages/messages-lazy.module.ts
+++ b/src/addons/messages/messages-lazy.module.ts
@@ -51,6 +51,10 @@ function buildRoutes(injector: Injector): Routes {
             loadChildren: () => import('./pages/contacts/contacts.module')
                 .then(m => m.AddonMessagesContactsPageModule),
         },
+        {
+            path: 'preferences',
+            loadChildren: () => import('./pages/settings/settings.module').then(m => m.AddonMessagesSettingsPageModule),
+        },
         ...buildTabMainRoutes(injector, {
             canActivate: [AddonMessagesIndexGuard],
         }),
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index 3335ebce9..0ce9915b6 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -35,7 +35,6 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
 import { ActivatedRoute, Params } from '@angular/router';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreNavigator } from '@services/navigator';
-import { AddonMessagesSettingsHandlerService } from '@addons/messages/services/handlers/settings';
 import { CoreScreen } from '@services/screen';
 
 /**
@@ -529,7 +528,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * Navigate to message settings.
      */
     gotoSettings(): void {
-        CoreNavigator.navigateToSitePath(AddonMessagesSettingsHandlerService.PAGE_NAME);
+        CoreNavigator.navigateToSitePath('../preferences');
     }
 
     /**