Merge pull request #840 from vincentbavitz/clearnet

secretPrompt Fix

_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:"
   },
@@ -2626,6 +2629,9 @@
   "newSession": {
     "message": "New Session"
   },
+  "freindRequestsButton": {
+    "message": "Requests"
+  },
   "searchForAKeyPhrase": {
     "message": "Search for a key phrase or contact"
   },

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>

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>

stylesheets/_modules.scss

@@ -2015,6 +2015,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-top: 5px;
 }
 
 .module-conversation-list-item__message__text {

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 {

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;
 
@@ -213,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;
@@ -242,6 +244,10 @@ $session-compose-margin: 20px;
       padding: 13px;
     }
 
+    h2 {
+      margin-top: 0px;
+    }
+
     h3,
     h2 {
       text-align: center;
@@ -461,11 +467,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: 22px;
-  width: 30px;
+  height: 22px;
-  height: 30px;
+  font-size: $session-font-xs;
-  font-size: 14px;
   margin-left: auto;
   text-align: center;
   border-radius: 50%;
@@ -488,7 +496,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;
@@ -500,10 +512,10 @@ $session-compose-margin: 20px;
         .module-conversation__user__profile-name {
           font-size: 13px !important;
         }
-
       }
 
-      &__header__date, &__message {
+      &__header__date,
+      &__message {
         display: none;
       }
 

ts/components/session/ActionsPanel.tsx

@@ -165,15 +165,15 @@ export class ActionsPanel extends React.Component<Props, State> {
           notificationCount={unreadMessageCount}
         />
         <this.Section
-          type={SectionType.Contact}
+          type={SectionType.Channel}
-          isSelected={isContactPageSelected}
+          isSelected={isChannelPageSelected}
           onSelect={this.handleSectionSelect}
-          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
-          type={SectionType.Channel}
+          type={SectionType.Contact}
-          isSelected={isChannelPageSelected}
+          isSelected={isContactPageSelected}
           onSelect={this.handleSectionSelect}
+          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
           type={SectionType.Settings}

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;

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,
       });