maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 05:00:43 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #861 from sharetribe/initial-message-blink

Browse source 
Fix clearing tx initial message before the page change is made
This commit is contained in:
Hannu Lyytikäinen 2018-07-09 15:43:50 +03:00 • committed by GitHub
commit 7ada1d9e53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern:
## Upcoming version
* [fix] Fix initial message input clearing too early in checkout page.
[#861](https://github.com/sharetribe/flex-template-web/pull/861)
* [fix] Fix setting Topbar search input initial value.
[#857](https://github.com/sharetribe/flex-template-web/pull/857)

9
src/forms/StripePaymentForm/StripePaymentForm.js
View file

@ -113,9 +113,6 @@ class StripePaymentForm extends Component {
}
});
}
componentWillReceiveProps() {
this.setState(initialState);
}
componentWillUnmount() {
if (this.card) {
this.card.removeEventListener('change', this.handleCardValueChange);
@ -202,7 +199,7 @@ class StripePaymentForm extends Component {
const classes = classNames(rootClassName || css.root, className);
const cardClasses = classNames(css.card, {
[css.cardSuccess]: this.state.cardValueValid,
[css.cardError]: this.state.error,
[css.cardError]: this.state.error && !submitInProgress,
});
const messagePlaceholder = intl.formatMessage(
@ -243,7 +240,9 @@ class StripePaymentForm extends Component {
this.cardContainer = el;
}}
/>
{this.state.error ? <span style={{ color: 'red' }}>{this.state.error}</span> : null}
{this.state.error && !submitInProgress ? (
<span style={{ color: 'red' }}>{this.state.error}</span>
) : null}
<h3 className={css.messageHeading}>
<FormattedMessage id="StripePaymentForm.messageHeading" />
</h3>