From cf6b09e7efed0d3dedb2eb6c3179047f6df09e43 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Jan 2020 11:22:13 +1100
Subject: [PATCH 1/3] add same link for terms and conditions than privacy
 policy

---
 _locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 3170e1d28..25ef676c1 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2516,7 +2516,7 @@
   },
   "ByUsingThisService...": {
     "message":
-      "By using this service, you agree to our <a>Terms and Conditions</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Statement</a>"
+      "By using this service, you agree to our <a href=\"https://getsession.org/privacy-policy/\">Terms and Conditions</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Statement</a>"
   },
   "beginYourSession": {
     "message": "Begin<br />your<br />Session."

From 77227eaa2a744be53457acfeb004356e675a46fb Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Jan 2020 11:23:12 +1100
Subject: [PATCH 2/3] fix password toast display

---
 ts/components/session/RegistrationTabs.tsx      | 17 ++++++++++++++---
 .../session/SessionClosableOverlay.tsx          |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx
index 47f7eeb8c..1602bcfbe 100644
--- a/ts/components/session/RegistrationTabs.tsx
+++ b/ts/components/session/RegistrationTabs.tsx
@@ -437,7 +437,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
   }
 
   private renderNamePasswordAndVerifyPasswordFields() {
-    const passwordDoesNotMatchString =
+    const passwordsDoNotMatch =
       !this.state.passwordFieldsMatch && this.state.password
         ? window.i18n('passwordsDoNotMatch')
         : undefined;
@@ -472,7 +472,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
 
         <SessionInput
           label={window.i18n('verifyPassword')}
-          error={passwordDoesNotMatchString}
+          error={passwordsDoNotMatch}
           type="password"
           placeholder={window.i18n('optionalPassword')}
           onValueChanged={(val: string) => {
@@ -735,7 +735,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
       passwordFieldsMatch,
     } = this.state;
     // Make sure the password is valid
-    if (passwordErrorString || passwordFieldsMatch) {
+    if (passwordErrorString) {
       window.pushToast({
         title: window.i18n('invalidPassword'),
         type: 'error',
@@ -744,6 +744,17 @@ export class RegistrationTabs extends React.Component<{}, State> {
 
       return;
     }
+
+    if (!!password && !passwordFieldsMatch) {
+      window.pushToast({
+        title: window.i18n('passwordsDoNotMatch'),
+        type: 'error',
+        id: 'invalidPassword',
+      });
+
+      return;
+    }
+
     if (!mnemonicSeed) {
       return;
     }
diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx
index 8299d7aef..3737089a9 100644
--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@@ -57,7 +57,7 @@ export class SessionClosableOverlay extends React.Component<Props> {
         break;
       case 'contact':
         title = window.i18n('addContact');
-        buttonText = window.i18n('addContact');
+        buttonText = window.i18n('next');
         descriptionLong = window.i18n('usersCanShareTheir...');
         subtitle = window.i18n('enterSessionID');
         placeholder = window.i18n('pasteSessionIDRecipient');

From 26813666fc70aaa9836d3f460e79ef9d6a5e359a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 21 Jan 2020 11:51:47 +1100
Subject: [PATCH 3/3] show timestamp and last message in conversationlistitem

---
 ts/components/ConversationListItem.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index ee8b2bf60..0ca74ea24 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -146,7 +146,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
           {isMe ? i18n('noteToSelf') : this.renderUser()}
         </div>
         {hasReceivedFriendRequest || this.renderUnread()}
-        {!isFriend && (
+        {isFriend && (
           <div
             className={classNames(
               'module-conversation-list-item__header__date',
@@ -227,14 +227,9 @@ export class ConversationListItem extends React.PureComponent<Props> {
       isTyping,
       unreadCount,
       i18n,
-      isFriend,
       isPendingFriendRequest,
     } = this.props;
 
-    if (isFriend) {
-      return null;
-    }
-
     if (!lastMessage && !isTyping) {
       return null;
     }