From ffc7ed0b326534daed08165706c5a24fcaf7aeba Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 28 Sep 2022 10:27:36 +1000
Subject: [PATCH] fix: aply latests UI tweaks and copy for menu-redesign

---
 _locales/en/messages.json                        |  3 ++-
 stylesheets/_session.scss                        |  6 +++++-
 .../leftpane/overlay/OverlayMessage.tsx          | 16 ++++++++++++++--
 ts/types/LocalizerKeys.ts                        |  3 ++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index af96d001f..166b845c9 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -33,6 +33,7 @@
   "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
   "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
   "enterSessionIDOrONSName": "Enter Session ID or ONS name",
+  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "Loading...",
   "done": "Done",
   "youLeftTheGroup": "You have left the group.",
@@ -364,7 +365,7 @@
   "createClosedGroupNamePrompt": "Group Name",
   "createClosedGroupPlaceholder": "Enter a group name",
   "openGroupURL": "Community URL",
-  "enterAnOpenGroupURL": "Enter a community URL",
+  "enterAnOpenGroupURL": "Enter Community URL",
   "next": "Next",
   "invalidGroupNameTooShort": "Please enter a group name",
   "invalidGroupNameTooLong": "Please enter a shorter group name",
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 10c394763..ed47ebfc1 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -832,7 +832,11 @@ label {
   padding: 0px 5px 20px 5px;
 
   &.session-id-editable-textarea:placeholder-shown {
-    padding: 10px 5px 0px 5px;
+    height: 38px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 5px;
+    padding-right: 5px;
     font-family: var(--font-default);
   }
 
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 93a7ede6d..51092b6b0 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -19,6 +19,16 @@ import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSess
 import { Flex } from '../../basic/Flex';
 import { SessionIconButton } from '../../icon';
 import { SpacerMD } from '../../basic/Text';
+import styled from 'styled-components';
+
+const SessionIDDescription = styled.div`
+  color: var(--color-text-subtle);
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  text-align: center;
+`;
 
 function copyOurSessionID() {
   const ourSessionId = UserUtils.getOurPubKeyStrFromCache();
@@ -42,8 +52,8 @@ export const OverlayMessage = () => {
 
   const title = window.i18n('newMessage');
   const buttonText = window.i18n('next');
-  const subtitle = window.i18n('enterSessionIDOrONSName');
-  const placeholder = window.i18n('enterSessionIDOfRecipient');
+  const subtitle = window.i18n('enterSessionID');
+  const placeholder = window.i18n('enterSessionIDOrONSName');
 
   const disableNextButton = !pubkeyOrOns || loading;
 
@@ -112,6 +122,8 @@ export const OverlayMessage = () => {
 
       <SessionSpinner loading={loading} />
 
+      <SessionIDDescription>{window.i18n('startNewConversationBy...')}</SessionIDDescription>
+
       <Flex container={true} width="100%">
         <SpacerMD />
         <YourSessionIDPill />
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index a8dd4f414..c2a30831e 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -178,6 +178,7 @@ export type LocalizerKeys =
   | 'timerOption_30_seconds_abbreviated'
   | 'createConversationNewContact'
   | 'removeResidueMembers'
+  | 'timerOption_1_hour_abbreviated'
   | 'areYouSureDeleteEntireAccount'
   | 'noGivenPassword'
   | 'closedGroupInviteOkText'
@@ -412,7 +413,7 @@ export type LocalizerKeys =
   | 'timerOption_30_seconds'
   | 'createAccount'
   | 'timerOption_1_minute_abbreviated'
-  | 'timerOption_1_hour_abbreviated'
+  | 'startNewConversationBy...'
   | 'timerOption_12_hours'
   | 'unblockToSend'
   | 'timerOption_1_minute'