From 54e1baca9d597c9e45711ece992de36e93a930a0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Jun 2021 11:57:41 +0200
Subject: [PATCH 1/2] MOBILE-3765 about: Add feedback form url to config

---
 src/core/constants.ts                             | 1 +
 src/core/features/settings/pages/about/about.html | 3 ++-
 src/core/features/settings/pages/about/about.ts   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/constants.ts b/src/core/constants.ts
index d9bc996ed..173704da3 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -177,6 +177,7 @@ export interface EnvironmentConfig {
     forceOpenLinksIn: 'app' | 'browser';
     iOSDefaultOpenFileAction?: OpenFileAction;
     customMainMenuItems?: CoreMainMenuLocalizedCustomItem[];
+    feedbackFormUrl?: string | false;
 };
 
 export interface EnvironmentBuild {
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 29a58aefc..2aa8f5dea 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -31,8 +31,9 @@
         <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
     </ion-item>
     <ion-item
+        *ngIf="feedbackFormUrl"
         class="ion-text-wrap"
-        button core-link href="https://feedback.moodle.org/mobileapp"
+        button core-link [href]="feedbackFormUrl"
         detail="true" detailIcon="open-outline"
     >
         <ion-icon name="fas-bullhorn" slot="start" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts
index 8c84d858a..d341352a9 100644
--- a/src/core/features/settings/pages/about/about.ts
+++ b/src/core/features/settings/pages/about/about.ts
@@ -30,6 +30,7 @@ export class CoreSettingsAboutPage {
     appName: string;
     versionName: string;
     privacyPolicy: string;
+    feedbackFormUrl = CoreConstants.CONFIG.feedbackFormUrl ?? 'https://feedback.moodle.org/mobileapp';
 
     constructor() {
         const currentSite = CoreSites.getCurrentSite();

From 2cc629c01a33b0d04f67bbf040aff8bf09d3bef7 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 8 Jun 2021 11:58:06 +0200
Subject: [PATCH 2/2] MOBILE-3765 about: Reorder items

---
 src/core/features/settings/pages/about/about.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 2aa8f5dea..6b931e527 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -13,14 +13,14 @@
     <ion-item class="ion-text-wrap">
         <ion-label><h2>{{ appName }} {{ versionName }}</h2></ion-label>
     </ion-item>
-    <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
-        <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
-        <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
-    </ion-item>
     <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail="true">
         <ion-icon name="fas-mobile" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
     </ion-item>
+    <ion-item button class="ion-text-wrap" (click)="openPage('licenses')" detail="true">
+        <ion-icon name="far-copyright" slot="start" aria-hidden="true"></ion-icon>
+        <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
+    </ion-item>
     <ion-item
         *ngIf="privacyPolicy"
         class="ion-text-wrap"