From cf74c8e19f8bd34a31d5af931781e84be2c04dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Thu, 15 Dec 2022 11:56:41 +0100
Subject: [PATCH] fix: feedback not allowing valid emails

Closes #349
---
 src/app/modules/feedback/feedback-page.component.ts |  5 +++++
 src/app/modules/feedback/feedback-page.html         | 10 +++++++---
 src/assets/i18n/de.json                             |  4 ++--
 src/assets/i18n/en.json                             |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/app/modules/feedback/feedback-page.component.ts b/src/app/modules/feedback/feedback-page.component.ts
index c4c30d99..a28783df 100644
--- a/src/app/modules/feedback/feedback-page.component.ts
+++ b/src/app/modules/feedback/feedback-page.component.ts
@@ -31,6 +31,11 @@ import {TranslateService} from '@ngx-translate/core';
   styleUrls: ['./feedback-page.scss'],
 })
 export class FeedbackPageComponent {
+  /**
+   * Minimum allowed size of the feedback message
+   */
+  MINIMUM_MESSAGE_SIZE = 15;
+
   constructor(
     private readonly dataProvider: DataProvider,
     private readonly debugDataCollector: DebugDataCollectorService,
diff --git a/src/app/modules/feedback/feedback-page.html b/src/app/modules/feedback/feedback-page.html
index f8f6365e..3d2ac46a 100644
--- a/src/app/modules/feedback/feedback-page.html
+++ b/src/app/modules/feedback/feedback-page.html
@@ -46,7 +46,8 @@
         [(ngModel)]="author.email"
         type="email"
         name="email"
-        pattern="[A-Za-z0-9._%+-]{3,}@[a-zA-Z]{3,}([.]{1}[a-zA-Z]{2,}|[.]{1}[a-zA-Z]{2,}[.]{1}[a-zA-Z]{2,})"
+        ngModel
+        email
       ></ion-input>
     </ion-item>
     <ion-item>
@@ -55,10 +56,13 @@
       }}</ion-label>
       <ion-textarea
         [(ngModel)]="message.messageBody"
-        placeholder="{{ 'feedback.form.message.placeholder' | translate }}"
+        placeholder="{{
+          'feedback.form.message.placeholder'
+            | translate: {number: MINIMUM_MESSAGE_SIZE}
+        }}"
         name="message"
         required="true"
-        minlength="30"
+        minlength="{{ MINIMUM_MESSAGE_SIZE }}"
         autoGrow="true"
       ></ion-textarea>
     </ion-item>
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index d4b0e452..8e2b79e7 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -201,11 +201,11 @@
       },
       "email": {
         "label": "E-Mail",
-        "placeholder": "deine@mailadresse.de"
+        "placeholder": "deine@mailadresse"
       },
       "message": {
         "label": "Nachricht",
-        "placeholder": "Deine Nachricht an uns..."
+        "placeholder": "Deine Nachricht an uns... (minimal {{number}} Zeichen lang)"
       },
       "termsAgree": "Ich bin damit einverstanden, dass Protokolldaten zur Nachverfolgbarkeit von Fehlern mitversandt werden. Es erfolgt keine Weitergabe dieser Daten an Dritte.",
       "submit": "Absenden",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 18f13bbe..5a4d625d 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -201,11 +201,11 @@
       },
       "email": {
         "label": "Mail",
-        "placeholder": "your@mailaddress.com"
+        "placeholder": "your@mailaddress"
       },
       "message": {
         "label": "Message",
-        "placeholder": "Your message for us..."
+        "placeholder": "Your message for us... (minimum {{number}} characters)"
       },
       "termsAgree": "I agree to provide the protocol data for easier traceability of errors. The data will not be forwarded to any third parties.",
       "submit": "Submit",