From 509e0b0a39fc34b3e829e474cfacc4e32438f29d Mon Sep 17 00:00:00 2001
From: Arnab Tarwani <arnab.tarwani@ucdconnect.ie>
Date: Sat, 29 Jan 2022 19:22:02 +0000
Subject: [PATCH] Bugfix/minor email fix (#1644)

* added new line fix, minor email validation

* fix: reorder controls hidden on more than 1 events #1452

Signed-off-by: arnabtarwani <arnab.tarwani@gmail.com>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
---
 .../templates/attendee-scheduled-email.ts     |  4 ++-
 .../templates/organizer-scheduled-email.ts    |  4 ++-
 pages/event-types/index.tsx                   | 25 +++++++++++--------
 pages/settings/profile.tsx                    |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/lib/emails/templates/attendee-scheduled-email.ts b/lib/emails/templates/attendee-scheduled-email.ts
index 832dfc1b..2ce4a0a0 100644
--- a/lib/emails/templates/attendee-scheduled-email.ts
+++ b/lib/emails/templates/attendee-scheduled-email.ts
@@ -289,7 +289,9 @@ ${getRichDescription(this.calEvent)}
     <p style="height: 6px"></p>
     <div style="line-height: 6px;">
       <p style="color: #494949;">${this.calEvent.attendees[0].language.translate("additional_notes")}</p>
-      <p style="color: #494949; font-weight: 400; line-height: 24px;">${this.calEvent.description}</p>
+      <p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
+        this.calEvent.description
+      }</p>
     </div>
     `;
   }
diff --git a/lib/emails/templates/organizer-scheduled-email.ts b/lib/emails/templates/organizer-scheduled-email.ts
index 693f58bc..259bc89f 100644
--- a/lib/emails/templates/organizer-scheduled-email.ts
+++ b/lib/emails/templates/organizer-scheduled-email.ts
@@ -290,7 +290,9 @@ ${getRichDescription(this.calEvent)}
     <p style="height: 6px"></p>
     <div style="line-height: 6px;">
       <p style="color: #494949;">${this.calEvent.organizer.language.translate("additional_notes")}</p>
-      <p style="color: #494949; font-weight: 400; line-height: 24px;">${this.calEvent.description}</p>
+      <p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
+        this.calEvent.description
+      }</p>
     </div>
     `;
   }
diff --git a/pages/event-types/index.tsx b/pages/event-types/index.tsx
index b03f06eb..def7cf29 100644
--- a/pages/event-types/index.tsx
+++ b/pages/event-types/index.tsx
@@ -108,16 +108,21 @@ const EventTypeList = ({ readOnly, types, profile }: EventTypeListProps): JSX.El
                 type.$disabled && "pointer-events-none"
               )}>
               <div className="flex items-center justify-between w-full px-4 py-4 group sm:px-6 hover:bg-neutral-50">
-                <button
-                  className="hidden sm:block absolute -mt-4 mb-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
-                  onClick={() => moveEventType(index, -1)}>
-                  <ArrowUpIcon />
-                </button>
-                <button
-                  className="hidden sm:block absolute mt-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
-                  onClick={() => moveEventType(index, 1)}>
-                  <ArrowDownIcon />
-                </button>
+                {sortableTypes.length > 1 && (
+                  <>
+                    <button
+                      className="hidden sm:block absolute -mt-4 mb-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
+                      onClick={() => moveEventType(index, -1)}>
+                      <ArrowUpIcon />
+                    </button>
+
+                    <button
+                      className="hidden sm:block absolute mt-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
+                      onClick={() => moveEventType(index, 1)}>
+                      <ArrowDownIcon />
+                    </button>
+                  </>
+                )}
                 <Link href={"/event-types/" + type.id}>
                   <a
                     className="flex-grow text-sm truncate"
diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx
index 65a18975..7de5e4ab 100644
--- a/pages/settings/profile.tsx
+++ b/pages/settings/profile.tsx
@@ -250,7 +250,7 @@ function SettingsView(props: ComponentProps<typeof Settings> & { localeProp: str
                 </label>
                 <input
                   ref={emailRef}
-                  type="text"
+                  type="email"
                   name="email"
                   id="email"
                   placeholder={t("your_email")}