Updated all icon references

CONTRIBUTING.md

@@ -63,7 +63,7 @@ yarn install --frozen-lockfile # Install and build dependencies (this will take
 yarn grunt                     # Generate final JS and CSS assets
 yarn icon-gen                  # Generate full set of icons for Electron
 yarn test                      # A good idea to make sure tests run first
-yarn start                     # Start Session Messenger!
+yarn start                     # Start Session!
 ```
 
 You'll need to restart the application regularly to see your changes, as there
@@ -84,7 +84,7 @@ yarn grunt dev # runs until you stop it, re-generating built assets on file chan
 
 ## Additional storage profiles
 
-Since there is no registration for Session Messenger, you can create as many accounts as you
+Since there is no registration for Session, you can create as many accounts as you
 can public keys. To test the P2P functionality on the same machine, however, requries
 that each client binds their message server to a different port.
 

README.md

@@ -1,8 +1,8 @@
-# Session Messenger
+# Session
 
 [![Build Status](https://travis-ci.org/loki-project/loki-messenger.svg?branch=development)](https://travis-ci.org/loki-project/loki-messenger)
 
-Session Messenger allows for truly decentralized, end to end, and private encrypted chats. Session Messenger is built to handle both online and fully Asynchronous offline messages. Loki messenger implements the Signal protocol for message encryption. Our Client interface is a fork of [Signal Messenger](https://signal.org/). All communication that passes through Loki messenger is routed through [Lokinet](https://github.com/loki-project/loki-network).
+Session allows for truly decentralized, end to end, and private encrypted chats. Session is built to handle both online and fully Asynchronous offline messages. Loki messenger implements the Signal protocol for message encryption. Our Client interface is a fork of [Signal Messenger](https://signal.org/). All communication that passes through Loki messenger is routed through [Lokinet](https://github.com/loki-project/loki-network).
 
 ## Summary
 
@@ -14,11 +14,11 @@ If Alice and Bob are both online they can simply resolve each others public keys
 
 **Offline messages**
 
-Offline messaging uses Swarms, given any users public key the user can resolve a public key to a specific grouping of Service Nodes (AKA Swarm) each user in Session Messenger belongs to a Swarm. When routing a message offline the user selects a Service node in the destination users Swarm, when the user comes online they query any node in their Swarm, if the Swarm is holding any messages for the user they disseminate those messages to the user.
+Offline messaging uses Swarms, given any users public key the user can resolve a public key to a specific grouping of Service Nodes (AKA Swarm) each user in Session belongs to a Swarm. When routing a message offline the user selects a Service node in the destination users Swarm, when the user comes online they query any node in their Swarm, if the Swarm is holding any messages for the user they disseminate those messages to the user.
 
 ![Swarm Messaging](https://i.imgur.com/o13Knds.png)
 
-Spam protections for Session Messenger are based on a Proof of Work which is attached to any message that exceeds a default size or Time To Live, this process is discussed further in the [Loki whitepaper](https://loki.network/whitepaper).
+Spam protections for Session are based on a Proof of Work which is attached to any message that exceeds a default size or Time To Live, this process is discussed further in the [Loki whitepaper](https://loki.network/whitepaper).
 
 ## Want to Contribute? Found a Bug or Have a feature request?
 

_locales/ar/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/bg/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/cs/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Opustit Session Messenger",
+        "message": "Opustit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/en/messages.json

@@ -66,7 +66,7 @@
     "description": "Application menu command to show all application windows"
   },
   "appMenuQuit": {
-    "message": "Quit Session Messenger",
+    "message": "Quit Session",
     "description": "Application menu command to close the application"
   },
   "editMenuUndo": {
@@ -265,7 +265,7 @@
       "Header shown on the screen at the end of a successful import process"
   },
   "importCompleteStartButton": {
-    "message": "Start using Session Messenger",
+    "message": "Start using Session",
     "description":
       "Button shown at end of successful import process, nothing left but a restart"
   },
@@ -722,12 +722,12 @@
       "Item under the Help menu, takes you to GitHub new issue form (title case)"
   },
   "signalDesktopPreferences": {
-    "message": "Session Messenger Preferences",
+    "message": "Session Preferences",
     "description":
       "Title of the window that pops up with Signal Desktop preferences in it"
   },
   "aboutSignalDesktop": {
-    "message": "About Session Messenger",
+    "message": "About Session",
     "description": "Item under the Help menu, which opens a small about window"
   },
   "speech": {
@@ -748,7 +748,7 @@
     "description": "Command in the tray icon menu, to quit the application"
   },
   "lokiMessenger": {
-    "message": "Session Messenger"
+    "message": "Session"
   },
   "search": {
     "message": "Search",
@@ -898,7 +898,7 @@
   },
   "audioPermissionNeeded": {
     "message":
-      "To send audio messages, allow Session Messenger to access your microphone.",
+      "To send audio messages, allow Session to access your microphone.",
     "description":
       "Shown if the user attempts to send an audio message without audio permssions turned on"
   },
@@ -1096,7 +1096,7 @@
       "Placeholder text in the message entry field when it is disabled while we are waiting for a friend request approval"
   },
   "sendMessageFriendRequest": {
-    "message": "Hi there! This is <insert name here> !",
+    "message": "Hi there! This is ...!",
     "description":
       "Placeholder text in the message entry field when it is the first message sent to that contact"
   },
@@ -1215,7 +1215,7 @@
       "This is a past tense, informational message. In other words, your secure session has been reset."
   },
   "betaDisclaimerTitle": {
-    "message": "Thanks for using Session Messenger!",
+    "message": "Thanks for using Session!",
     "description": "Title for beta disclaimer modal"
   },
   "betaDisclaimerSubtitle": {
@@ -1276,7 +1276,7 @@
     }
   },
   "installWelcome": {
-    "message": "Welcome to Session Messenger",
+    "message": "Welcome to Session",
     "description": "Welcome title on the install page"
   },
   "installTagline": {
@@ -1285,12 +1285,12 @@
       "Tagline displayed under 'installWelcome' string on the install page"
   },
   "linkYourPhone": {
-    "message": "Link your phone to Session Messenger",
+    "message": "Link your phone to Session",
     "description":
       "Shown on the front page when the application first starst, above the QR code"
   },
   "signalSettings": {
-    "message": "Session Messenger Settings",
+    "message": "Session Settings",
     "description":
       "Used in the guidance to help people find the 'link new device' area of their Signal mobile app"
   },
@@ -1510,7 +1510,7 @@
   },
   "expiredWarning": {
     "message":
-      "This version of Session Messenger has expired. Please upgrade to the latest version to continue messaging.",
+      "This version of Session has expired. Please upgrade to the latest version to continue messaging.",
     "description":
       "Warning notification that this version of the app has expired"
   },

_locales/es_419/messages.json

@@ -36,7 +36,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/hi/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/hr/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/kn/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/ko/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/mk/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/sr/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/uk/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

_locales/vi/messages.json

@@ -52,7 +52,7 @@
         "description": "Application menu command to show all application windows"
     },
     "appMenuQuit": {
-        "message": "Quit Session Messenger",
+        "message": "Quit Session",
         "description": "Application menu command to close the application"
     },
     "editMenuUndo": {

app/sql.js

@@ -902,7 +902,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
     rssFeed: 'https://loki.network/feed/',
     closable: true,
     name: 'Loki.network News',
-    profileAvatar: 'images/loki/loki_icon.png',
+    profileAvatar: 'images/loki/session_icon.png',
   };
 
   const updatesRssFeedData = {
@@ -911,7 +911,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
     rssFeed: 'https://loki.network/category/messenger-updates/feed/',
     closable: false,
     name: 'Messenger updates',
-    profileAvatar: 'images/loki/loki_icon.png',
+    profileAvatar: 'images/loki/session_icon.png',
   };
 
   const autoJoinLokiChats = false;

background.html

@@ -19,7 +19,7 @@
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
   >
-  <title>Session Messenger</title>
+  <title>Session</title>
   <link href='images/loki/loki_icon_128.png' rel='shortcut icon'>
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
 

js/background.js

@@ -122,7 +122,7 @@
     'x_white.svg',
     'icon-paste.svg',
     'loki/loki_icon_text.png',
-    'loki/loki_icon_128.png',
+    'loki/session_icon_128.png',
   ]);
 
   // Set server-client time difference

js/modules/debuglogs.js

@@ -6,7 +6,7 @@ const got = require('got');
 
 const BASE_URL = 'https://debuglogs.org';
 const VERSION = window.getVersion();
-const USER_AGENT = `Session Messenger ${VERSION}`;
+const USER_AGENT = `Session ${VERSION}`;
 
 // Workaround: Submitting `FormData` using native `FormData::submit` procedure
 // as integration with `got` results in S3 error saying we haven’t set the

js/modules/web_api.js

@@ -222,7 +222,7 @@ function _promiseAjax(providedUrl, options) {
       method: options.type,
       body: options.data || null,
       headers: {
-        'User-Agent': 'Session Messenger',
+        'User-Agent': 'Session',
         'X-Loki-Messenger-Agent': 'OWD',
         ...options.headers,
       },

js/notifications.js

@@ -108,7 +108,7 @@
       const last = this.last().toJSON();
       switch (userSetting) {
         case SettingNames.COUNT:
-          title = 'Session Messenger';
+          title = 'Session';
 
           if (last.isFriendRequest) {
             message = `Friend request ${last.friendRequestType}`;

libloki/test/snode_channel_test.js

@@ -75,7 +75,7 @@ describe('Snode Channel', () => {
     });
 
     it('should encrypt data correctly', async () => {
-      // message sent by Session Messenger
+      // message sent by Session
       const snode = await generateSnodeKeysAndAddress();
       const messageSent = 'I am Groot';
       const textEncoder = new TextEncoder();
@@ -133,7 +133,7 @@ describe('Snode Channel', () => {
       const encryptedBase64 = dcodeIO.ByteBuffer.wrap(encrypted).toString(
         'base64'
       );
-      // message received by Session Messenger
+      // message received by Session
       const decrypted = await channel.decrypt(snode.address, encryptedBase64);
       assert.strictEqual(messageSent, decrypted);
     });

libtextsecure/outgoing_message.js

@@ -308,7 +308,7 @@ OutgoingMessage.prototype = {
 
     return Promise.all(
       devicesPubKeys.map(async devicePubKey => {
-        // Session Messenger doesn't use the deviceId scheme, it's always 1.
+        // Session doesn't use the deviceId scheme, it's always 1.
         // Instead, there are multiple device public keys.
         const deviceId = 1;
         const updatedDevices = await this.getStaleDeviceIdsForNumber(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "session-messenger-desktop",
-  "productName": "Session Messenger",
+  "productName": "Session",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/loki-project/loki-messenger.git",
   "version": "1.0.0",
@@ -240,7 +240,7 @@
     "linux": {
       "category": "Network",
       "desktop": {
-        "StartupWMClass": "Session Messenger"
+        "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
       "target": [

prepare_beta_build.js

@@ -27,16 +27,16 @@ const PRODUCTION_NAME = 'loki-messenger-desktop';
 const BETA_NAME = 'loki-messenger-desktop-beta';
 
 const PRODUCT_NAME_PATH = 'productName';
-const PRODUCTION_PRODUCT_NAME = 'Session Messenger';
-const BETA_PRODUCT_NAME = 'Session Messenger Beta';
+const PRODUCTION_PRODUCT_NAME = 'Session';
+const BETA_PRODUCT_NAME = 'Session Beta';
 
 const APP_ID_PATH = 'build.appId';
 const PRODUCTION_APP_ID = 'com.loki-project.messenger-desktop';
 const BETA_APP_ID = 'com.loki-project.messenger-desktop-beta';
 
 const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
-const PRODUCTION_STARTUP_WM_CLASS = 'Session Messenger';
-const BETA_STARTUP_WM_CLASS = 'Session Messenger Beta';
+const PRODUCTION_STARTUP_WM_CLASS = 'Session';
+const BETA_STARTUP_WM_CLASS = 'Session Beta';
 
 // -------
 

stylesheets/_session.scss

@@ -1283,6 +1283,10 @@ label {
   }
 }
 
+.dark-theme .bottom-bar .send-message[disabled='disabled'] {
+  background: $session-shade-4 !important;
+}
+
 .session-radio-group fieldset {
   border: none;
   margin-left: $session-margin-sm;

stylesheets/_session_left_pane.scss

@@ -362,6 +362,7 @@ $session-compose-margin: 20px;
     height: inherit;
     border: none;
     flex-grow: 1;
+    font-size: $session-font-md;
 
     &:focus {
       outline: none !important;

stylesheets/_session_signin.scss

@@ -228,7 +228,6 @@
     align-items: center;
     justify-content: center;
     height: 94px;
-    width: 100%;
     padding: 20px;
     border-radius: 8px;
     border: 2px solid #353535;

test/app/fixtures/menu-mac-os-setup.json

@@ -1,9 +1,9 @@
 [
   {
-    "label": "Session Messenger",
+    "label": "Session",
     "submenu": [
       {
-        "label": "About Session Messenger",
+        "label": "About Session",
         "click": null
       },
       {
@@ -28,7 +28,7 @@
         "type": "separator"
       },
       {
-        "label": "Quit Session Messenger",
+        "label": "Quit Session",
         "role": "quit"
       }
     ]

test/app/fixtures/menu-mac-os.json

@@ -1,9 +1,9 @@
 [
   {
-    "label": "Session Messenger",
+    "label": "Session",
     "submenu": [
       {
-        "label": "About Session Messenger",
+        "label": "About Session",
         "click": null
       },
       {
@@ -28,7 +28,7 @@
         "type": "separator"
       },
       {
-        "label": "Quit Session Messenger",
+        "label": "Quit Session",
         "role": "quit"
       }
     ]

test/app/fixtures/menu-windows-linux-setup.json

@@ -17,7 +17,7 @@
         "type": "separator"
       },
       {
-        "label": "Quit Session Messenger",
+        "label": "Quit Session",
         "role": "quit"
       }
     ]
@@ -134,7 +134,7 @@
         "type": "separator"
       },
       {
-        "label": "About Session Messenger",
+        "label": "About Session",
         "click": null
       }
     ]

test/app/fixtures/menu-windows-linux.json

@@ -6,7 +6,7 @@
         "type": "separator"
       },
       {
-        "label": "Quit Session Messenger",
+        "label": "Quit Session",
         "role": "quit"
       }
     ]
@@ -123,7 +123,7 @@
         "type": "separator"
       },
       {
-        "label": "About Session Messenger",
+        "label": "About Session",
         "click": null
       }
     ]

test/index.html

@@ -146,15 +146,15 @@
     <div class="content">
       <div class="betaDisclaimerView" style="display: none;">
         <h2>
-          Thanks for testing Session Messenger!
+          Thanks for testing Session!
         </h2>
         <p>
-            Thanks for testing Session Messenger! This software is a beta version of the full Session Messenger software suite, and so is missing some of the features the full version will have.
+            Thanks for testing Session! This software is a beta version of the full Session software suite, and so is missing some of the features the full version will have.
         </p>
 
         <p>
           <b>
-            This version of Session Messenger provides no guarantees of metadata privacy.
+            This version of Session provides no guarantees of metadata privacy.
           </b>
         </p>
 
@@ -167,7 +167,7 @@
         </p>
 
         <p>
-            However, no one except you and your intended recipients will be able to see the contents of your messages. We recommend using existing methods, like Tor or I2P to mask your IP address while using Session Messenger beta version.
+            However, no one except you and your intended recipients will be able to see the contents of your messages. We recommend using existing methods, like Tor or I2P to mask your IP address while using Session beta version.
         </p>
 
         <p>

ts/components/conversation/GroupInvitation.tsx

@@ -23,7 +23,7 @@ export class GroupInvitation extends React.Component<Props> {
           <div className="contents">
             <img
               alt="group-avatar"
-              src="images/loki/loki_icon.png"
+              src="images/loki/session_icon.png"
               className="invite-group-avatar"
             />
             <span className="group-details">