From 582bc71b996a9828c6f18d6003e540013815f1ca Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 12 Feb 2020 15:50:23 +1100
Subject: [PATCH 1/3] Contacts section reformatting

---
 _locales/en/messages.json                     |  3 +++
 stylesheets/_session_left_pane.scss           | 18 ++++++++++----
 .../session/LeftPaneSectionHeader.tsx         | 24 +++++++++++++++++--
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 34a519aa4..e7a051888 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2626,6 +2626,9 @@
   "newSession": {
     "message": "New Session"
   },
+  "freindRequestsButton": {
+    "message": "Requests"
+  },
   "searchForAKeyPhrase": {
     "message": "Search for a key phrase or contact"
   },
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 1497c4238..70f3ad947 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -178,6 +178,8 @@ $session-compose-margin: 20px;
   &__header {
     display: flex;
     flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
     padding: 15px 7px 14px 0px;
     height: 63px;
 
@@ -461,11 +463,13 @@ $session-compose-margin: 20px;
 }
 
 .contact-notification-count-bubble {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   background: $session-color-danger;
-  line-height: 30px;
-  width: 30px;
-  height: 30px;
-  font-size: 14px;
+  width: 22px;
+  height: 22px;  
+  font-size: $session-font-xs;
   margin-left: auto;
   text-align: center;
   border-radius: 50%;
@@ -488,7 +492,11 @@ $session-compose-margin: 20px;
 
     .module-conversation-list-item {
       background-color: $session-shade-4;
-      
+
+      &--is-selected {
+        background-color: $session-shade-5;
+      }
+
       &--has-friend-request {
         &:first-child {
           border-top: none !important;
diff --git a/ts/components/session/LeftPaneSectionHeader.tsx b/ts/components/session/LeftPaneSectionHeader.tsx
index 064b7d2cb..f5f33cddf 100644
--- a/ts/components/session/LeftPaneSectionHeader.tsx
+++ b/ts/components/session/LeftPaneSectionHeader.tsx
@@ -79,15 +79,35 @@ export class LeftPaneSectionHeader extends React.Component<Props, State> {
       );
     }
 
-    if (buttonLabel) {
+    if (buttonLabel && !notificationCount) {
       children.push(
         <SessionButton
-          text={window.i18n('newSession')}
+          text={buttonLabel}
           onClick={buttonClicked}
           key="compose"
           disabled={false}
         />
       );
+    } else if (buttonLabel && notificationCount && notificationCount > 0) {
+      const shortenedNotificationCount =
+        notificationCount > 9 ? 9 : notificationCount;
+      children.push(
+        <div className="contact-notification-section">
+          <SessionButton
+            text={buttonLabel}
+            onClick={buttonClicked}
+            key="compose"
+            disabled={false}
+          />
+          <div
+            className="contact-notification-count-bubble"
+            onClick={this.props.buttonClicked}
+            role="button"
+          >
+            {shortenedNotificationCount}
+          </div>
+        </div>
+      );
     } else if (notificationCount && notificationCount > 0) {
       const shortenedNotificationCount =
         notificationCount > 9 ? 9 : notificationCount;

From 7b674bb8d8bda4a5172b4c0dfc76779bda848973 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 12 Feb 2020 17:27:14 +1100
Subject: [PATCH 2/3] Various UI improvements

---
 about.html                             |  4 ++--
 background.html                        |  1 -
 stylesheets/_modules.scss              |  1 +
 stylesheets/_session.scss              |  8 ++++++--
 stylesheets/_session_left_pane.scss    | 12 ++++++++----
 ts/components/session/ActionsPanel.tsx | 10 +++++-----
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/about.html b/about.html
index 7e296de61..6c1a9ddf8 100644
--- a/about.html
+++ b/about.html
@@ -39,11 +39,11 @@
   <div class='commitHash'></div>
   <div class='environment'></div>
   <div>
-    <a href="https://loki.network">loki.network</a>
+    <a href="https://getsession.org">loki.network</a>
   </div>
   <br>
   <div>
-    <a class="privacy" href="https://loki.network">Terms &amp; Privacy Policy</a>
+    <a class="privacy" href="https://getsession.org">Terms &amp; Privacy Policy</a>
   </div>
 
   <script type='text/javascript' src='node_modules/jquery/dist/jquery.js'></script>
diff --git a/background.html b/background.html
index b1ba2769d..785d40ec2 100644
--- a/background.html
+++ b/background.html
@@ -40,7 +40,6 @@
   </script>
 
   <script type='text/x-tmpl-mustache' id='two-column'>
-    <div id='session-toast-container'></div>
     <div class='gutter'>
       <div class='network-status-container'></div>
       <div class='left-pane-placeholder'></div>
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 99234384c..9d207a946 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2015,6 +2015,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-top: 5px;
 }
 
 .module-conversation-list-item__message__text {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 32a79c44d..9990e9471 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -156,6 +156,10 @@ div.spacer-lg {
   width: 100%;
 }
 
+::selection {
+  background: rgba($session-color-green, 0.6);
+}
+
 input,
 textarea {
   caret-color: $session-color-green !important;
@@ -998,6 +1002,7 @@ label {
     }
 
     &-display {
+      user-select: text;
       text-align: center;
       word-break: break-all;
       font-size: $session-font-md;
@@ -1293,7 +1298,7 @@ label {
   .module-message {
     font-family: 'SF Pro Text';
     border-radius: 5px;
-  
+
     &__text--incoming {
       /* Add padding to large emojis in chat */
       img.emoji.jumbo {
@@ -1301,7 +1306,6 @@ label {
       }
     }
   }
-  
 }
 
 .bottom-bar {
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 70f3ad947..946348182 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -215,7 +215,7 @@ $session-compose-margin: 20px;
 
   &__list {
     height: -webkit-fill-available;
-    border-top: 1px solid rgba(255,255,255,0.05);
+    border-top: 1px solid rgba(255, 255, 255, 0.05);
 
     &-popup {
       width: -webkit-fill-available;
@@ -244,6 +244,10 @@ $session-compose-margin: 20px;
       padding: 13px;
     }
 
+    h2 {
+      margin-top: 0px;
+    }
+
     h3,
     h2 {
       text-align: center;
@@ -468,7 +472,7 @@ $session-compose-margin: 20px;
   justify-content: center;
   background: $session-color-danger;
   width: 22px;
-  height: 22px;  
+  height: 22px;
   font-size: $session-font-xs;
   margin-left: auto;
   text-align: center;
@@ -508,10 +512,10 @@ $session-compose-margin: 20px;
         .module-conversation__user__profile-name {
           font-size: 13px !important;
         }
-
       }
 
-      &__header__date, &__message {
+      &__header__date,
+      &__message {
         display: none;
       }
 
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index cc2601893..add26cefd 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -165,15 +165,15 @@ export class ActionsPanel extends React.Component<Props, State> {
           notificationCount={unreadMessageCount}
         />
         <this.Section
-          type={SectionType.Contact}
-          isSelected={isContactPageSelected}
+          type={SectionType.Channel}
+          isSelected={isChannelPageSelected}
           onSelect={this.handleSectionSelect}
-          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
-          type={SectionType.Channel}
-          isSelected={isChannelPageSelected}
+          type={SectionType.Contact}
+          isSelected={isContactPageSelected}
           onSelect={this.handleSectionSelect}
+          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
           type={SectionType.Settings}

From d288c7bd03c918bfc636b6f49dce33e149476238 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 12 Feb 2020 17:40:56 +1100
Subject: [PATCH 3/3] secretPrompt fix

---
 _locales/en/messages.json                  | 3 +++
 ts/components/session/RegistrationTabs.tsx | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e7a051888..125279dc8 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1011,6 +1011,9 @@
   "showPairingWordsTitle": {
     "message": "Pairing Secret Words"
   },
+  "secretPrompt": {
+    "message": "Here is your secret"
+  },
   "confirmUnpairingTitle": {
     "message": "Please confirm you want to unpair the following device:"
   },
diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx
index f70dd9f79..eee4c1a5e 100644
--- a/ts/components/session/RegistrationTabs.tsx
+++ b/ts/components/session/RegistrationTabs.tsx
@@ -864,7 +864,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
       const words = window.mnemonic.pubkey_to_secret_words(pubkey);
       window.console.log(`Here is your secret:\n${words}`);
       window.pushToast({
-        title: `${window.i18n('secretPrompt')} ${words}`,
+        title: `${window.i18n('secretPrompt')}`,
+        description: words,
         id: 'yourSecret',
         shouldFade: false,
       });