bug fixes at mailbox

danieltigse · Pedro Aim · commit a35d1d842e1f · 2020-03-09T16:14:33.000-05:00
diff --git a/electron_app/src/windows/launch.js b/electron_app/src/windows/launch.js
@@ -4,7 +4,7 @@ const path = require('path');
 const openLaunchWindow = () => {
   try {
     const workerWin = new BrowserWindow({
-      width: 300,
+      width: 350,
       height: 220,
       frame: false,
       transparent: true,
diff --git a/electron_app/src/windows/login.js b/electron_app/src/windows/login.js
@@ -1,7 +1,6 @@
 const { BrowserWindow, shell } = require('electron');
 const path = require('path');
 const { loginUrl } = require('./../window_routing');
-const globalManager = require('./../globalManager');
 const { addEventTrack, NUCLEUS_EVENTS } = require('./../nucleusManager');
 let loginWindow;
 let shouldCloseForce = false;
@@ -36,16 +35,11 @@ const create = () => {
     loginWindow.webContents.openDevTools({ mode: 'undocked' });
   }
 
-  loginWindow.on('close', e => {
-    const isMacOs = process.platform === 'darwin';
+  loginWindow.on('close', () => {
     if (shouldCloseForce === true) {
       shouldCloseForce = false;
       return;
     }
-    if (isMacOs && !globalManager.forcequit.get()) {
-      e.preventDefault();
-      hide();
-    }
   });
   loginWindow.on('closed', () => {
     if (process.platform !== 'darwin') {
diff --git a/electron_app/src/windows/preparing.html b/electron_app/src/windows/preparing.html
@@ -16,7 +16,7 @@
           width: 100%;
         }  
         body {
-          width: 300px;
+          width: 350px;
           height: 220px;
           display: flex;
           flex-direction: column;
@@ -49,7 +49,7 @@
 
         .encrypt-loading{
           margin: 15px auto 0;
-          width: 175px;
+          width: 225px;
         }
 
         .bar {
@@ -93,7 +93,7 @@
         }
 
         .message {
-          margin-top: 30px;
+          margin-top: 20px;
           text-align: center;
         }
 
@@ -103,6 +103,20 @@
           font-size: 16px;
           display: block;
         }
+
+        .title{
+          font-size: 16px;
+          font-weight: 600;
+          color: #000000;
+        }
+
+        .subtitle{
+          font-size: 14px;
+          font-weight: 600;
+          color: #747474;
+          padding: 0 40px;
+          margin-top: 5px;
+        }
       </style>
     </head>
     <body>
@@ -117,10 +131,7 @@
       </div>
       <div class="message">
         <span class="img-container">
-          Launching Awesomeness!
-          <br />
-          Do not close the app!
-        </span>
-      </div>
+        <span class="title">Migrating Database</span>
+        <span class="subtitle">This may take a while. Please don't close the app!</span>
     </body>
 </html>
diff --git a/email_composer/src/lang/de.json b/email_composer/src/lang/de.json
@@ -51,9 +51,9 @@
         "suffix": "."
       }
     },
-    "encrypting": {
-      "name": "Verschlüsselungsfehler",
-      "description": "Beim Verschlüsseln der Nachricht ist ein Fehler aufgetreten.\nCode: "
+    "serverError": {
+      "name": "Server Error",
+      "description": "An error occurred while sending your email.\nCode: "
     },
     "nonExistingUsers": {
       "name": "Nicht existierende Benutzer",
@@ -84,7 +84,7 @@
       "description": "Verbindung zum Server kann nicht hergestellt werden"
     },
     "unauthorized": {
-      "name": "Verschlüsselungsfehler",
+      "name": "Server Error",
       "description": "Bei Ihrer Anfrage ist ein Fehler aufgetreten. \n Bitte versuche es erneut"
     },
     "uploadFailed": {
diff --git a/email_composer/src/lang/en.json b/email_composer/src/lang/en.json
@@ -51,9 +51,9 @@
         "suffix": "."
       }
     },
-    "encrypting": {
-      "name": "Encrypting error",
-      "description": "An error occurred while encrypting message.\nCode: "
+    "serverError": {
+      "name": "Server error",
+      "description": "An error occurred while sending your email.\nCode: "
     },
     "nonExistingUsers": {
       "name": "Non existing users",
@@ -84,7 +84,7 @@
       "description": "Unable to connect to server"
     },
     "unauthorized": {
-      "name": "Encrypting error",
+      "name": "Server Error",
       "description": "An error occurred in your request.\nPlease try again"
     },
     "uploadFailed": {
diff --git a/email_composer/src/lang/es.json b/email_composer/src/lang/es.json
@@ -51,9 +51,9 @@
         "suffix": " por archivos."
       }
     },
-    "encrypting": {
-      "name": "Error de encriptación",
-      "description": "Ha ocurrido un error durante el proceso de encriptación del mensaje.\nCódigo: "
+    "serverError": {
+      "name": "Error en el servidor",
+      "description": "Ha ocurrido un error durante el proceso de envío del correo.\nCódigo: "
     },
     "nonExistingUsers": {
       "name": "Usuarios no existentes",
@@ -84,7 +84,7 @@
       "description": "No se ha podido establecer una conexión con el servidor."
     },
     "unauthorized": {
-      "name": "Error de encriptación",
+      "name": "Error en el servidor",
       "description": "Ha ocurrido un error en tu solicitud.\nPor favor intenta de nuevo"
     },
     "uploadFailed": {
diff --git a/email_composer/src/lang/fr.json b/email_composer/src/lang/fr.json
@@ -51,9 +51,9 @@
         "suffix": "."
       }
     },
-    "encrypting": {
-      "name": "Erreur de chiffrement",
-      "description": "Une erreur s'est produite lors du chiffrement du message.\nCode: "
+    "serverError": {
+      "name": "Server Error",
+      "description": "An error occurred while sending your email.\nCode: "
     },
     "nonExistingUsers": {
       "name": "Utilisateurs non existants",
@@ -84,7 +84,7 @@
       "description": "Impossible de se connecter au serveur"
     },
     "unauthorized": {
-      "name": "Erreur de chiffrement",
+      "name": "Server Error",
       "description": "Une erreur est survenue dans votre requête.\nVeuillez réessayer"
     },
     "uploadFailed": {
diff --git a/email_composer/src/lang/ru.json b/email_composer/src/lang/ru.json
@@ -51,9 +51,9 @@
         "suffix": "."
       }
     },
-    "encrypting": {
-      "name": "Ошибка шифрования",
-      "description": "Во время шифрования сообщения произошла ошибка.\nКод:"
+    "serverError": {
+      "name": "Server Error",
+      "description": "An error occurred while sending your email.\nCode: "
     },
     "nonExistingUsers": {
       "name": "Несуществующие пользователи",
@@ -84,7 +84,7 @@
       "description": "Не удалось подключиться к серверу"
     },
     "unauthorized": {
-      "name": "Ошибка шифрования",
+      "name": "Server Error",
       "description": "При обработке вашего запроса произошла ошибка.\nПожалуйста, повторите попытку"
     },
     "uploadFailed": {
diff --git a/email_composer/src/libs/signal.js b/email_composer/src/libs/signal.js
@@ -267,9 +267,9 @@ const encryptPostEmail = async ({
     throw new CustomError(tooManyRequestErrorMessage);
   } else if (res.status !== 200) {
     throw new CustomError({
-      name: string.errors.encrypting.name,
-      description:
-        string.errors.encrypting.description + `${res.status || 'Unknown'}`
+      name: string.errors.serverError.name,
+      description: `${string.errors.serverError.description}${res.status ||
+        'Unknown'} Message: ${res.text || 'Unknown'}`
     });
   }
   return res;
diff --git a/email_mailbox/src/components/HeaderMain.js b/email_mailbox/src/components/HeaderMain.js
@@ -24,7 +24,7 @@ const HeaderMain = props => (
     />
     <ProfileShortCut
       avatarTimestamp={props.avatarTimestamp}
-      onClickSettings={props.onClickSection}
+      openSettings={props.openSettings}
       openLogin={props.openLogin}
       onUpdateApp={props.onUpdateApp}
     />
@@ -39,11 +39,11 @@ HeaderMain.propTypes = {
   isHiddenMenuSearchHints: PropTypes.bool,
   isHiddenMenuSearchOptions: PropTypes.bool,
   isLoadingSearch: PropTypes.bool,
-  onClickSection: PropTypes.func,
   onClearSearchInput: PropTypes.func,
   onClickSearch: PropTypes.func,
   onSearchSelectThread: PropTypes.func,
   openLogin: PropTypes.func,
+  openSettings: PropTypes.func,
   onToggleMenuSearchHints: PropTypes.func,
   onToggleMenuSearchOptions: PropTypes.func,
   onTriggerSearch: PropTypes.func,
diff --git a/email_mailbox/src/components/PanelWrapper.js b/email_mailbox/src/components/PanelWrapper.js
@@ -214,16 +214,25 @@ class PanelWrapper extends Component {
     });
   };
 
-  handleUpdateApp = async ({ mailbox, accountId, recipientId, threadId }) => {
+  handleUpdateApp = async ({ accountId, recipientId, threadId }) => {
     this.setState({
       isHiddenMailboxPopup: false,
       mailboxPopupType: MAILBOX_POPUP_TYPES.CHANGE_ACCOUNT
     });
-    const mailboxSelected = mailbox ||
-      this.state.sectionSelected.params.mailboxSelected || {
-        id: 1,
-        text: 'Inbox'
+    const defaultMailboxSelected = {
+      id: 1,
+      text: 'Inbox'
+    };
+    const mailboxSelected =
+      this.state.sectionSelected.params.mailboxSelected ||
+      defaultMailboxSelected;
+    if (!this.state.sectionSelected.params.mailboxSelected) {
+      const type = SectionType.MAILBOX;
+      const params = {
+        mailboxSelected: defaultMailboxSelected
       };
+      this.handleClickSection(type, params);
+    }
     await this.props.onUpdateAccountApp({
       mailboxSelected,
       accountId,
@@ -232,10 +241,7 @@ class PanelWrapper extends Component {
     if (threadId) {
       const threadType = SectionType.THREAD;
       const openThreadParams = {
-        mailboxSelected: {
-          id: 1,
-          text: 'Inbox'
-        },
+        mailboxSelected: defaultMailboxSelected,
         threadIdSelected: threadId
       };
       this.handleClickSection(threadType, openThreadParams);
diff --git a/email_mailbox/src/components/ProfilePreview.js b/email_mailbox/src/components/ProfilePreview.js
@@ -18,10 +18,14 @@ const ProfilePreview = props => (
       ))}
     </ul>
     <div className="cptx-profile-preview-controls">
-      <button className="button-b" onClick={() => props.onClickAddAccount()}>
-        <i className="icon-plus" />
-        <span>{string.header.add_account}</span>
-      </button>
+      {props.accountsLimitReached ? (
+        ''
+      ) : (
+        <button className="button-b" onClick={() => props.onClickAddAccount()}>
+          <i className="icon-plus" />
+          <span>{string.header.add_account}</span>
+        </button>
+      )}
       <button className="button-b" onClick={() => props.onClickSettings()}>
         <i className="icon-settings" />
         <span>{string.sidebar.settings}</span>
@@ -67,6 +71,7 @@ const ProfileItem = ({ account, timestamp, onClick }) => {
 ProfilePreview.propTypes = {
   avatarTimestamp: PropTypes.number,
   avatarUrl: PropTypes.string,
+  accountsLimitReached: PropTypes.bool,
   accounts: PropTypes.array,
   onClickAddAccount: PropTypes.func,
   onClickItemAccount: PropTypes.func,
diff --git a/email_mailbox/src/components/ProfileShortCut.js b/email_mailbox/src/components/ProfileShortCut.js
@@ -30,6 +30,7 @@ const ProfileShortCut = props => (
       </div>
     )}
     <MenuProfilePreview
+      accountsLimitReached={props.accountsLimitReached}
       accounts={props.accounts}
       avatarTimestamp={props.avatarTimestamp}
       arrowPosition={MenuType.TOP_RIGHT}
@@ -48,6 +49,7 @@ ProfileShortCut.propTypes = {
   avatarUrl: PropTypes.string,
   badgeAccount: PropTypes.bool,
   letters: PropTypes.string,
+  accountsLimitReached: PropTypes.bool,
   accounts: PropTypes.array,
   isHiddenMenuProfilePreview: PropTypes.bool,
   onClickAddAccount: PropTypes.func,
diff --git a/email_mailbox/src/components/ProfileShortCutWrapper.js b/email_mailbox/src/components/ProfileShortCutWrapper.js
@@ -36,7 +36,7 @@ class ProfileShortCutWrapper extends Component {
     this.setState({
       isHiddenMenuProfilePreview: true
     });
-    this.props.onClickSettings();
+    this.props.openSettings();
   };
 
   handleClickAddAccount = () => {
@@ -64,7 +64,8 @@ ProfileShortCutWrapper.propTypes = {
   onClickSettings: PropTypes.func,
   avatarTimestamp: PropTypes.number,
   onUpdateApp: PropTypes.func,
-  openLogin: PropTypes.func
+  openLogin: PropTypes.func,
+  openSettings: PropTypes.func
 };
 
 export default ProfileShortCutWrapper;
diff --git a/email_mailbox/src/components/profilepreview.scss b/email_mailbox/src/components/profilepreview.scss
@@ -137,10 +137,6 @@
       height: 40px;
       justify-content: center;
 
-      i{
-        margin-right: 3px;
-      }
-
       span{
         font-weight: 600;
       }
@@ -158,6 +154,7 @@
       }
       :nth-child(2) {
         padding-right: 10px;
+        padding-left: 4px;
       }
     }
   }
diff --git a/email_mailbox/src/containers/HeaderMain.js b/email_mailbox/src/containers/HeaderMain.js
@@ -70,6 +70,10 @@ const mapDispatchToProps = (dispatch, ownProps) => {
     },
     openLogin: () => {
       openLoginWindow();
+    },
+    openSettings: () => {
+      const type = SectionType.SETTINGS;
+      ownProps.onClickSection(type);
     }
   };
 };
diff --git a/email_mailbox/src/containers/ProfileShortCut.js b/email_mailbox/src/containers/ProfileShortCut.js
@@ -11,11 +11,16 @@ const defineBadgeAccount = accounts => {
 
 const mapStateToProps = state => {
   const accounts = getAllAccounts(state);
+  const easterEgg = accounts.some(account => account.name === 'Tinaquera');
   const accountsLimitReached = accounts.length >= ADDED_ACCOUNTS_LIMIT;
   const badgeAccount = defineBadgeAccount(accounts);
   return {
     accounts,
-    accountsLimitReached,
+    accountsLimitReached: accountsLimitReached
+      ? easterEgg
+        ? false
+        : true
+      : false,
     badgeAccount
   };
 };
diff --git a/email_mailbox/src/containers/SettingBlockProfile.js b/email_mailbox/src/containers/SettingBlockProfile.js
diff --git a/email_mailbox/src/containers/Settings.js b/email_mailbox/src/containers/Settings.js
diff --git a/email_mailbox/src/utils/electronEventInterface.js b/email_mailbox/src/utils/electronEventInterface.js
