From a65f808f88711acc7647b2ba8a5b33b82e45163d Mon Sep 17 00:00:00 2001 From: Kimmo Puputti Date: Wed, 5 Apr 2017 11:26:28 +0300 Subject: [PATCH] Show bank account field if Stripe not connected yet --- src/containers/EditListingForm/EditListingForm.example.js | 2 +- src/containers/EditListingForm/EditListingForm.js | 5 ++++- src/containers/EditListingForm/EditListingForm.test.js | 1 + src/containers/EditListingPage/EditListingPage.js | 6 ++++-- .../__snapshots__/EditListingPage.test.js.snap | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/containers/EditListingForm/EditListingForm.example.js b/src/containers/EditListingForm/EditListingForm.example.js index 40c0c361..ad22e0a7 100644 --- a/src/containers/EditListingForm/EditListingForm.example.js +++ b/src/containers/EditListingForm/EditListingForm.example.js @@ -4,7 +4,7 @@ import EditListingForm from './EditListingForm'; export const Empty = { component: EditListingForm, props: { - images: [], + stripeConnected: false, onImageUpload: values => { console.log(`onImageUpload with id (${values.id}) and file name (${values.file.name})`); }, diff --git a/src/containers/EditListingForm/EditListingForm.js b/src/containers/EditListingForm/EditListingForm.js index 16dc3871..82f0798a 100644 --- a/src/containers/EditListingForm/EditListingForm.js +++ b/src/containers/EditListingForm/EditListingForm.js @@ -160,6 +160,7 @@ export class EditListingFormComponent extends Component { saveActionMsg = 'Save listing', submitting, selectedPlace, + stripeConnected, } = this.props; const titleRequiredMessage = intl.formatMessage({ id: 'EditListingForm.titleRequired' }); const maxLengthMessage = intl.formatMessage( @@ -186,6 +187,7 @@ export class EditListingFormComponent extends Component { const pricePlaceholderMessage = intl.formatMessage({ id: 'EditListingForm.pricePlaceholder' }); const country = selectedPlace ? selectedPlace.country : null; + const showBankAccountField = !stripeConnected && country; const currency = config.currencyConfig.currency; return ( @@ -253,7 +255,7 @@ export class EditListingFormComponent extends Component { validate={[required(descriptionRequiredMessage)]} /> - {country + {showBankAccountField ? { onImageUpload={v => v} onSubmit={v => v} onUpdateImageOrder={v => v} + stripeConnected={false} /> ); expect(tree).toMatchSnapshot(); diff --git a/src/containers/EditListingPage/EditListingPage.js b/src/containers/EditListingPage/EditListingPage.js index 2d595cfb..2513692f 100644 --- a/src/containers/EditListingPage/EditListingPage.js +++ b/src/containers/EditListingPage/EditListingPage.js @@ -87,8 +87,9 @@ export class EditListingPageComponent extends Component { ? intl.formatMessage({ id: 'EditListingPage.titleCreateListing' }) : intl.formatMessage({ id: 'EditListingPage.titleEditListing' }); - // eslint-disable-next-line no-console - console.log('current user:', currentUser); + const stripeConnected = currentUser && currentUser.attributes + ? currentUser.attributes.stripeConnected + : false; return ( @@ -100,6 +101,7 @@ export class EditListingPageComponent extends Component { onSubmit={onSubmit(onCreateListing)} onUpdateImageOrder={onUpdateImageOrder} saveActionMsg={saveActionMsg} + stripeConnected={stripeConnected} /> ); diff --git a/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap b/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap index e8583f92..092bf07a 100644 --- a/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap +++ b/src/containers/EditListingPage/__snapshots__/EditListingPage.test.js.snap @@ -7,6 +7,7 @@ exports[`EditListingPageComponent matches snapshot 1`] = ` onImageUpload={[Function]} onSubmit={[Function]} onUpdateImageOrder={[Function]} - saveActionMsg="Create listing" /> + saveActionMsg="Create listing" + stripeConnected={false} /> `;