From 153dbaf2c0fcb108ac7cadfe1b8c4a09bb21bc34 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 May 2021 08:39:30 +0200
Subject: [PATCH 1/3] MOBILE-3320 behat: Expose push notifications

---
 src/core/initializers/prepare-automated-tests.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/initializers/prepare-automated-tests.ts b/src/core/initializers/prepare-automated-tests.ts
index 4440e96fa..2f3961dde 100644
--- a/src/core/initializers/prepare-automated-tests.ts
+++ b/src/core/initializers/prepare-automated-tests.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { ApplicationRef } from '@angular/core';
+import { CorePushNotifications, CorePushNotificationsProvider } from '@features/pushnotifications/services/pushnotifications';
 import { CoreApp, CoreAppProvider } from '@services/app';
 import { CoreCronDelegate, CoreCronDelegateService } from '@services/cron';
 import { Application } from '@singletons';
@@ -21,12 +22,14 @@ type AutomatedTestsWindow = Window & {
     appRef?: ApplicationRef;
     appProvider?: CoreAppProvider;
     cronProvider?: CoreCronDelegateService;
+    pushNotifications?: CorePushNotificationsProvider;
 };
 
 function initializeAutomatedTestsWindow(window: AutomatedTestsWindow) {
     window.appRef = Application.instance;
     window.appProvider = CoreApp.instance;
     window.cronProvider = CoreCronDelegate.instance;
+    window.pushNotifications = CorePushNotifications.instance;
 }
 
 export default function(): void {

From 6c89cf444aac5130c972c87a96c8a918666f47dd Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 May 2021 08:39:59 +0200
Subject: [PATCH 2/3] MOBILE-3320 navigation: Fix main menu selected tab

---
 src/core/features/mainmenu/pages/menu/menu.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 5b4b064f7..1b2d09b25 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -13,6 +13,7 @@
             [disabled]="tab.hide"
             layout="label-hide"
             class="{{tab.class}}"
+            [selected]="tab.page === selectedTab"
             [tabindex]="selectedTab == tab.page ? 0 : -1"
             [attr.aria-controls]="tab.id"
             [attr.aria-label]="tab.title | translate"

From 73eaf5d6c6a9f767874eb094bc77e3f4222d6f0f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 12 May 2021 08:41:19 +0200
Subject: [PATCH 3/3] MOBILE-3320 a11y: Add missing input labels

---
 src/core/features/login/pages/credentials/credentials.html | 4 ++--
 src/core/features/login/pages/reconnect/reconnect.html     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 5d34e1eef..b801b643c 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -30,14 +30,14 @@
 
         <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
             <ion-item *ngIf="siteChecked && !isBrowserSSO">
-                <ion-label></ion-label>
+                <ion-label class="sr-only">{{ 'core.login.username' | translate }}</ion-label>
                 <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
                     formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
                     required="true" core-auto-focus>
                 </ion-input>
             </ion-item>
             <ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
-                <ion-label></ion-label>
+                <ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
                 <core-show-password name="password">
                     <ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
                         formControlName="password" [clearOnEdit]="false" autocomplete="current-password" enterkeyhint="go"
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 10db38476..631aa99f4 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -38,7 +38,7 @@
             </ion-label>
         </ion-item>
         <ion-item class="ion-margin-bottom">
-            <ion-label></ion-label>
+            <ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
             <core-show-password name="password">
                 <ion-input class="core-ioninput-password" name="password" type="password"
                     placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"