Browse Source

Merge pull request #175 from Empact/fix/amount-error-msg

Move PayForm amount error message below the field
renovate/lint-staged-8.x
JimmyMow 7 years ago
committed by GitHub
parent
commit
cb6e1b5bd1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      app/components/Form/PayForm.js
  2. 17
      app/components/Form/PayForm.scss

12
app/components/Form/PayForm.js

@ -49,11 +49,6 @@ class PayForm extends Component {
{showPayLoadingScreen && <LoadingBolt />} {showPayLoadingScreen && <LoadingBolt />}
<section className={`${styles.amountContainer} ${isLn ? styles.ln : ''} ${showErrors.amount && styles.error}`}> <section className={`${styles.amountContainer} ${isLn ? styles.ln : ''} ${showErrors.amount && styles.error}`}>
<section className={`${styles.amountError} ${showErrors.amount && styles.active}`}>
{showErrors.amount &&
<span>{errors.amount}</span>
}
</section>
<label htmlFor='amount'> <label htmlFor='amount'>
<CurrencyIcon currency={currency} crypto={crypto} /> <CurrencyIcon currency={currency} crypto={crypto} />
</label> </label>
@ -75,6 +70,11 @@ class PayForm extends Component {
readOnly={isLn} readOnly={isLn}
/> />
</section> </section>
<section className={`${styles.errorMessage} ${showErrors.amount && styles.active}`}>
{showErrors.amount &&
<span>{errors.amount}</span>
}
</section>
<div className={styles.inputContainer}> <div className={styles.inputContainer}>
<div className={styles.info}> <div className={styles.info}>
<span>{inputCaption}</span> <span>{inputCaption}</span>
@ -103,7 +103,7 @@ class PayForm extends Component {
id='paymentRequest' id='paymentRequest'
/> />
</section> </section>
<section className={`${styles.payInputError} ${showErrors.payInput && styles.active}`}> <section className={`${styles.errorMessage} ${showErrors.payInput && styles.active}`}>
{showErrors.payInput && {showErrors.payInput &&
<span>{errors.payInput}</span> <span>{errors.payInput}</span>
} }

17
app/components/Form/PayForm.scss

@ -14,8 +14,6 @@
color: $main; color: $main;
display: flex; display: flex;
justify-content: center; justify-content: center;
min-height: 120px;
margin-bottom: 20px;
min-height: 175px; min-height: 175px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
@ -27,19 +25,6 @@
border-color: $red; border-color: $red;
} }
.amountError {
position: absolute;
top: 0;
right: 0;
opacity: 0;
color: $red;
transition: all 0.25s ease;
&.active {
opacity: 1;
}
}
label, input[type=number], input[type=text] { label, input[type=number], input[type=text] {
color: inherit; color: inherit;
display: inline-block; display: inline-block;
@ -136,7 +121,7 @@
} }
} }
.payInputError { .errorMessage {
margin: 10px 0; margin: 10px 0;
min-height: 20px; min-height: 20px;
color: $red; color: $red;

Loading…
Cancel
Save