Small changes to StripePaymentForm

sharetribe · May 21, 2019 · d0ae3db · d0ae3db
1 parent 8e1076a
commit d0ae3db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git a/src/containers/CheckoutPage/CheckoutPage.js b/src/containers/CheckoutPage/CheckoutPage.js
@@ -504,6 +504,11 @@ export class CheckoutPageComponent extends Component {
       );
     }
 
+    const userName =
+      currentUser && currentUser.attributes
+        ? `${currentUser.attributes.profile.firstName} ${currentUser.attributes.profile.lastName}`
+        : null;
+
     return (
       <Page {...pageProps}>
         {topbar}
@@ -554,7 +559,7 @@ export class CheckoutPageComponent extends Component {
                   errors={{
                     handleCardPaymentError,
                   }}
-                  currentUser={currentUser}
+                  initialValues={{ name: userName }}
                 />
               ) : null}
             </section>

diff --git a/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap b/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
@@ -88,34 +88,18 @@ exports[`CheckoutPage matches snapshot 1`] = `
       <section>
         <InjectIntl(StripePaymentForm)
           authorDisplayName="author display name"
-          currentUser={
-            Object {
-              "attributes": Object {
-                "banned": false,
-                "deleted": false,
-                "email": "[email protected]",
-                "emailVerified": true,
-                "profile": Object {
-                  "abbreviatedName": "currentUser abbreviated name",
-                  "displayName": "currentUser display name",
-                  "firstName": "currentUser first name",
-                  "lastName": "currentUser last name",
-                },
-              },
-              "id": UUID {
-                "_sdkType": "UUID",
-                "uuid": "currentUser",
-              },
-              "type": "currentUser",
-            }
-          }
           errors={
             Object {
               "handleCardPaymentError": undefined,
             }
           }
           formId="CheckoutPagePaymentForm"
           inProgress={false}
+          initialValues={
+            Object {
+              "name": "currentUser first name currentUser last name",
+            }
+          }
           onSubmit={[Function]}
           paymentInfo="CheckoutPage.paymentInfo"
           showInitialMessageInput={true}

diff --git a/src/forms/StripePaymentForm/StripePaymentAddress.js b/src/forms/StripePaymentForm/StripePaymentAddress.js
@@ -147,7 +147,7 @@ const StripePaymentAddress = props => {
 
       <FieldSelect
         id={`${fieldId}.country`}
-        name={`${fieldId}.country`}
+        name="country"
         disabled={disabled}
         className={css.selectCountry}
         label={countryLabel}

diff --git a/src/forms/StripePaymentForm/StripePaymentForm.js b/src/forms/StripePaymentForm/StripePaymentForm.js
@@ -306,20 +306,7 @@ class StripePaymentForm extends Component {
 
   render() {
     const { onSubmit, ...rest } = this.props;
-    const currentUser = this.props.currentUser;
-    const userName =
-      currentUser && currentUser.attributes
-        ? `${currentUser.attributes.profile.firstName} ${currentUser.attributes.profile.lastName}`
-        : null;
-
-    return (
-      <FinalForm
-        onSubmit={this.handleSubmit}
-        {...rest}
-        render={this.paymentForm}
-        initialValues={{ name: userName }}
-      />
-    );
+    return <FinalForm onSubmit={this.handleSubmit} {...rest} render={this.paymentForm} />;
   }
 }