merge conflicts resolved

src/views/messages-view.jsx

@@ -223,7 +223,6 @@ class MessagesView extends React.Component {
         const preview = nextProps.forwardMessage.preview;
         reply = {
           content: preview,
-          forwarded: nextProps.forwardMessage.head.forwarded,
           seq: null
         };
       }
@@ -713,7 +712,7 @@ class MessagesView extends React.Component {
       if (typeof msg == 'string') {
         msg = Drafty.parse(msg);
       }
-      msg = Drafty.append(this.state.reply.content, msg);
+      msg = Drafty.append(Drafty.sanitizeEntities(this.state.reply.content), msg);
       this.handleCancelReply();
     }
     this.props.sendMessage(msg, uploadCompletionPromise, uploader, head);
@@ -867,18 +866,21 @@ class MessagesView extends React.Component {
     uploader.cancel();
   }
 
-  handlePickReply(seq, content, forwarded, senderId, senderName) {
+  // seq: seq ID of the source message
+  // context: message content.
+  // forwarded: true if the source message is also a forwarded message.
+  // senderId: UID of the sender of the source message.
+  // senderName: full name of the sender of the original message.
+  handlePickReply(seq, content, senderId, senderName) {
     this.setState({reply: null});
 
     if (!seq || !content) {
       return;
     }
 
-    content = forwarded ?
-        Drafty.forwardedContent(content) :
-        typeof content == 'string' ? Drafty.init(content) : content;
+    content = typeof content == 'string' ? Drafty.init(content) : content;
     if (Drafty.isValid(content)) {
-      content = Drafty.preview(content, QUOTED_REPLY_LENGTH, undefined, !forwarded);
+      content = Drafty.replyContent(content, QUOTED_REPLY_LENGTH);
     } else {
       // /!\ invalid content.
       content = Drafty.append(Drafty.init('\u26A0 '),
@@ -1010,7 +1012,6 @@ class MessagesView extends React.Component {
             <ChatMessage
               tinode={this.props.tinode}
               content={msg.content}
-              forwarded={msg.head ? msg.head.forwarded : null}
               deleted={msg.hi}
               mimeType={msg.head ? msg.head.mime : null}
               timestamp={msg.ts}

src/views/new-topic-view.jsx

@@ -35,7 +35,7 @@ class NewTopicView extends React.Component {
     super(props);
 
     this.state = {
-      tabSelected: 'p2p',
+      tabSelected: 'find',
       searchQuery: null
     };
 
@@ -62,7 +62,7 @@ class NewTopicView extends React.Component {
   }
 
   handleContactSelected(uid) {
-    if (this.state.tabSelected == 'p2p') {
+    if (this.state.tabSelected == 'find') {
       HashNavigation.navigateTo(HashNavigation.removeUrlParam(window.location.hash, 'tab'));
       this.props.onCreateTopic(uid);
     }
@@ -87,8 +87,8 @@ class NewTopicView extends React.Component {
     return (
       <div className="flex-column">
         <ul className="tabbar">
-          <li className={this.state.tabSelected === "p2p" ? "active" : null}>
-            <a href="#" data-id="p2p" onClick={this.handleTabClick}>
+          <li className={this.state.tabSelected === "find" ? "active" : null}>
+            <a href="#" data-id="find" onClick={this.handleTabClick}>
               <FormattedMessage id="tabtitle_find_user" defaultMessage="find"
                 description="Tab title Find" />
             </a>
@@ -116,7 +116,6 @@ class NewTopicView extends React.Component {
               onError={this.props.onError} /> :
             <div className="flex-column">
               <SearchContacts
-                type="p2p"
                 placeholder={search_placeholder}
                 onSearchContacts={this.handleSearchContacts} />
               <ContactList

src/views/password-reset-view.jsx

@@ -53,15 +53,21 @@ export default class PasswordResetView extends React.PureComponent {
     return (
       <form id="password-reset-form" onSubmit={this.handleSubmit}>
         {(this.state.token && this.state.scheme) ?
+          <><label htmlFor="new-password">
+            <FormattedMessage id="label_new_password"
+              defaultMessage="New password"
+              description="Label for entering a new password" />
+          </label>
           <FormattedMessage id="new_password_placeholder" defaultMessage="Enter new password"
             description="Placeholder for entering new password">{
             (placeholder) => <VisiblePassword
+              id="new-password"
               placeholder={placeholder}
               autoComplete="new-password"
               value={this.state.password}
               required={true} autoFocus={true}
               onChange={this.handlePasswordChange} />
-          }</FormattedMessage>
+          }</FormattedMessage></>
         : this.state.sent ?
           <>
             <br/>

src/views/tinode-web.jsx

@@ -16,7 +16,7 @@ import MessagesView from './messages-view.jsx';
 import SidepanelView from './sidepanel-view.jsx';
 
 import { API_KEY, APP_NAME, DEFAULT_P2P_ACCESS_MODE, FORWARDED_PREVIEW_LENGTH, LOGGING_ENABLED,
-  MEDIA_BREAKPOINT, QUOTED_REPLY_LENGTH, RECEIVED_DELAY } from '../config.js';
+  MEDIA_BREAKPOINT, RECEIVED_DELAY } from '../config.js';
 import { PACKAGE_VERSION } from '../version.js';
 import { base64ReEncode, makeImageUrl } from '../lib/blob-helpers.js';
 import { detectServerAddress, isLocalHost, isSecureConnection } from '../lib/host-name.js';
@@ -288,9 +288,12 @@ class TinodeWeb extends React.Component {
         });
       }
 
-      // Save possible topic name and navigate to blank state.
-      this.setState({requestedTopic: parsedNav.path[1]});
-      HashNavigation.navigateTo('');
+      // Maybe navigate to home screen.
+      if (!['cred', 'reset', 'register'].includes(parsedNav.path[0])) {
+        // Save possible topic name.
+        this.setState({requestedTopic: parsedNav.path[1]});
+        HashNavigation.navigateTo('');
+      }
 
       this.readTimer = null;
       this.readTimerCallback = null;
@@ -1199,6 +1202,8 @@ class TinodeWeb extends React.Component {
       delete parsed.params.code;
       delete parsed.params.method;
       delete parsed.params.tab;
+      delete parsed.params.scheme;
+      delete parsed.params.token;
     }
     HashNavigation.navigateTo(HashNavigation.composeUrlHash(parsed.path, parsed.params));
     this.setState({errorText: '', errorLevel: null});
@@ -1230,8 +1235,10 @@ class TinodeWeb extends React.Component {
       params.desc = {defacs: {auth: DEFAULT_P2P_ACCESS_MODE}};
     } else {
       topicName = topicName || this.tinode.newGroupTopicName(isChannel);
-      params.desc = {public: newTopicParams.public, private: {comment: newTopicParams.private}};
-      params.tags = newTopicParams.tags;
+      if (newTopicParams) {
+        params.desc = {public: newTopicParams.public, private: {comment: newTopicParams.private}};
+        params.tags = newTopicParams.tags;
+      }
     }
     params._topicName = topicName;
     this.setState({newTopicParams: params}, () => {this.handleTopicSelected(topicName)});
@@ -1443,22 +1450,22 @@ class TinodeWeb extends React.Component {
     });
   }
 
+  //
   handleShowForwardDialog(params) {
     if (this.state.sidePanelSelected == 'newtpk') {
       // If the Find panel is active, close it.
       this.handleSidepanelCancel();
     }
     const header = '➦ ' + params.userName;
-    const content = params.forwarded ?
-        Tinode.Drafty.forwardedContent(params.content) :
-        typeof params.content == 'string' ?
-            Tinode.Drafty.init(params.content) : params.content;
+    const content = typeof params.content == 'string' ?
+            Tinode.Drafty.init(params.content) : Tinode.Drafty.forwardedContent(params.content);
     const preview = Tinode.Drafty.preview(content, FORWARDED_PREVIEW_LENGTH,
                                           undefined, params.forwarded != null);
     const msg = Tinode.Drafty.append(
         Tinode.Drafty.appendLineBreak(
             Tinode.Drafty.mention(header, params.userFrom)),
         content);
+
     const msgPreview = Tinode.Drafty.quote(header, params.userFrom, preview);
     const head = {
       forwarded: params.topicName + ':' + params.seq
@@ -1611,6 +1618,9 @@ class TinodeWeb extends React.Component {
         .then(() => {
           return this.tinode.updateAccountBasic(null, null, newPassword, {token: token});
         })
+        .then(() => {
+          HashNavigation.navigateTo('');
+        })
         .catch((err) => {
           // Socket error
           this.handleError(err.message, 'err');