- move resetCodeSent mesage and hide button #1878

- fix props error
metasfresh · Aug 8, 2018 · a0eec3c · a0eec3c
1 parent e959535
commit a0eec3c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/src/assets/css/inputs.css b/src/assets/css/inputs.css
@@ -53,6 +53,10 @@ input {
     white-space: nowrap;
     overflow: hidden;
     margin: 0;
+
+    &.instruction-sent {
+        white-space: normal;
+    }
 }
 
 .form-group {

diff --git a/src/components/app/PasswordRecovery.js b/src/components/app/PasswordRecovery.js
@@ -161,7 +161,17 @@ class PasswordRecovery extends Component {
   };
 
   renderForgottenPasswordForm = () => {
-    const { pending, err } = this.state;
+    const { pending, err, resetEmailSent } = this.state;
+
+    if (resetEmailSent) {
+      return (
+        <div>
+          <div className="form-control-label instruction-sent">
+            {counterpart.translate('forgotPassword.resetCodeSent.caption')}
+          </div>
+        </div>
+      );
+    }
 
     return (
       <div>
@@ -238,21 +248,9 @@ class PasswordRecovery extends Component {
     const { token } = this.props;
     const { pending, resetEmailSent, avatarSrc, form } = this.state;
     const resetPassword = token ? true : false;
-    let buttonMessage = counterpart.translate(
-      'forgotPassword.changePassword.caption'
-    );
-
-    if (!resetPassword) {
-      if (resetEmailSent) {
-        buttonMessage = counterpart.translate(
-          'forgotPassword.resetCodeSent.caption'
-        );
-      } else {
-        buttonMessage = counterpart.translate(
-          'forgotPassword.sendResetCode.caption'
-        );
-      }
-    }
+    let buttonMessage = resetPassword
+      ? counterpart.translate('forgotPassword.changePassword.caption')
+      : counterpart.translate('forgotPassword.sendResetCode.caption');
 
     return (
       <div
@@ -279,15 +277,18 @@ class PasswordRecovery extends Component {
           {!resetEmailSent && resetPassword
             ? this.renderResetPasswordForm()
             : this.renderForgottenPasswordForm()}
-          <div className="mt-2">
-            <button
-              className="btn btn-sm btn-block btn-meta-success"
-              disabled={pending}
-              type="submit"
-            >
-              {buttonMessage}
-            </button>
-          </div>
+
+          {!resetEmailSent && (
+            <div className="mt-2">
+              <button
+                className="btn btn-sm btn-block btn-meta-success"
+                disabled={pending}
+                type="submit"
+              >
+                {buttonMessage}
+              </button>
+            </div>
+          )}
         </form>
       </div>
     );
@@ -298,7 +299,7 @@ PasswordRecovery.propTypes = {
   dispatch: PropTypes.func.isRequired,
   path: PropTypes.string.isRequired,
   token: PropTypes.string,
-  onResetOk: PropTypes.bool,
+  onResetOk: PropTypes.func,
 };
 
 export default connect()(PasswordRecovery);