Merge pull request #1068 from erikaperugachi/email

Handle email

Author: JulianAdams4

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",
@@ -132,7 +132,7 @@
     "electron-builder": "^20.18.0"
   },
   "dependencies": {
-    "@criptext/api": "^0.15.14",
+    "@criptext/api": "^0.15.15",
     "@criptext/data-transfer-client": "^0.1.1",
     "@criptext/electron-better-ipc": "^0.1.2-rc5",
     "@criptext/electron-push-receiver": "^2.1.2",

electron_app/yarn.lock

@@ -96,10 +96,10 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@criptext/api@^0.15.14":
-  version "0.15.14"
-  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.15.14.tgz#d446e531def9339c363c141c449869ec17ed0904"
-  integrity sha512-HLTdnrIreuWGTYHAwzksFLz6g66EbhIX4MBLTztqGVmN1tS929DyRbwdUqrk5FfqXOccKrgU35LnXjzStdKbcw==
+"@criptext/api@^0.15.15":
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.15.15.tgz#e012531fea8a51b7cfa6ac237b782b16319b8387"
+  integrity sha512-GKE09LQDBjYWvA8SR3BLu56wVJt3211I++I6ziqeAxxYyV7Na9RX5dZCOXKA1KAbiYTs5PmPpftZSc3/77nIDg==
   dependencies:
     superagent "^3.8.2"
 

email_composer/src/containers/Composer.js

@@ -541,7 +541,11 @@ class ComposerWrapper extends Component {
       toEmails: this.state.toEmails,
       threadId: this.state.threadId || temporalThreadId
     };
-    const { emailData, recipientDomains } = formOutgoingEmailFromData(data);
+    const {
+      bodyWithSign,
+      emailData,
+      recipientDomains
+    } = formOutgoingEmailFromData(data);
     let emailId, key;
     try {
       const files = await getFileParamsToSend(this.state.files);
@@ -569,6 +573,7 @@ class ComposerWrapper extends Component {
             : emailData.email.threadId,
         recipients,
         body: emailData.body,
+        bodyWithSign,
         preview: emailData.email.preview,
         files,
         peer,
@@ -775,7 +780,6 @@ class ComposerWrapper extends Component {
       bccEmails: this.state.bccEmails,
       body: this.state.newHtmlBody,
       ccEmails: this.state.ccEmails,
-      isDraft: true,
       labelId: LabelType.draft.id,
       secure: false,
       textSubject: this.state.textSubject,

email_composer/src/libs/signal.js

@@ -179,6 +179,7 @@ const createEmails = async (
 const encryptPostEmail = async ({
   recipients,
   body,
+  bodyWithSign,
   preview,
   subject,
   threadId,
@@ -245,7 +246,7 @@ const encryptPostEmail = async ({
     recipients,
     guestDomains,
     files,
-    body
+    body: bodyWithSign
   });
   const data = noNulls({
     subject,

email_composer/src/utils/EmailUtils.js

@@ -91,7 +91,6 @@ export const formOutgoingEmailFromData = ({
   bccEmails,
   body,
   ccEmails,
-  isDraft,
   isEnterprise,
   labelId,
   secure,
@@ -142,11 +141,15 @@ export const formOutgoingEmailFromData = ({
     email,
     recipients,
     labels,
-    body: secure || isDraft || isEnterprise ? body : `${body}${formAppSign()}`,
+    body,
     files
   };
 
+  const bodyWithSign =
+    secure || isEnterprise ? body : `${body}${formAppSign()}`;
+
   return {
+    bodyWithSign,
     emailData,
     recipientDomains
   };

email_composer/src/utils/__tests__/__snapshots__/EmailUtils.js.snap

@@ -20,6 +20,7 @@ Object {
 
 exports[`Form outgoing email:  Should form outgoing email from data 1`] = `
 Object {
+  "bodyWithSign": "<p>Hello</p>",
   "emailData": Object {
     "body": "<p>Hello</p>",
     "email": Object {

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_mailbox/src/components/Thread.js

@@ -82,6 +82,10 @@ class Thread extends Component {
       return this.props.onBackOption();
     }
 
+    if (prevProps.thread.id !== this.props.thread.id) {
+      this.props.onLoadEmails(this.props.thread.emailIds);
+    }
+
     if (
       this.props.thread.unread &&
       prevProps.emailKeysUnread.length !== this.props.emailKeysUnread.length