not need to enter password if not validated recovery email

Author: javiteri95

email_composer/src/containers/Composer.js

@@ -393,7 +393,7 @@ class ComposerWrapper extends Component {
 
   handleConfirmVerifyRecoveryEmail = async () => {
     const recoveryEmail = this.state.recoveryEmail;
-    if (recoveryEmail !== '') {
+    if (recoveryEmail === '') {
       this.saveTemporalDraft();
       sendEventToMailbox('open-recovery-email-mailbox', undefined);
       this.setState({

email_mailbox/src/components/ChangeRecoveryEmailPopup.js

@@ -31,30 +31,7 @@ const ChangeRecoveryEmailPopup = props => {
           hasError={props.recoveryEmailPopupInputEmail.hasError}
           errorMessage={props.recoveryEmailPopupInputEmail.errorMessage}
         />
-        <div className="popup-paragraph">
-          <p>{passwordText}</p>
-        </div>
-        <ChangePasswordPopupInput
-          name={props.recoveryEmailPopupInputPassword.name}
-          type={props.recoveryEmailPopupInputPassword.type}
-          value={props.recoveryEmailPopupInputPassword.value}
-          icon={props.recoveryEmailPopupInputPassword.icon}
-          placeholder={
-            string.popups.change_recovery_email.input.password.placeholder
-          }
-          onChangeValue={props.onChangeInputValueOnChangeRecoveryEmailPopup}
-          onChangeType={props.onClickChangeRecoveryEmailInputType}
-          hasError={props.recoveryEmailPopupInputPassword.hasError}
-          errorMessage={props.recoveryEmailPopupInputPassword.errorMessage}
-        />
-        <div className="forgot-password-link">
-          <button
-            className="button button-b"
-            onClick={props.onClickForgotPasswordLink}
-          >
-            {string.popups.change_recovery_email.input.password.button}
-          </button>
-        </div>
+        {renderPasswordIfRecoveryEmailIsConfirmed(props)}
       </div>
       <div className="popup-paragraph change-recovery-email-note">
         <p>
@@ -98,6 +75,39 @@ const ChangePasswordPopupInput = ({
   </div>
 );
 
+const renderPasswordIfRecoveryEmailIsConfirmed = props => {
+  if (props.recoveryEmailConfirmed) {
+    return (
+      <div>
+        <div className="popup-paragraph">
+          <p>{passwordText}</p>
+        </div>
+        <ChangePasswordPopupInput
+          name={props.recoveryEmailPopupInputPassword.name}
+          type={props.recoveryEmailPopupInputPassword.type}
+          value={props.recoveryEmailPopupInputPassword.value}
+          icon={props.recoveryEmailPopupInputPassword.icon}
+          placeholder={
+            string.popups.change_recovery_email.input.password.placeholder
+          }
+          onChangeValue={props.onChangeInputValueOnChangeRecoveryEmailPopup}
+          onChangeType={props.onClickChangeRecoveryEmailInputType}
+          hasError={props.recoveryEmailPopupInputPassword.hasError}
+          errorMessage={props.recoveryEmailPopupInputPassword.errorMessage}
+        />
+        <div className="forgot-password-link">
+          <button
+            className="button button-b"
+            onClick={props.onClickForgotPasswordLink}
+          >
+            {string.popups.change_recovery_email.input.password.button}
+          </button>
+        </div>
+      </div>
+    );
+  }
+};
+
 const InputErrorMessage = ({ hasError, errorMessage, value }) => {
   const shouldRenderMessage =
     hasError && errorMessage.length > 0 && value.length > 0;

email_mailbox/src/components/SettingAccount.js

@@ -94,6 +94,7 @@ const SettingAccount = props => (
       onConfirmDeleteAlias={props.onConfirmDeleteAlias}
       onConfirmDeleteCustomDomain={props.onConfirmDeleteCustomDomain}
       onShowSettingsPopup={props.onShowSettingsPopup}
+      recoveryEmailConfirmed={props.recoveryEmailConfirmed}
       deleteAliasParams={props.deleteAliasParams}
       deleteCustomDomainsParams={props.deleteCustomDomainsParams}
       setReplyToPopupParams={props.setReplyToPopupParams}
@@ -444,6 +445,7 @@ SettingAccount.propTypes = {
   onSelectBackupFolder: PropTypes.func,
   onSetExportBackupPassword: PropTypes.func,
   onShowSettingsPopup: PropTypes.func,
+  recoveryEmailConfirmed: PropTypes.bool,
   setReplyToPopupParams: PropTypes.object,
   settingsPopupType: PropTypes.string,
   upgradeToPlusType: PropTypes.string

email_mailbox/src/components/SettingAccountWrapper.js

@@ -1274,9 +1274,6 @@ class SettingAccountWrapper extends Component {
           inputName = 'recoveryEmailInput';
         }
       }
-
-      errorMessage = 'This is the current recovery email';
-      inputName = 'recoveryEmailInput';
     }
     const changeRecoveryEmailPopupParams = {
       ...this.state.changeRecoveryEmailPopupParams,

email_mailbox/src/lang/de.json

@@ -539,6 +539,7 @@
       },
       "errors": {
         "wrong_password": "Wrong password",
+        "password_must_exist": "Password must be enter",
         "invalid_email": "Invalid email",
         "criptext_email_not_confirmed": "This address has no verified recovery email.",
         "email_max_reached": "This address has already been used {0} times.",

email_mailbox/src/lang/en.json

@@ -546,6 +546,7 @@
       },
       "errors": {
         "wrong_password": "Wrong password",
+        "password_must_exist": "Password must be enter",
         "invalid_email": "Invalid email",
         "criptext_email_not_confirmed": "This address has no verified recovery email.",
         "email_max_reached": "This address has already been used {0} times.",

email_mailbox/src/lang/es.json

@@ -546,6 +546,7 @@
       },
       "errors": {
         "wrong_password": "Contraseña incorrecta",
+        "password_must_exist": "La contraseña debe ser ingresada",
         "invalid_email": "Dirección de correo inválida",
         "criptext_email_not_confirmed": "Esta dirección de correo no esta confirmada",
         "email_max_reached": "Esta dirección de correo ya ha sido usada {0} veces.",

email_mailbox/src/lang/fr.json

@@ -539,6 +539,7 @@
       },
       "errors": {
         "wrong_password": "Wrong password",
+        "password_must_exist": "Password must be enter",
         "invalid_email": "Invalid email",
         "criptext_email_not_confirmed": "This address has no verified recovery email.",
         "email_max_reached": "This address has already been used {0} times.",

email_mailbox/src/lang/ru.json

@@ -539,6 +539,7 @@
       },
       "errors": {
         "wrong_password": "Wrong password",
+        "password_must_exist": "Password must be enter",
         "invalid_email": "Invalid email",
         "criptext_email_not_confirmed": "This address has no verified recovery email.",
         "email_max_reached": "This address has already been used {0} times.",