Merge pull request #1216 from erikaperugachi/lint

Update @criptext/criptext-js-tools

Author: Hirobreak

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:8.15
+      - image: circleci/node:10.17.0
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -53,9 +53,13 @@ jobs:
 
       # run tests!
       - checkout
+      - run: 
+          name: Composer Build
+          command: cd email_composer/ && echo 'SKIP_PREFLIGHT_CHECK=true' >> .env && yarn build
+
       - run:
           name: Composer Unit test
-          command: cd email_composer/ && echo 'SKIP_PREFLIGHT_CHECK=true' >> .env && yarn test
+          command: cd email_composer/ && yarn test
 
       - run:
           name: Composer Lint

README.md

@@ -23,7 +23,7 @@ We use Lokalise for translations. If you are interested in helping please write
 
 To build Criptext on your machine you'll need:
 
-* Node.js (Recommended 12.12+) 
+* Node.js (Recommended 10.17.0+) 
 * Yarn (Recommended 1.19.1+) 
 
 ## Run locally

electron_app/package.json

@@ -134,7 +134,7 @@
     }
   },
   "devDependencies": {
-    "criptext-js-tools": "0.5.0",
+    "@criptext/criptext-js-tools": "^0.5.2",
     "electron": "6.1.4",
     "electron-builder": "21.2.0",
     "electron-notarize": "^0.1.1"
@@ -162,5 +162,9 @@
     "sqlite3": "^4.1.0",
     "unused-filename": "^2.1.0",
     "websocket": "^1.0.28"
+  },
+  "jest": {
+    "verbose": true,
+    "testURL": "http://localhost/"
   }
 }

electron_app/src/socketClient.js

@@ -20,10 +20,7 @@ const disconnect = () => {
 
 const start = ({ jwt }) => {
   client = new WebSocketClient();
-  client.connect(
-    `${SOCKET_URL}?token=${jwt}`,
-    'criptext-protocol'
-  );
+  client.connect(`${SOCKET_URL}?token=${jwt}`, 'criptext-protocol');
 
   client.on('connectFailed', error => {
     if (shouldReconnect) {

electron_app/yarn.lock

@@ -29,8 +29,8 @@
     "lint": "criptext-js-tools lint"
   },
   "devDependencies": {
+    "@criptext/criptext-js-tools": "^0.5.2",
     "@criptext/react-scripts": "^2.0.6-rc1",
-    "criptext-js-tools": "0.5.0",
     "node-sass": "^4.13.0"
   },
   "homepage": "./",

email_composer/package.json

@@ -54,9 +54,10 @@ const TagRecipient = props => {
         />
       )}
 
-      {!disabled && !isEditable && (
-        <a className={classNameIconRemove} onClick={() => onRemove(key)} />
-      )}
+      {!disabled &&
+        !isEditable && (
+          <a className={classNameIconRemove} onClick={() => onRemove(key)} />
+        )}
     </span>
   );
 };

email_composer/src/components/TagRecipient.js

@@ -24,7 +24,11 @@ const myEmailAddress = myAccount.recipientId.includes('@')
 const enterpriseDomain = myAccount.recipientId.split('@')[1];
 
 const formAppSign = () => {
-  return `<br/><i style="font-size: 12px;">${string.criptextSignature.sent_with} <span style="color: #0091ff; text-decoration: none;">Criptext</span> ${string.criptextSignature.secure_email}</i>`;
+  return `<br/><i style="font-size: 12px;">${
+    string.criptextSignature.sent_with
+  } <span style="color: #0091ff; text-decoration: none;">Criptext</span> ${
+    string.criptextSignature.secure_email
+  }</i>`;
 };
 
 const getRecipientsWithDomain = (recipients, type) => {
@@ -254,8 +258,8 @@ export const formDataToReply = async (emailKeyToEdit, replyType) => {
   const from = emailData.replyTo
     ? parseContactRow(emailData.replyTo)
     : emailFrom.name
-    ? emailFrom
-    : contacts.from[0];
+      ? emailFrom
+      : contacts.from[0];
 
   const content = formReplyForwardContent(
     replyType,
@@ -292,10 +296,11 @@ export const formDataToReply = async (emailKeyToEdit, replyType) => {
 };
 
 const formToEmails = (from, to, replyType, myEmailAddress) => {
-  const [isFromMe] = from.map(contact =>
-    contact.email
-      ? contact.email === myEmailAddress
-      : contact === myEmailAddress
+  const [isFromMe] = from.map(
+    contact =>
+      contact.email
+        ? contact.email === myEmailAddress
+        : contact === myEmailAddress
   );
   if (
     replyType === composerEvents.REPLY ||