From 3608061134ac78b69c9965631931305e75501c1c Mon Sep 17 00:00:00 2001
From: Mounir Dhahri <soussouheros@gmail.com>
Date: Wed, 26 Jun 2024 15:12:49 +0200
Subject: [PATCH] fix: broken edit my collection artwork (#10432)

---
 .../Screens/ArtworkForm/Components/ArtistAutosuggest.tsx    | 4 +++-
 .../MyCollection/Screens/ArtworkForm/Form/useArtworkForm.ts | 6 ++----
 .../ArtworkForm/Components/SubmitArtworkSelectArtist.tsx    | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/Scenes/MyCollection/Screens/ArtworkForm/Components/ArtistAutosuggest.tsx b/src/app/Scenes/MyCollection/Screens/ArtworkForm/Components/ArtistAutosuggest.tsx
index e7690a85c8b..a514ffd43c0 100644
--- a/src/app/Scenes/MyCollection/Screens/ArtworkForm/Components/ArtistAutosuggest.tsx
+++ b/src/app/Scenes/MyCollection/Screens/ArtworkForm/Components/ArtistAutosuggest.tsx
@@ -33,6 +33,7 @@ interface ArtistAutosuggestProps {
   onResultPress: (result: AutosuggestResult) => void
   onSkipPress?: (artistDisplayName: string) => void
   autoFocus?: boolean
+  disableFormik?: boolean
 }
 
 export const ArtistAutosuggest: React.FC<ArtistAutosuggestProps> = ({
@@ -44,10 +45,11 @@ export const ArtistAutosuggest: React.FC<ArtistAutosuggestProps> = ({
   onResultPress,
   onSkipPress,
   autoFocus = typeof jest === "undefined",
+  disableFormik = false,
 }) => {
   const enableCollectedArtists = useFeatureFlag("AREnableMyCollectionCollectedArtists")
 
-  const { formik } = useArtworkForm()
+  const { formik } = useArtworkForm(disableFormik)
   const { artist: artistQuery } = formik.values
   const trimmedQuery = artistQuery.trimStart()
   const searchProviderValues = useSearchProviderValues(artistQuery)
diff --git a/src/app/Scenes/MyCollection/Screens/ArtworkForm/Form/useArtworkForm.ts b/src/app/Scenes/MyCollection/Screens/ArtworkForm/Form/useArtworkForm.ts
index 9cca9dd1b69..6e69dd7940b 100644
--- a/src/app/Scenes/MyCollection/Screens/ArtworkForm/Form/useArtworkForm.ts
+++ b/src/app/Scenes/MyCollection/Screens/ArtworkForm/Form/useArtworkForm.ts
@@ -1,17 +1,15 @@
 import { ArtworkFormValues } from "app/Scenes/MyCollection/State/MyCollectionArtworkModel"
 import { GlobalStore } from "app/store/GlobalStore"
-import { useFeatureFlag } from "app/utils/hooks/useFeatureFlag"
 import { FormikProps, useFormikContext } from "formik"
 import { useEffect } from "react"
 
-export function useArtworkForm(): { formik: FormikProps<ArtworkFormValues> } {
+export function useArtworkForm(disabled?: boolean): { formik: FormikProps<ArtworkFormValues> } {
   const formik = useFormikContext<ArtworkFormValues>()
-  const enableNewSubmissionFlow = useFeatureFlag("AREnableNewSubmissionFlow")
 
   useEffect(() => {
     // We don't want to update the form values if the new submission flow is enabled
     // because the form values are managed by the new submission flow
-    if (enableNewSubmissionFlow) {
+    if (disabled) {
       return
     }
 
diff --git a/src/app/Scenes/SellWithArtsy/ArtworkForm/Components/SubmitArtworkSelectArtist.tsx b/src/app/Scenes/SellWithArtsy/ArtworkForm/Components/SubmitArtworkSelectArtist.tsx
index 17e213e45b8..96641100b90 100644
--- a/src/app/Scenes/SellWithArtsy/ArtworkForm/Components/SubmitArtworkSelectArtist.tsx
+++ b/src/app/Scenes/SellWithArtsy/ArtworkForm/Components/SubmitArtworkSelectArtist.tsx
@@ -100,6 +100,7 @@ export const SubmitArtworkSelectArtist = () => {
               onResultPress={handleResultPress}
               disableCustomArtists
               onlyP1Artists
+              disableFormik
               loading={isLoading}
               hideCollectedArtists
               autoFocus={currentStep === "SelectArtist"}