From e663ee1d9a8b7b494abd21f9635ac8a408cc36cf Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 20 Apr 2023 17:51:26 +0200
Subject: [PATCH 1/2] MOBILE-4290 login: Fix site help

QR question logic was inverted, and classes weren't applied properly
---
 src/core/features/login/components/site-help/site-help.html | 2 +-
 src/core/features/login/components/site-help/site-help.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/features/login/components/site-help/site-help.html b/src/core/features/login/components/site-help/site-help.html
index d1cea07d2..675d3809c 100644
--- a/src/core/features/login/components/site-help/site-help.html
+++ b/src/core/features/login/components/site-help/site-help.html
@@ -23,7 +23,7 @@
                 </ion-label>
             </ion-item>
             <ion-item [id]="'question-' + question.id + '-answer'"
-                [class]="question.answer.class + 'ion-text-wrap core-login-site-help--answer'" [class.open]="isOpen(question)"
+                [class]="question.answer.class + ' ion-text-wrap core-login-site-help--answer'" [class.open]="isOpen(question)"
                 [tabindex]="isOpen(question) ? null : -1" [attr.inert]="isOpen(question) ? null : 'true'">
                 <ion-label>
                     <p *ngIf="question.answer.format === 'text'">{{ question.answer.text }}</p>
diff --git a/src/core/features/login/components/site-help/site-help.ts b/src/core/features/login/components/site-help/site-help.ts
index c1bdf471c..022154141 100644
--- a/src/core/features/login/components/site-help/site-help.ts
+++ b/src/core/features/login/components/site-help/site-help.ts
@@ -38,7 +38,7 @@ export class CoreLoginSiteHelpComponent implements AfterViewInit, OnDestroy {
 
     constructor(protected el: ElementRef<HTMLElement>) {
         const getStartedTitle = Translate.instant('core.login.faqsetupsitelinktitle');
-        const canScanQR = !CoreUtils.canScanQR();
+        const canScanQR = CoreUtils.canScanQR();
         const urlImageHtml = CoreLoginHelperProvider.FAQ_URL_IMAGE_HTML;
         const qrCodeImageHtml = CoreLoginHelperProvider.FAQ_QRCODE_IMAGE_HTML;
         const setupLinkHtml = `<a href="${GET_STARTED_URL}" title="${getStartedTitle}">${GET_STARTED_URL}</a>`;

From e74940d2e0518bf47b8c5419cfee9b634582bb0d Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 20 Apr 2023 17:51:45 +0200
Subject: [PATCH 2/2] MOBILE-4290 login: Change QR help question order

---
 .../login/components/site-help/site-help.ts      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/features/login/components/site-help/site-help.ts b/src/core/features/login/components/site-help/site-help.ts
index 022154141..51629ee3b 100644
--- a/src/core/features/login/components/site-help/site-help.ts
+++ b/src/core/features/login/components/site-help/site-help.ts
@@ -65,6 +65,14 @@ export class CoreLoginSiteHelpComponent implements AfterViewInit, OnDestroy {
                     format: AnswerFormat.SafeHTML,
                 },
             },
+            canScanQR && {
+                text: Translate.instant('core.login.faqwhereisqrcode'),
+                answer: {
+                    text: Translate.instant('core.login.faqwhereisqrcodeanswer', { $image: qrCodeImageHtml }),
+                    format: AnswerFormat.SafeHTML,
+                    class: 'core-login-faqwhereisqrcodeanswer',
+                },
+            },
             {
                 text: Translate.instant('core.login.faqsetupsitequestion'),
                 answer: {
@@ -79,14 +87,6 @@ export class CoreLoginSiteHelpComponent implements AfterViewInit, OnDestroy {
                     format: AnswerFormat.SafeHTML,
                 },
             },
-            canScanQR && {
-                text: Translate.instant('core.login.faqwhereisqrcode'),
-                answer: {
-                    text: Translate.instant('core.login.faqwhereisqrcodeanswer', { $image: qrCodeImageHtml }),
-                    format: AnswerFormat.SafeHTML,
-                    class: 'core-login-faqwhereisqrcodeanswer',
-                },
-            },
         ];
 
         for (const question of questions) {