Settings

email_mailbox/src/app.scss

@@ -179,6 +179,90 @@ TABLE OF CONTENTS
   font-style: italic;
 }
 
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Light.ttf) format("truetype");
+  font-weight: 200;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-LightItalic.ttf) format("truetype");
+  font-weight: 200;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
+  font-weight: 300;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Medium.ttf) format("truetype");
+  font-weight: 600;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-MediumItalic.ttf) format("truetype");
+  font-weight: 600;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Bold.ttf) format("truetype");
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-BoldItalic.ttf) format("truetype");
+  font-weight: 700;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Black.ttf) format("truetype");
+  font-weight: 800;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Roboto";
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-BlackItalic.ttf) format("truetype");
+  font-weight: 800;
+  font-style: italic;
+}
+
 /* 1.2.- FONTS: Icon
    ----------------------------- */
 @font-face {
@@ -415,7 +499,7 @@ TABLE OF CONTENTS
 /* 2.- CONTENT
    ----------------------------- */
 *{
-  font-family: NunitoSans;
+  font-family: NunitoSans, Roboto;
 }
 
 html{
@@ -882,8 +966,9 @@ button{
    ----------------------------- */
 .labels-tooltip{
   border-radius: 3px;
-  font-weight: normal;
+  font-family: NunitoSans;
   font-size: 12px;
+  font-weight: normal;
 }
 
 .__floater__open {

email_mailbox/src/components/HeaderMainWrapper.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import HeaderMain from './HeaderMain';
+import { LabelType } from '../utils/electronInterface';
 
 class HeaderMainWrapper extends Component {
   constructor(props) {
@@ -39,7 +40,9 @@ class HeaderMainWrapper extends Component {
   }
 
   componentDidMount() {
-    const text = this.props.sectionSelected.params.searchParams.text;
+    const text = this.props.sectionSelected.params.searchParams
+      ? this.props.sectionSelected.params.searchParams.text
+      : false;
     const stateText = this.state.searchParams.text;
     if (text && !stateText) {
       this.setState(state => {
@@ -56,10 +59,9 @@ class HeaderMainWrapper extends Component {
       return this.handleClearSearchInput();
     }
     if (!prevProps.sectionSelected) return;
-    const searchMailboxId = -2;
     const prevMailboxId = prevProps.sectionSelected.params.mailboxSelected.id;
     const nextMailboxId = this.props.sectionSelected.params.mailboxSelected.id;
-    const prevMailboxIsSearch = prevMailboxId === searchMailboxId;
+    const prevMailboxIsSearch = prevMailboxId === LabelType.search.id;
     const nextMailboxIsDifferent = prevMailboxId !== nextMailboxId;
     if (prevMailboxIsSearch && nextMailboxIsDifferent) {
       return this.handleClearSearchInput();

email_mailbox/src/components/SettingAccount.js

@@ -69,6 +69,7 @@ const SettingAccount = props => (
       onClickChangeRecoveryEmailInputType={
         props.onClickChangeRecoveryEmailInputType
       }
+      onClickForgotPasswordLink={props.onClickForgotPasswordLink}
       onClosePopup={props.onClosePopup}
       onConfirmChangePassword={props.onConfirmChangePassword}
       onConfirmChangeRecoveryEmail={props.onConfirmChangeRecoveryEmail}
@@ -351,6 +352,7 @@ SettingAccount.propTypes = {
   onChangeInputValueOnSetReplyTo: PropTypes.func,
   onClearPopupParams: PropTypes.func,
   onClickChangeRecoveryEmailInputType: PropTypes.func,
+  onClickForgotPasswordLink: PropTypes.func,
   onClosePopup: PropTypes.func,
   onConfirmChangePassword: PropTypes.func,
   onConfirmChangeRecoveryEmail: PropTypes.func,

email_mailbox/src/components/SettingBlockProfile.js

@@ -15,7 +15,7 @@ const SettingBlockProfile = props => (
     {renderBlockEmail(props)}
     {renderBlockName(props)}
     {renderBlockSignature(props)}
-    {renderBlockSignFooter(props)}
+    {!myAccount.recipientId.includes('@') && renderBlockSignFooter(props)}
   </div>
 );
 

email_mailbox/src/components/SideBar.js

@@ -111,7 +111,9 @@ const renderLabels = (showLabels, labels, mailboxSelected, onClickSection) => (
   <ul>
     {showLabels &&
       labels.map((label, key) => {
-        const selected = label.text === mailboxSelected.text;
+        const selected = mailboxSelected
+          ? label.text === mailboxSelected.text
+          : false;
         return (
           <SideBarLabelItem
             key={key}

email_mailbox/src/components/buttoncircle.scss

@@ -2,6 +2,7 @@
 
 .button-circle{
   color: #ffffff;
+  line-height: normal;
   margin: 0 5px;
   width: 29px;
   height: 29px;

email_mailbox/src/components/buttonunsend.scss

@@ -8,6 +8,8 @@
   text-transform: uppercase;
 
   div{
+    background-color: transparent;
+
     i{
       font-size: 15px;
       top: 2px;
@@ -17,6 +19,7 @@
     }
 
     span{
+      background-color: transparent;
       font-size: 11px;
       font-weight: 400;
       position: relative;

email_mailbox/src/components/email.scss

@@ -302,6 +302,7 @@
     display: flex;
 
     i{
+      background-color: transparent;
       color: #d5d5d5;
 
       &.icon-attach{

email_mailbox/src/components/settingblockprofile.scss

@@ -174,6 +174,10 @@
         top: 3px;
       }
     }
+
+    &:last-child{
+      padding-bottom: 17px;
+    }
   }
 }
 

email_mailbox/src/containers/Settings.js

@@ -139,8 +139,12 @@ const mapDispatchToProps = dispatch => {
       dispatch(updateLabel(params));
     },
     onResetPassword: async () => {
-      const { recipientId } = myAccount;
-      const { status } = await resetPassword(recipientId);
+      const [recipientId, domain] = myAccount.recipientId.split('@');
+      const params = {
+        recipientId,
+        domain: domain || appDomain
+      };
+      const { status } = await resetPassword(params);
       if (status === 200) {
         sendResetPasswordSendLinkSuccessMessage();
         return;