(PC-32484)[PRO] fix: Adds forgotten feature flag to PC-30946 and PC-3…

…1468 !
pass-culture · Oct 18, 2024 · 38d699d · 38d699d
1 parent 686c38b
commit 38d699d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 31 deletions.
diff --git a/pro/src/pages/VenueSettings/VenueSettingsForm.tsx b/pro/src/pages/VenueSettings/VenueSettingsForm.tsx
@@ -14,6 +14,7 @@ import { resetAddressFields } from 'components/IndividualOfferForm/utils/resetAd
 import { RouteLeavingGuardIndividualOffer } from 'components/RouteLeavingGuardIndividualOffer/RouteLeavingGuardIndividualOffer'
 import { ScrollToFirstErrorAfterSubmit } from 'components/ScrollToFirstErrorAfterSubmit/ScrollToFirstErrorAfterSubmit'
 import { SelectOption } from 'custom_types/form'
+import { useActiveFeature } from 'hooks/useActiveFeature'
 import fullBackIcon from 'icons/full-back.svg'
 import fullNextIcon from 'icons/full-next.svg'
 import { ReimbursementFields } from 'pages/Offerers/Offerer/VenueV1/fields/ReimbursementFields/ReimbursementFields'
@@ -56,6 +57,8 @@ export const VenueSettingsForm = ({
   const [manuallySetAddress, , { setValue: setManuallySetAddress }] =
     useField('manuallySetAddress')
 
+  const isOfferAddressEnabled = useActiveFeature('WIP_ENABLE_OFFER_ADDRESS')
+
   const toggleManuallySetAddress = async () => {
     const isAddressManual = !manuallySetAddress.value
     await setManuallySetAddress(isAddressManual)
@@ -107,21 +110,27 @@ export const VenueSettingsForm = ({
                 <AddressSelect disabled={manuallySetAddress.value} />
               </FormLayout.Row>
 
-              <FormLayout.Row>
-                <Button
-                  variant={ButtonVariant.QUATERNARY}
-                  title="Renseignez l’adresse manuellement"
-                  icon={manuallySetAddress.value ? fullBackIcon : fullNextIcon}
-                  onClick={toggleManuallySetAddress}
-                >
-                  {manuallySetAddress.value ? (
-                    <>Revenir à la sélection automatique</>
-                  ) : (
-                    <>Vous ne trouvez pas votre adresse ?</>
-                  )}
-                </Button>
-              </FormLayout.Row>
-              {manuallySetAddress.value && <AddressManual />}
+              {isOfferAddressEnabled && (
+                <>
+                  <FormLayout.Row>
+                    <Button
+                      variant={ButtonVariant.QUATERNARY}
+                      title="Renseignez l’adresse manuellement"
+                      icon={
+                        manuallySetAddress.value ? fullBackIcon : fullNextIcon
+                      }
+                      onClick={toggleManuallySetAddress}
+                    >
+                      {manuallySetAddress.value ? (
+                        <>Revenir à la sélection automatique</>
+                      ) : (
+                        <>Vous ne trouvez pas votre adresse ?</>
+                      )}
+                    </Button>
+                  </FormLayout.Row>
+                  {manuallySetAddress.value && <AddressManual />}
+                </>
+              )}
             </>
           )}
         </FormLayout.Section>

diff --git a/pro/src/pages/VenueSettings/VenueSettingsScreen.tsx b/pro/src/pages/VenueSettings/VenueSettingsScreen.tsx
@@ -17,6 +17,7 @@ import { GET_VENUE_QUERY_KEY } from 'config/swrQueryKeys'
 import { Events } from 'core/FirebaseEvents/constants'
 import { PATCH_SUCCESS_MESSAGE } from 'core/shared/constants'
 import { SelectOption } from 'custom_types/form'
+import { useActiveFeature } from 'hooks/useActiveFeature'
 import { useCurrentUser } from 'hooks/useCurrentUser'
 import { useNotification } from 'hooks/useNotification'
 import fullBackIcon from 'icons/full-back.svg'
@@ -63,6 +64,8 @@ export const VenueSettingsScreen = ({
   const [isAddressChangeDialogOpen, setIsAddressChangeDialogOpen] =
     useState(false)
 
+  const isOfferAddressEnabled = useActiveFeature('WIP_ENABLE_OFFER_ADDRESS')
+
   const handleCancelWithdrawalDialog = () => {
     setShouldSendMail(false)
     formik.handleSubmit()
@@ -128,7 +131,7 @@ export const VenueSettingsScreen = ({
   const onSubmit = async (values: VenueSettingsFormValues) => {
     if (
       (values.isWithdrawalAppliedOnAllOffers && !handleWithdrawalDialog()) ||
-      !handleDialogAddressChange()
+      (!handleDialogAddressChange() && isOfferAddressEnabled)
     ) {
       return
     }
@@ -236,21 +239,23 @@ export const VenueSettingsScreen = ({
           title="Souhaitez-vous prévenir les bénéficiaires de la modification des modalités de retrait ?"
           open={isWithdrawalDialogOpen}
         />
-        <ConfirmDialog
-          cancelText="Annuler"
-          confirmText="Confirmer le changement d'adresse"
-          leftButtonAction={handleCancelAddressChangeDialog}
-          onCancel={() => setIsAddressChangeDialogOpen(false)}
-          onConfirm={handleConfirmAddressChangeDialog}
-          icon={strokeErrorIcon}
-          title="Ce changement d'adresse ne va pas s'impacter sur vos offres"
-          open={isAddressChangeDialogOpen && venue.hasOffers}
-        >
-          <p>
-            Si vous souhaitez rectifier leur localisation, vous devez les
-            modifier individuellement.
-          </p>
-        </ConfirmDialog>
+        {isOfferAddressEnabled && (
+          <ConfirmDialog
+            cancelText="Annuler"
+            confirmText="Confirmer le changement d'adresse"
+            leftButtonAction={handleCancelAddressChangeDialog}
+            onCancel={() => setIsAddressChangeDialogOpen(false)}
+            onConfirm={handleConfirmAddressChangeDialog}
+            icon={strokeErrorIcon}
+            title="Ce changement d'adresse ne va pas s'impacter sur vos offres"
+            open={isAddressChangeDialogOpen && venue.hasOffers}
+          >
+            <p>
+              Si vous souhaitez rectifier leur localisation, vous devez les
+              modifier individuellement.
+            </p>
+          </ConfirmDialog>
+        )}
       </FormikProvider>
     </>
   )