From c31c9df22eef4378d3da3bd8f2918a0bd6ee656d Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Fri, 16 Aug 2019 12:07:32 -0500 Subject: [PATCH 1/3] Fix firebase handle events without cmd or rowId. Fix #1137 --- email_mailbox/src/utils/electronEventInterface.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/email_mailbox/src/utils/electronEventInterface.js b/email_mailbox/src/utils/electronEventInterface.js index 32c6e8a8f..43c563585 100644 --- a/email_mailbox/src/utils/electronEventInterface.js +++ b/email_mailbox/src/utils/electronEventInterface.js @@ -84,6 +84,7 @@ const { NOTIFICATION_SERVICE_STARTED, TOKEN_UPDATED } = remote.require('@criptext/electron-push-receiver/src/constants'); +const pushActions = ['anti_push', 'open_thread', 'open_activity'] const senderNotificationId = '73243261136'; const emitter = new EventEmitter(); let totalEmailsPending = null; @@ -1429,6 +1430,7 @@ ipcRenderer.on(TOKEN_UPDATED, async (_, token) => { }); ipcRenderer.on(NOTIFICATION_RECEIVED, async (_, { data }) => { + if(pushActions.includes(data.action) || !data.rowId) return; isGettingEvents = true; try { const eventData = await fetchGetSingleEvent({ rowId: data.rowId }); From 0aacc15d037cc756072012117d5378f94d894551 Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Fri, 16 Aug 2019 12:09:19 -0500 Subject: [PATCH 2/3] Fix upload file xls. Fix #1138 --- email_composer/src/components/attachment.scss | 5 +++-- email_composer/src/containers/Composer.js | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/email_composer/src/components/attachment.scss b/email_composer/src/components/attachment.scss index 1316aac1c..eb9845c3e 100644 --- a/email_composer/src/components/attachment.scss +++ b/email_composer/src/components/attachment.scss @@ -31,12 +31,13 @@ } .file-icon{ + color: #fff; + display: flex; float: left; + font-size: 30px; height: 30px; margin: 5px 8px 5px 7px; width: 30px; - font-size: 30px; - color: #fff; .icon-container-image { background-color: #99ccff; diff --git a/email_composer/src/containers/Composer.js b/email_composer/src/containers/Composer.js index 8bee44a2f..ba43e005d 100644 --- a/email_composer/src/containers/Composer.js +++ b/email_composer/src/containers/Composer.js @@ -382,6 +382,11 @@ class ComposerWrapper extends Component { }); const files = this.getFilesFromEvent(e); const filesFiltered = [...files].filter(item => { + if (!item.type) { + const texts = item.name.split('.'); + const ext = texts[texts.length - 1]; + if (ext === 'xls') return true; + } return !!item.type; }); From 3524f7146e8140c185529b088f549e5960213c5f Mon Sep 17 00:00:00 2001 From: erikaperugachi Date: Mon, 19 Aug 2019 13:25:03 -0500 Subject: [PATCH 3/3] Add analytics. Close #1139 --- electron_app/electron-starter.js | 17 +++ electron_app/package.json | 1 + electron_app/yarn.lock | 116 +++++++++++++++++- email_mailbox/src/app.scss | 6 + email_mailbox/src/components/contacttag.scss | 1 + .../src/components/customCheckbox.scss | 1 + email_mailbox/src/components/email.scss | 4 + .../src/components/emailmoreinfo.scss | 1 + email_mailbox/src/components/sidebar.scss | 2 + email_mailbox/src/components/thread.scss | 2 +- email_mailbox/src/components/tooltipmenu.scss | 2 + .../src/utils/electronEventInterface.js | 4 +- 12 files changed, 153 insertions(+), 4 deletions(-) diff --git a/electron_app/electron-starter.js b/electron_app/electron-starter.js index 5920268bc..4008d4664 100644 --- a/electron_app/electron-starter.js +++ b/electron_app/electron-starter.js @@ -17,6 +17,7 @@ const { isFromStore, getSystemLanguage } = require('./src/windows/windowUtils'); +require('dotenv').config(); require('./src/ipc/composer.js'); require('./src/ipc/loading.js'); require('./src/ipc/login.js'); @@ -26,6 +27,9 @@ require('./src/ipc/manager.js'); require('./src/ipc/dataTransfer.js'); require('./src/ipc/backup.js'); const ipcUtils = require('./src/ipc/utils.js'); +const { version } = require('./package.json'); +const nucleusId = process.env.NUCLEUS_ID; +const versionApp = process.env.NODE_ENV === 'development' ? '0.0.0' : version; globalManager.forcequit.set(false); @@ -79,6 +83,8 @@ async function initApp() { loadingWindow.send('socket-message', data); } }); + + upNucleus(); } // App @@ -99,6 +105,17 @@ const getUserLanguage = async () => { await dbManager.updateSettings({ language: osLanguage }); }; +const upNucleus = () => { + const data = { + onlyMainProcess: true, + userId: myAccount.recipientId, + version: versionApp, + language: mySettings.language + } + const Nucleus = require('electron-nucleus')(nucleusId, data); + Nucleus.track("PLAYED_TRACK"); +} + app.on('ready', () => { initApp(); }); diff --git a/electron_app/package.json b/electron_app/package.json index c37b777a7..1fcb665f6 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -140,6 +140,7 @@ "dotenv": "^6.2.0", "electron-context-menu": "^0.10.1", "electron-dl": "^1.12.0", + "electron-nucleus": "^2.2.1", "electron-updater": "^3.0.3", "electron-window-state": "^4.1.1", "getos": "^3.1.1", diff --git a/electron_app/yarn.lock b/electron_app/yarn.lock index 7269cd21b..61a2d314b 100644 --- a/electron_app/yarn.lock +++ b/electron_app/yarn.lock @@ -240,6 +240,16 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" +ajv@^6.10.0: + version "6.10.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" + integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ajv@^6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" @@ -423,6 +433,11 @@ async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" +async-limiter@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" @@ -1026,6 +1041,19 @@ conf@^1.0.0: pkg-up "^2.0.0" write-file-atomic "^2.3.0" +conf@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conf/-/conf-5.0.0.tgz#6530308a36041bf010ab96b05a0f4aff5101c65d" + integrity sha512-lRNyt+iRD4plYaOSVTxu1zPWpaH0EOxgFIR1l3mpC/DGZ7XzhoGFMKmbl54LAgXcSu6knqWgOwdINkqm58N85A== + dependencies: + ajv "^6.10.0" + dot-prop "^5.0.0" + env-paths "^2.2.0" + json-schema-typed "^7.0.0" + make-dir "^3.0.0" + pkg-up "^3.0.1" + write-file-atomic "^3.0.0" + configstore@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" @@ -1285,6 +1313,13 @@ dot-prop@^4.1.0: dependencies: is-obj "^1.0.0" +dot-prop@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.0.tgz#bdd8c986a77b83e3fca524e53786df916cabbd8a" + integrity sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA== + dependencies: + is-obj "^2.0.0" + dotenv-expand@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" @@ -1436,6 +1471,16 @@ electron-is-dev@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc" +electron-nucleus@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/electron-nucleus/-/electron-nucleus-2.2.1.tgz#c747dc1beb2af5251b33cd21f64e962a8c908821" + integrity sha512-Jglvm3dB4cFBIjZ6fLlPtX2xDpabeJhnOhbBFdCEIF3b14P2o68rRGj3+07r6V6uoovPz2vJwXizALPAySzVjg== + dependencies: + electron-store "^4.0.0" + node-machine-id "^1.1.12" + request "^2.88.0" + ws "^7.1.2" + electron-osx-sign@0.4.10: version "0.4.10" resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz#be4f3b89b2a75a1dc5f1e7249081ab2929ca3a26" @@ -1459,6 +1504,14 @@ electron-publish@20.22.2: lazy-val "^1.0.3" mime "^2.3.1" +electron-store@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-4.0.0.tgz#5f0835663bb774d5eecb5b283b390f9910ec4cfc" + integrity sha512-qgkDetwB9bz+ZA7mNCQGm6zLJOMT4yBkTZ7f16M9iS0GcI/bOeOeFkLkIaJddTtPca7MOiaUM1imMjFqUfQgSA== + dependencies: + conf "^5.0.0" + type-fest "^0.5.2" + electron-updater@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-3.0.3.tgz#67f7edd578d260f9351ccd46ff23c2789c2a5a4f" @@ -1499,6 +1552,11 @@ env-paths@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + errno@^0.1.2: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" @@ -2560,6 +2618,11 @@ is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -3079,6 +3142,11 @@ json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" +json-schema-typed@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.1.tgz#5e56564b5a0950423e22b285a30ade219e38084d" + integrity sha512-IqUK+Cqc8/MqHsCvv1TMccbKdBzoATOLHXZAF5UDu70/CCxo648cHUig24hc+XTK53TyeNk1UeVTlc2Haovtsw== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -3330,6 +3398,13 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" +make-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801" + integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw== + dependencies: + semver "^6.0.0" + make-iterator@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" @@ -3594,6 +3669,11 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" +node-machine-id@^1.1.12: + version "1.1.12" + resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267" + integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ== + node-notifier@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea" @@ -4028,6 +4108,13 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" +pkg-up@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + plist@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025" @@ -4573,6 +4660,11 @@ semver-diff@^2.0.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" +semver@^6.0.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -5080,6 +5172,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" + integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== + typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -5169,7 +5266,7 @@ update-notifier@^2.5.0: semver-diff "^2.0.0" xdg-basedir "^3.0.0" -uri-js@^4.2.1: +uri-js@^4.2.1, uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" dependencies: @@ -5352,6 +5449,16 @@ write-file-atomic@^2.3.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-atomic@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.0.tgz#1b64dbbf77cb58fd09056963d63e62667ab4fb21" + integrity sha512-EIgkf60l2oWsffja2Sf2AL384dx328c0B+cIYPTQq5q2rOYuDV00/iPFBOUiDKKwKMOhkymH8AidPaRvzfxY+Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -5365,6 +5472,13 @@ ws@^4.0.0: async-limiter "~1.0.0" safe-buffer "~5.1.0" +ws@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.2.tgz#c672d1629de8bb27a9699eb599be47aeeedd8f73" + integrity sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg== + dependencies: + async-limiter "^1.0.0" + xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" diff --git a/email_mailbox/src/app.scss b/email_mailbox/src/app.scss index 15785514f..822d59167 100644 --- a/email_mailbox/src/app.scss +++ b/email_mailbox/src/app.scss @@ -886,6 +886,7 @@ select { button{ border: none; cursor: pointer; + font-size: inherit; &:focus{ outline: 0; @@ -944,6 +945,11 @@ button{ &.button-aa{ background-color: #0091ff; } + + span{ + font-family: NunitoSans; + line-height: inherit; + } } .button-a-circle{ diff --git a/email_mailbox/src/components/contacttag.scss b/email_mailbox/src/components/contacttag.scss index 647722c09..1149f1074 100644 --- a/email_mailbox/src/components/contacttag.scss +++ b/email_mailbox/src/components/contacttag.scss @@ -7,6 +7,7 @@ } .tag{ + font-family: NunitoSans; font-size: 12px; font-weight: 300; text-decoration: none; diff --git a/email_mailbox/src/components/customCheckbox.scss b/email_mailbox/src/components/customCheckbox.scss index 155e0d2ff..436f0be0b 100644 --- a/email_mailbox/src/components/customCheckbox.scss +++ b/email_mailbox/src/components/customCheckbox.scss @@ -56,6 +56,7 @@ } .checkmark-text{ + font-family: NunitoSans; font-size: 13px; font-weight: 200; margin-left: 12px; diff --git a/email_mailbox/src/components/email.scss b/email_mailbox/src/components/email.scss index 830628043..48a20b070 100644 --- a/email_mailbox/src/components/email.scss +++ b/email_mailbox/src/components/email.scss @@ -72,6 +72,7 @@ >span{ background-color: transparent; + font-family: NunitoSans; font-size: 14px; font-weight: 100; line-height: 14px; @@ -90,6 +91,7 @@ background-color: transparent; color: #0091ff; cursor: pointer; + font-family: NunitoSans; font-size: 14px; font-weight: 200; } @@ -253,6 +255,7 @@ span{ background-color: transparent; + font-family: NunitoSans; font-size: 15px; font-weight: 600; } @@ -267,6 +270,7 @@ .email-info-content-detail-date{ background-color: transparent; color: black; + font-family: NunitoSans; font-size: 13px; font-weight: 300; margin-left: 5px; diff --git a/email_mailbox/src/components/emailmoreinfo.scss b/email_mailbox/src/components/emailmoreinfo.scss index 8e69bb0db..088679ba7 100644 --- a/email_mailbox/src/components/emailmoreinfo.scss +++ b/email_mailbox/src/components/emailmoreinfo.scss @@ -26,6 +26,7 @@ } span{ + font-family: NunitoSans; font-size: 12px; } diff --git a/email_mailbox/src/components/sidebar.scss b/email_mailbox/src/components/sidebar.scss index f4e7a0ba7..69677c42f 100644 --- a/email_mailbox/src/components/sidebar.scss +++ b/email_mailbox/src/components/sidebar.scss @@ -51,6 +51,7 @@ span{ background-color: transparent; + font-family: NunitoSans; } } } @@ -125,6 +126,7 @@ span { display: block; + font-family: NunitoSans; font-size: 13px; text-align: left; text-decoration: none; diff --git a/email_mailbox/src/components/thread.scss b/email_mailbox/src/components/thread.scss index 96772e93e..ec4ecf4a2 100644 --- a/email_mailbox/src/components/thread.scss +++ b/email_mailbox/src/components/thread.scss @@ -24,7 +24,7 @@ h1{ background-color: transparent; - font-family: NunitoSans; + font-family: NunitoSans, Roboto; font-size: 21px; font-weight: 700; line-height: 21px; diff --git a/email_mailbox/src/components/tooltipmenu.scss b/email_mailbox/src/components/tooltipmenu.scss index 2bb10ec9a..3a3da8be0 100644 --- a/email_mailbox/src/components/tooltipmenu.scss +++ b/email_mailbox/src/components/tooltipmenu.scss @@ -17,8 +17,10 @@ z-index: 11; h3{ + color: black; font-family: NunitoSans; font-size: 13px; + font-weight: 700; margin: 5px 0px; padding-left: 16px; } diff --git a/email_mailbox/src/utils/electronEventInterface.js b/email_mailbox/src/utils/electronEventInterface.js index 43c563585..017446cbb 100644 --- a/email_mailbox/src/utils/electronEventInterface.js +++ b/email_mailbox/src/utils/electronEventInterface.js @@ -84,7 +84,7 @@ const { NOTIFICATION_SERVICE_STARTED, TOKEN_UPDATED } = remote.require('@criptext/electron-push-receiver/src/constants'); -const pushActions = ['anti_push', 'open_thread', 'open_activity'] +const pushActions = ['anti_push', 'open_thread', 'open_activity']; const senderNotificationId = '73243261136'; const emitter = new EventEmitter(); let totalEmailsPending = null; @@ -1430,7 +1430,7 @@ ipcRenderer.on(TOKEN_UPDATED, async (_, token) => { }); ipcRenderer.on(NOTIFICATION_RECEIVED, async (_, { data }) => { - if(pushActions.includes(data.action) || !data.rowId) return; + if (pushActions.includes(data.action) || !data.rowId) return; isGettingEvents = true; try { const eventData = await fetchGetSingleEvent({ rowId: data.rowId });