Merge pull request #1192 from erikaperugachi/fixes

Fixes

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/ipc/login.js

@@ -1,8 +1,8 @@
 const ipc = require('@criptext/electron-better-ipc');
 const loginWindow = require('../windows/login');
 
-ipc.answerRenderer('close-login', () => {
-  loginWindow.close();
+ipc.answerRenderer('close-login', ({ forceClose }) => {
+  loginWindow.close({ forceClose });
 });
 
 ipc.answerRenderer('minimize-login', () => {

electron_app/src/windows/composer.js

@@ -164,9 +164,8 @@ const destroy = async ({
 
 const sendEventToMailbox = (eventName, data) => {
   const mailboxWindow = require('./mailbox');
-  if (mailboxWindow && mailboxWindow.send) {
-    mailboxWindow.send(eventName, data);
-  }
+  if (!mailboxWindow) return;
+  mailboxWindow.send(eventName, data);
 };
 
 const saveDraftToDatabase = async (composerId, data) => {

electron_app/src/windows/login.js

@@ -4,6 +4,7 @@ const { loginUrl } = require('./../window_routing');
 const globalManager = require('./../globalManager');
 const { addEventTrack, NUCLEUS_EVENTS } = require('./../nucleusManager');
 let loginWindow;
+let shouldCloseForce = false;
 
 const loginSize = {
   width: 328,
@@ -34,6 +35,7 @@ const create = () => {
 
   loginWindow.on('close', e => {
     const isMacOs = process.platform === 'darwin';
+    if (shouldCloseForce === true) return;
     if (isMacOs && !globalManager.forcequit.get()) {
       e.preventDefault();
       hide();
@@ -63,7 +65,8 @@ const show = async () => {
   }
 };
 
-const close = () => {
+const close = ({ forceClose }) => {
+  shouldCloseForce = forceClose;
   if (loginWindow !== undefined) {
     loginWindow.close();
   }

electron_app/src/windows/mailbox.js

@@ -68,18 +68,17 @@ const create = () => {
   mailboxWindow.webContents.on('new-window', openLinkInDefaultBrowser);
   mailboxWindow.webContents.on('will-navigate', openLinkInDefaultBrowser);
   mailboxWindow.on('close', e => {
-    if (!globalManager.forcequit.get()) {
-      e.preventDefault();
-      if (mailboxWindow && mailboxWindow.isFullScreen()) {
-        mailboxWindow.setFullScreen(false);
-        setTimeout(() => hide(), 1200);
-      } else {
-        hide();
-      }
-    } else {
+    if (!mailboxWindow || globalManager.forcequit.get()) {
       destroyTrayIcon();
       require('./../socketClient').disconnect();
     }
+    e.preventDefault();
+    if (mailboxWindow && mailboxWindow.isFullScreen()) {
+      mailboxWindow.setFullScreen(false);
+      setTimeout(() => hide(), 1200);
+    } else {
+      hide();
+    }
   });
   mailboxWindow.webContents.once('did-frame-finish-load', () => {
     if (!isFromStore) appUpdater();
@@ -149,15 +148,12 @@ const toggleMaximize = () => {
 };
 
 const minimize = () => {
-  if (mailboxWindow !== undefined) {
-    mailboxWindow.minimize();
-  }
+  if (!mailboxWindow) return;
+  mailboxWindow.minimize();
 };
 
 const send = (message, data) => {
-  if (!mailboxWindow) {
-    return;
-  }
+  if (!mailboxWindow) return;
   mailboxWindow.webContents.send(message, data);
 };
 

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_login/src/components/ChangePasswordWrapper.js

@@ -122,7 +122,7 @@ class ChangePasswordWrapper extends Component {
             token
           }
         });
-        closeLoginWindow();
+        closeLoginWindow({ forceClose: true });
         break;
       }
       case LOGIN_FIRST_STATUS.WRONG_CREDENTIALS: {

email_login/src/components/PanelWrapper.js

@@ -87,7 +87,7 @@ const commitNewUser = validInputData => {
     loadingType: 'signup',
     remoteData: validInputData
   });
-  closeLoginWindow();
+  closeLoginWindow({ forceClose: true });
 };
 
 class PanelWrapper extends Component {
@@ -822,7 +822,7 @@ class PanelWrapper extends Component {
             remoteData
           });
           deleteTemporalAccount();
-          closeLoginWindow();
+          closeLoginWindow({ forceClose: true });
           return;
         }
         default: {
@@ -902,7 +902,7 @@ class PanelWrapper extends Component {
           name
         }
       });
-      closeLoginWindow();
+      closeLoginWindow({ forceClose: true });
     } else {
       const error = {
         name: string.errors.loginFailed.name,

email_login/src/components/SignInPasswordWrapper.js

@@ -120,7 +120,7 @@ class SignInPasswordWrapper extends Component {
             name
           }
         });
-        closeLoginWindow();
+        closeLoginWindow({ forceClose: true });
         break;
       }
       case LOGIN_STATUS.WRONG_CREDENTIALS: {

email_login/src/components/titleBar.js

@@ -17,7 +17,7 @@ const titleBar = () => (
       <span className="minimize" onClick={minimizeLoginWindow}>
         <i className="icon-minimize" />
       </span>
-      <span className="close" onClick={() => closeLoginWindow()}>
+      <span className="close" onClick={() => closeLoginWindow({})}>
         <i className="icon-exit" />
       </span>
     </span>

email_login/src/utils/ipc.js

@@ -1,7 +1,7 @@
 import { callMain } from '@criptext/electron-better-ipc/renderer';
 
-export const closeLoginWindow = () => {
-  callMain('close-login');
+export const closeLoginWindow = params => {
+  callMain('close-login', params);
 };
 
 export const getComputerName = () => callMain('get-computer-name');

email_mailbox/package.json

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

email_mailbox/src/components/SettingLabels.js

@@ -74,9 +74,11 @@ const renderCustomLabelsBlock = props => (
         <div className="table-column-b">
           <h1>{string.settings.show_in_label_list}</h1>
         </div>
-        <div className="table-column-c">
-          <h1>{string.settings.action}</h1>
-        </div>
+        {props.exist && (
+          <div className="table-column-c">
+            <h1>{string.settings.action}</h1>
+          </div>
+        )}
       </div>
       <div className="table-body">
         {props.customLabels.map((customLabel, index) =>
@@ -102,12 +104,14 @@ const renderCustomLabelItem = (index, customLabelItem, props) => (
         status={customLabelItem.visible ? 'all' : 'none'}
       />
     </div>
-    <div
-      className="table-column-c"
-      onClick={() => props.onClickRemoveLabel(customLabelItem.id)}
-    >
-      {string.settings.remove}
-    </div>
+    {props.exist && (
+      <div
+        className="table-column-c"
+        onClick={() => props.onClickRemoveLabel(customLabelItem.id)}
+      >
+        {string.settings.remove}
+      </div>
+    )}
   </div>
 );
 
@@ -145,12 +149,14 @@ renderSystemLabelsBlock.propTypes = {
 };
 
 renderCustomLabelsBlock.propTypes = {
-  customLabels: PropTypes.array
+  customLabels: PropTypes.array,
+  exist: PropTypes.bool
 };
 
 renderCustomLabelItem.propTypes = {
   onClickChangeLabelVisibility: PropTypes.func,
-  onClickRemoveLabel: PropTypes.func
+  onClickRemoveLabel: PropTypes.func,
+  exist: PropTypes.bool
 };
 
 renderInputAddNewLabel.propTypes = {

email_mailbox/src/components/settingdevices.scss

@@ -70,13 +70,14 @@
     }
 
     button {
-      display: flex;
       align-items: center;
-      padding-left: 5%;
+      background-color: transparent;
       color: #d94e47;
+      cursor: pointer;
+      display: flex;
       font-size: 12px;
       font-weight: 600;
-      cursor: pointer;
+      padding-left: 5%;
     }
   }
 }