Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into multidevice-publicchat

js/modules/loki_app_dot_net_api.js

@@ -468,8 +468,11 @@ class LokiAppDotNetServerAPI {
       response.data &&
       response.data.avatar_image &&
       response.data.avatar_image.url;
+
+    // We don't use the server id for avatars
     return {
       url,
+      id: null,
     };
   }
 

js/views/conversation_view.js

@@ -2418,7 +2418,7 @@
 
       // Alt would normally make the cursor go until the next whitespace,
       // but we need to take the presence of a mention into account
-      if (event.altKey) {
+      if (event.altKey || event.ctrlKey) {
         const searchFrom = isLeft ? posToChange - 1 : posToChange + 1;
         const toSearch = isLeft
           ? text.substr(0, searchFrom)

ts/components/conversation/TypingBubble.tsx

@@ -52,18 +52,22 @@ export class TypingBubble extends React.Component<Props> {
     const { i18n, color } = this.props;
 
     return (
-      <div className={classNames('module-message', 'module-message--incoming')}>
+      <div className="loki-message-wrapper">
         <div
-          className={classNames(
+          className={classNames('module-message', 'module-message--incoming')}
-            'module-message__container',
-            'module-message__container--incoming',
-            `module-message__container--incoming-${color}`
-          )}
         >
-          <div className="module-message__typing-container">
+          <div
-            <TypingAnimation color="light" i18n={i18n} />
+            className={classNames(
+              'module-message__container',
+              'module-message__container--incoming',
+              `module-message__container--incoming-${color}`
+            )}
+          >
+            <div className="module-message__typing-container">
+              <TypingAnimation color="light" i18n={i18n} />
+            </div>
+            {this.renderAvatar()}
           </div>
-          {this.renderAvatar()}
         </div>
       </div>
     );