diff --git a/packages/manager/.changeset/pr-10148-tech-stories-1707231054836.md b/packages/manager/.changeset/pr-10148-tech-stories-1707231054836.md new file mode 100644 index 00000000000..ea621e926f2 --- /dev/null +++ b/packages/manager/.changeset/pr-10148-tech-stories-1707231054836.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Tech Stories +--- + +Clean up `regionDropdown` feature flag ([#10148](https://github.com/linode/manager/pull/10148)) diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts index c622dda8443..c972cf17c3f 100644 --- a/packages/manager/src/featureFlags.ts +++ b/packages/manager/src/featureFlags.ts @@ -61,7 +61,6 @@ export interface Flags { promotionalOffers: PromotionalOffer[]; recharts: boolean; referralBannerText: ReferralBannerText; - regionDropdown: boolean; selfServeBetas: boolean; soldOutChips: boolean; taxBanner: TaxBanner; diff --git a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx index 88f7ea1501b..18421b988e0 100644 --- a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx @@ -9,7 +9,6 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel'; import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select'; import { Notice } from 'src/components/Notice/Notice'; import { TextField } from 'src/components/TextField'; -import { useFlags } from 'src/hooks/useFlags'; import { useAccount, useMutateAccount } from 'src/queries/account'; import { useNotificationsQuery } from 'src/queries/accountNotifications'; import { getErrorMap } from 'src/utilities/errorUtils'; @@ -28,7 +27,6 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => { const { error, isLoading, mutateAsync } = useMutateAccount(); const { data: notifications, refetch } = useNotificationsQuery(); const { classes } = useStyles(); - const flags = useFlags(); const emailRef = React.useRef(); const formik = useFormik({ @@ -241,15 +239,16 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => { onChange={(item) => formik.setFieldValue('country', item.value)} options={countryResults} placeholder="Select a Country" - required={flags.regionDropdown} + required /> - {flags.regionDropdown && - (formik.values.country === 'US' || formik.values.country == 'CA') ? ( + {formik.values.country === 'US' || formik.values.country == 'CA' ? ( { label={`${formik.values.country === 'US' ? 'State' : 'Province'}`} onChange={(item) => formik.setFieldValue('state', item.value)} options={filteredRegionResults} - required={flags.regionDropdown} + required /> ) : ( { name="state" onChange={formik.handleChange} placeholder="Enter region" - required={flags.regionDropdown} + required value={formik.values.state} /> )}