Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion electron_app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -162,5 +162,9 @@
"sqlite3": "^4.1.0",
"unused-filename": "^2.1.0",
"websocket": "^1.0.28"
},
"jest": {
"verbose": true,
"testURL": "http://localhost/"
}
}
5 changes: 1 addition & 4 deletions electron_app/src/socketClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1,628 changes: 938 additions & 690 deletions electron_app/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion email_composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "./",
Expand Down
7 changes: 4 additions & 3 deletions email_composer/src/components/TagRecipient.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ const TagRecipient = props => {
/>
)}

{!disabled && !isEditable && (
<a className={classNameIconRemove} onClick={() => onRemove(key)} />
)}
{!disabled &&
!isEditable && (
<a className={classNameIconRemove} onClick={() => onRemove(key)} />
)}
</span>
);
};
Expand Down
19 changes: 12 additions & 7 deletions email_composer/src/utils/EmailUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 ||
Expand Down
Loading