Merge pull request #1065 from erikaperugachi/reply

Scroll and fullscreen

Author: Erika Perugachi

electron_app/src/windows/mailbox.js

@@ -70,7 +70,12 @@ const create = () => {
   mailboxWindow.on('close', e => {
     if (!globalManager.forcequit.get()) {
       e.preventDefault();
-      hide();
+      if (mailboxWindow.isFullScreen()) {
+        mailboxWindow.setFullScreen(false);
+        setTimeout(() => hide(), 1200);
+      } else {
+        hide();
+      }
     } else {
       destroyTrayIcon();
       require('./../socketClient').disconnect();

email_composer/src/utils/EmailUtils.js

@@ -19,7 +19,7 @@ import { HTMLTagsRegex } from './RegexUtils';
 const myEmailAddress = `${myAccount.recipientId}@${appDomain}`;
 
 const formAppSign = () => {
-  return '<br/><span style="font-size: 12px;">Sent with <a style="color: #0091ff; text-decoration: none;" href="https://goo.gl/qW4Aks">Criptext</a> secure email</span>';
+  return '<br/><span style="font-size: 12px;">Sent with <a style="color: #0091ff; text-decoration: none;" href="http://bit.ly/2Xzx8Es">Criptext</a> secure email</span>';
 };
 
 const getRecipientsWithDomain = (recipients, type) => {

email_mailbox/src/components/Thread.js

@@ -25,33 +25,6 @@ class Thread extends Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
-    if (this.props.thread && !nextProps.thread) {
-      this.props.onBackOption();
-    } else if (this.props.thread.unread) {
-      if (
-        nextProps.emailKeysUnread.length !== this.props.emailKeysUnread.length
-      ) {
-        this.props.onUpdateUnreadEmails(
-          nextProps.emailKeysUnread,
-          nextProps.thread.threadId
-        );
-      }
-    }
-    if (
-      this.props.emails.length === 0 &&
-      nextProps.emails.length > this.props.emails.length
-    ) {
-      const groupedIndex =
-        nextProps.indexFirstUnread < 0
-          ? nextProps.emails.length - 1
-          : nextProps.indexFirstUnread;
-      this.setState({
-        groupedIndex: groupedIndex || 0
-      });
-    }
-  }
-
   render() {
     return (
       <div className="thread-container">
@@ -84,7 +57,9 @@ class Thread extends Component {
               />
             </div>
           </div>
-          <div className="cptx-thread-emails">{this.renderEmails()}</div>
+          <div className="cptx-thread-emails" ref={e => (this.scroll = e)}>
+            {this.renderEmails()}
+          </div>
         </div>
         {this.renderTooltipForEmail()}
       </div>
@@ -102,6 +77,42 @@ class Thread extends Component {
     }
   }
 
+  componentDidUpdate(prevProps) {
+    if (!this.props.thread && prevProps.thread) {
+      return this.props.onBackOption();
+    }
+
+    if (
+      this.props.thread.unread &&
+      prevProps.emailKeysUnread.length !== this.props.emailKeysUnread.length
+    ) {
+      this.props.onUpdateUnreadEmails(
+        this.props.emailKeysUnread,
+        this.props.thread.threadId
+      );
+    }
+
+    if (
+      prevProps.emails.length === 0 &&
+      prevProps.emails.length > this.props.emails.length
+    ) {
+      const groupedIndex =
+        this.props.indexFirstUnread < 0
+          ? this.props.emails.length - 1
+          : this.props.indexFirstUnread;
+      this.setState({
+        groupedIndex: groupedIndex || 0
+      });
+    }
+
+    if (
+      this.props.emails.length > prevProps.emails.length &&
+      prevProps.emails.length !== 0
+    ) {
+      this.setScrollToBottomPosition();
+    }
+  }
+
   renderEmails = () => {
     if (!this.props.emails.length) {
       return <EmailLoading />;
@@ -177,6 +188,11 @@ class Thread extends Component {
       groupedIndex: 0
     });
   };
+
+  setScrollToBottomPosition = () => {
+    const bottomPosition = this.scroll.scrollHeight - this.scroll.clientHeight;
+    this.scroll.scrollTop = bottomPosition;
+  };
 }
 
 const ExpandView = props => (