enhancement(TaxForms): allow country editing for W9 (#10524)

opencollective · Jul 5, 2024 · fcaab20 · fcaab20
1 parent d263bb2
commit fcaab20
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/components/StyledInputLocation.js b/components/StyledInputLocation.js
@@ -32,7 +32,6 @@ const StyledInputLocation = ({
   errors,
   prefix,
   required,
-  disableCountryChange,
   onLoadSuccess,
   useStructuredForFallback,
 }) => {
@@ -55,7 +54,6 @@ const StyledInputLocation = ({
           <InputTypeCountry
             {...inputProps}
             inputId={id}
-            disabled={disableCountryChange}
             value={location?.country}
             autoDetect={autoDetectCountry}
             onChange={country => {
@@ -133,7 +131,6 @@ StyledInputLocation.propTypes = {
   onChange: PropTypes.func,
   onLoadSuccess: PropTypes.func,
   autoDetectCountry: PropTypes.bool,
-  disableCountryChange: PropTypes.bool,
   required: PropTypes.bool,
   labelFontWeight: PropTypes.any,
   labelFontSize: PropTypes.any,

diff --git a/components/dashboard/sections/tax-information/W9Form.tsx b/components/dashboard/sections/tax-information/W9Form.tsx
@@ -62,8 +62,7 @@ export const getInitialValuesForW9 = (
   return merge(generateInitialValuesFromSchema(schema), {
     signer,
     accountNumbers: `@${account.slug} (#${account.id})`,
-    location:
-      account.location?.country === 'US' ? pick(account.location, ['country', 'structured']) : { country: 'US' },
+    location: { country: 'US', ...pick(account.location, ['country', 'structured']) },
     ...(baseValues.submitterType === SubmitterType.Individual
       ? { federalTaxClassification: FederalTaxClassification.Individual }
       : { federalTaxClassification: null }),
@@ -97,7 +96,6 @@ export const W9TaxFormFields = ({ formik }: { formik: FormikProps<W9TaxFormValue
             onChange={value => setFieldValue(field.name, value)}
             labelFontWeight="normal"
             autoDetectCountry={false}
-            disableCountryChange
             errors={field.error}
             useStructuredForFallback={true}
             required={field.required}

diff --git a/components/dashboard/sections/tax-information/index.tsx b/components/dashboard/sections/tax-information/index.tsx
@@ -74,7 +74,7 @@ const PendingTaxFormView = ({
           <FormattedMessage defaultMessage="You will receive an email with a link to fill out a form." id="V2vf/v" />
         </p>
       ) : (
-        <Button size="lg" onClick={() => setHasTaxInformationForm(true)}>
+        <Button onClick={() => setHasTaxInformationForm(true)}>
           <FilePenLine className="mr-1" size={16} />
           <FormattedMessage defaultMessage="Fill Tax Information" id="TxJpk1" />
         </Button>