fix: update my collection relay env (#8783)

* fix: update relay env across my collection

* update tests relay envs to fix tests

* fix search tests

.secrets.baseline

@@ -297,14 +297,14 @@
         "filename": "src/app/Scenes/MyCollection/Screens/ArtworkForm/MyCollectionArtworkForm.tests.tsx",
         "hashed_secret": "67d1be5993e49fbaba0bbd38492c33a2bc007ef7",
         "is_verified": false,
-        "line_number": 596
+        "line_number": 599
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "src/app/Scenes/MyCollection/Screens/ArtworkForm/MyCollectionArtworkForm.tests.tsx",
         "hashed_secret": "6414700358f2ae5762917a164e2e30df8783fc4e",
         "is_verified": false,
-        "line_number": 684
+        "line_number": 687
       }
     ],
     "src/app/Scenes/MyCollection/Screens/Insights/SelectArtist.tests.tsx": [
@@ -1035,5 +1035,5 @@
       }
     ]
   },
-  "generated_at": "2023-05-25T09:38:38Z"
+  "generated_at": "2023-05-31T10:47:21Z"
 }

src/app/Scenes/MyAccount/updateMyUserProfile.ts

@@ -2,12 +2,12 @@ import {
   UpdateMyProfileInput,
   updateMyUserProfileMutation,
 } from "__generated__/updateMyUserProfileMutation.graphql"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { commitMutation, Environment, graphql } from "react-relay"
 
 export const updateMyUserProfile = async (
   input: UpdateMyProfileInput = {},
-  environment: Environment = defaultEnvironment
+  environment: Environment = getRelayEnvironment()
 ) => {
   await new Promise((resolve, reject) =>
     commitMutation<updateMyUserProfileMutation>(environment, {

src/app/Scenes/MyCollection/MyCollection.tsx

@@ -19,7 +19,7 @@ import { MyCollectionZeroState } from "app/Scenes/MyCollection/Components/MyColl
 import { MyCollectionZeroStateArtworks } from "app/Scenes/MyCollection/Components/MyCollectionZeroStateArtworks"
 import { MyCollectionTabsStore } from "app/Scenes/MyCollection/State/MyCollectionTabsStore"
 import { GlobalStore } from "app/store/GlobalStore"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { extractNodes } from "app/utils/extractNodes"
 import { useDevToggle } from "app/utils/hooks/useDevToggle"
 import { useFeatureFlag } from "app/utils/hooks/useFeatureFlag"
@@ -295,7 +295,7 @@ export const MyCollectionQueryRenderer: React.FC = () => {
     >
       <ArtworkFiltersStoreProvider>
         <QueryRenderer<MyCollectionQuery>
-          environment={defaultEnvironment}
+          environment={getRelayEnvironment()}
           query={MyCollectionScreenQuery}
           variables={{}}
           cacheConfig={{ force: true }}

src/app/Scenes/MyCollection/Screens/Artwork/Components/ArtworkInsights/RequestForPriceEstimate/RequestForPriceEstimateScreen.tsx

@@ -4,12 +4,12 @@ import { RequestForPriceEstimateScreenMutation } from "__generated__/RequestForP
 import { Toast } from "app/Components/Toast/Toast"
 import { GlobalStore } from "app/store/GlobalStore"
 import { navigate } from "app/system/navigation/navigate"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
+import { ArtsyKeyboardAvoidingViewContext } from "app/utils/ArtsyKeyboardAvoidingView"
 import { FormikProvider, useFormik } from "formik"
 import { Environment } from "react-relay"
 import { useTracking } from "react-tracking"
 import { commitMutation, graphql } from "relay-runtime"
-import { ArtsyKeyboardAvoidingViewContext } from "app/utils/ArtsyKeyboardAvoidingView"
 import * as Yup from "yup"
 import { RequestForPriceEstimateForm } from "./RequestForPriceEstimateForm"
 
@@ -125,7 +125,7 @@ export const RequestForPriceEstimateScreen: React.FC<RequestForPriceEstimateScre
           backgroundColor: "red100",
         })
       }
-      requestForPriceEstimateMutation(defaultEnvironment, onCompleted, onError, input)
+      requestForPriceEstimateMutation(getRelayEnvironment(), onCompleted, onError, input)
     },
     validationSchema: ValidationSchema,
   })

src/app/Scenes/MyCollection/Screens/Artwork/MyCollectionArtwork.tests.tsx

@@ -1,11 +1,10 @@
 import { fireEvent } from "@testing-library/react-native"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getMockRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { renderWithHookWrappersTL } from "app/utils/tests/renderWithWrappers"
 import { resolveMostRecentRelayOperation } from "app/utils/tests/resolveMostRecentRelayOperation"
-import { createMockEnvironment } from "relay-test-utils"
 import { MyCollectionArtworkScreen } from "./MyCollectionArtwork"
 
-const mockEnvironment = defaultEnvironment as ReturnType<typeof createMockEnvironment>
+const mockEnvironment = getMockRelayEnvironment()
 
 describe("My Collection Artwork", () => {
   it("show new artwork screen ", () => {

src/app/Scenes/MyCollection/Screens/ArtworkForm/Components/ArtworkAutosuggestResults.tsx

@@ -5,7 +5,7 @@ import { GenericGridPlaceholder } from "app/Components/ArtworkGrids/GenericGrid"
 import { InfiniteScrollArtworksGridContainer } from "app/Components/ArtworkGrids/InfiniteScrollArtworksGrid"
 import { FadeIn } from "app/Components/FadeIn"
 import { LoadFailureView } from "app/Components/LoadFailureView"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { useScreenDimensions } from "app/utils/hooks"
 import { renderWithPlaceholder } from "app/utils/renderWithPlaceholder"
 import { trim } from "lodash"
@@ -131,7 +131,7 @@ export const ArtworkAutosuggestResultsQueryRenderer: React.FC<{
 }> = ({ keyword, artistSlug, onPress, onSkipPress, setShowSkipAheadToAddArtworkLink }) => {
   return (
     <QueryRenderer<ArtworkAutosuggestResultsContainerQuery>
-      environment={defaultEnvironment}
+      environment={getRelayEnvironment()}
       query={graphql`
         query ArtworkAutosuggestResultsContainerQuery(
           $count: Int!

src/app/Scenes/MyCollection/Screens/ArtworkForm/MyCollectionArtworkForm.tests.tsx

@@ -10,7 +10,7 @@ import {
   uploadFileToS3,
 } from "app/Scenes/SellWithArtsy/SubmitArtwork/UploadPhotos/utils/uploadFileToS3"
 import { GlobalStore, __globalStoreTestUtils__ } from "app/store/GlobalStore"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getMockRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import * as LocalImageStore from "app/utils/LocalImageStore"
 import { flushPromiseQueue } from "app/utils/tests/flushPromiseQueue"
 import { renderWithHookWrappersTL } from "app/utils/tests/renderWithWrappers"
@@ -32,9 +32,14 @@ jest.mock("app/Scenes/SellWithArtsy/SubmitArtwork/UploadPhotos/utils/uploadFileT
 const getConvectionGeminiKeyMock = getConvectionGeminiKey as jest.Mock<any>
 const getGeminiCredentialsForEnvironmentMock = getGeminiCredentialsForEnvironment as jest.Mock<any>
 const uploadFileToS3Mock = uploadFileToS3 as jest.Mock<any>
-const mockEnvironment = defaultEnvironment as ReturnType<typeof createMockEnvironment>
 
 describe("MyCollectionArtworkForm", () => {
+  let mockEnvironment: ReturnType<typeof createMockEnvironment>
+
+  beforeEach(() => {
+    mockEnvironment = getMockRelayEnvironment()
+  })
+
   describe("Editing an artwork", () => {
     it("renders the main form", async () => {
       const { getByText, getByTestId } = renderWithHookWrappersTL(
@@ -63,7 +68,6 @@ describe("MyCollectionArtworkForm", () => {
 
   describe("Adding a new artwork", () => {
     afterEach(() => {
-      mockEnvironment.mockClear()
       jest.clearAllMocks()
     })
 
@@ -508,7 +512,6 @@ describe("MyCollectionArtworkForm", () => {
 
   describe("loading screens", () => {
     afterEach(() => {
-      mockEnvironment.mockClear()
       jest.clearAllMocks()
     })
 

src/app/Scenes/MyCollection/Screens/ArtworkForm/Screens/MyCollectionArtworkFormArtwork.tsx

@@ -10,7 +10,7 @@ import { ArtworkAutosuggest } from "app/Scenes/MyCollection/Screens/ArtworkForm/
 import { useArtworkForm } from "app/Scenes/MyCollection/Screens/ArtworkForm/Form/useArtworkForm"
 import { ArtworkFormScreen } from "app/Scenes/MyCollection/Screens/ArtworkForm/MyCollectionArtworkForm"
 import { GlobalStore } from "app/store/GlobalStore"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { omit, pickBy } from "lodash"
 import React, { useEffect, useState } from "react"
 import { ScrollView } from "react-native"
@@ -126,7 +126,7 @@ const fetchArtwork = async (
   artworkID: string
 ): Promise<MyCollectionArtworkFormArtworkQuery["response"]["artwork"] | undefined> => {
   const result = await fetchQuery<MyCollectionArtworkFormArtworkQuery>(
-    defaultEnvironment,
+    getRelayEnvironment(),
     graphql`
       query MyCollectionArtworkFormArtworkQuery($artworkID: String!) {
         artwork(id: $artworkID) {

src/app/Scenes/MyCollection/Screens/Insights/MyCollectionInsights.tsx

@@ -5,7 +5,7 @@ import { StickyTabPageFlatListContext } from "app/Components/StickyTabPage/Stick
 import { StickyTabPageScrollView } from "app/Components/StickyTabPage/StickyTabPageScrollView"
 import { MyCollectionArtworkUploadMessages } from "app/Scenes/MyCollection/Screens/ArtworkForm/MyCollectionArtworkUploadMessages"
 import { Tab } from "app/Scenes/MyProfile/MyProfileHeaderMyCollectionAndSavedWorks"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { extractNodes } from "app/utils/extractNodes"
 import { setVisualClueAsSeen, useVisualClue } from "app/utils/hooks/useVisualClue"
 import {
@@ -62,7 +62,7 @@ export const MyCollectionInsights: React.FC<{}> = ({}) => {
 
     setIsRefreshing(true)
 
-    fetchQuery(defaultEnvironment, MyCollectionInsightsScreenQuery, {}).subscribe({
+    fetchQuery(getRelayEnvironment(), MyCollectionInsightsScreenQuery, {}).subscribe({
       complete: () => {
         setIsRefreshing(false)
       },

src/app/Scenes/MyCollection/mutations/deleteArtworkImage.ts

@@ -1,10 +1,10 @@
 import { deleteArtworkImageMutation } from "__generated__/deleteArtworkImageMutation.graphql"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { commitMutation, graphql } from "react-relay"
 
 export function deleteArtworkImage(artworkID: string, imageID: string) {
   return new Promise<deleteArtworkImageMutation["response"]>((resolve, reject) => {
-    commitMutation<deleteArtworkImageMutation>(defaultEnvironment, {
+    commitMutation<deleteArtworkImageMutation>(getRelayEnvironment(), {
       mutation: graphql`
         mutation deleteArtworkImageMutation($input: DeleteArtworkImageInput!) {
           deleteArtworkImage(input: $input) {

src/app/Scenes/MyCollection/mutations/myCollectionCreateArtwork.ts

@@ -1,12 +1,12 @@
 import { myCollectionCreateArtworkMutation } from "__generated__/myCollectionCreateArtworkMutation.graphql"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { commitMutation, graphql } from "react-relay"
 
 export function myCollectionCreateArtwork(
   input: myCollectionCreateArtworkMutation["variables"]["input"]
 ) {
   return new Promise<myCollectionCreateArtworkMutation["response"]>((resolve, reject) => {
-    commitMutation<myCollectionCreateArtworkMutation>(defaultEnvironment, {
+    commitMutation<myCollectionCreateArtworkMutation>(getRelayEnvironment(), {
       mutation: graphql`
         mutation myCollectionCreateArtworkMutation($input: MyCollectionCreateArtworkInput!) {
           myCollectionCreateArtwork(input: $input) {

src/app/Scenes/MyCollection/mutations/myCollectionDeleteArtwork.ts

@@ -1,10 +1,10 @@
 import { myCollectionDeleteArtworkMutation } from "__generated__/myCollectionDeleteArtworkMutation.graphql"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { commitMutation, graphql } from "react-relay"
 
 export function myCollectionDeleteArtwork(artworkId: string) {
   return new Promise<myCollectionDeleteArtworkMutation["response"]>((resolve, reject) => {
-    commitMutation<myCollectionDeleteArtworkMutation>(defaultEnvironment, {
+    commitMutation<myCollectionDeleteArtworkMutation>(getRelayEnvironment(), {
       mutation: graphql`
         mutation myCollectionDeleteArtworkMutation($input: MyCollectionDeleteArtworkInput!) {
           myCollectionDeleteArtwork(input: $input) {

src/app/Scenes/MyCollection/mutations/myCollectionUpdateArtwork.ts

@@ -1,12 +1,12 @@
 import { myCollectionUpdateArtworkMutation } from "__generated__/myCollectionUpdateArtworkMutation.graphql"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { commitMutation, graphql } from "react-relay"
 
 export function myCollectionUpdateArtwork(
   input: myCollectionUpdateArtworkMutation["variables"]["input"]
 ) {
   return new Promise<myCollectionUpdateArtworkMutation["response"]>((resolve, reject) => {
-    commitMutation<myCollectionUpdateArtworkMutation>(defaultEnvironment, {
+    commitMutation<myCollectionUpdateArtworkMutation>(getRelayEnvironment(), {
       mutation: graphql`
         mutation myCollectionUpdateArtworkMutation($input: MyCollectionUpdateArtworkInput!) {
           myCollectionUpdateArtwork(input: $input) {

src/app/Scenes/Search/AutosuggestResults.tests.tsx

@@ -2,7 +2,7 @@ import { AutosuggestResultsPaginationQuery$rawResponse } from "__generated__/Aut
 import { AutosuggestResultsQuery$rawResponse } from "__generated__/AutosuggestResultsQuery.graphql"
 import { AboveTheFoldFlatList } from "app/Components/AboveTheFoldFlatList"
 import Spinner from "app/Components/Spinner"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getMockRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { CatchErrors } from "app/utils/CatchErrors"
 import { extractText } from "app/utils/tests/extractText"
 import { rejectMostRecentRelayOperation } from "app/utils/tests/rejectMostRecentRelayOperation"
@@ -128,7 +128,6 @@ jest.mock("./RecentSearches", () => {
 
 const notifyRecentSearchMock = require("./RecentSearches").useRecentSearches().notifyRecentSearch
 
-const env = defaultEnvironment as ReturnType<typeof createMockEnvironment>
 const consoleErrorMock = jest.fn()
 const whiteListErrors = [
   "Warning: An update to %s inside a test was not wrapped in act(...).",
@@ -149,8 +148,10 @@ console.error = (...args: any[]) => {
 }
 
 describe("AutosuggestResults", () => {
+  let env: ReturnType<typeof createMockEnvironment>
+
   beforeEach(() => {
-    env.mockClear()
+    env = getMockRelayEnvironment()
     consoleErrorMock.mockClear()
     notifyRecentSearchMock.mockClear()
     inputBlurMock.mockClear()

src/app/Scenes/Search/AutosuggestResults.tsx

@@ -6,7 +6,7 @@ import { AboveTheFoldFlatList } from "app/Components/AboveTheFoldFlatList"
 import { LoadFailureView } from "app/Components/LoadFailureView"
 import Spinner from "app/Components/Spinner"
 import { SearchContext } from "app/Scenes/Search/SearchContext"
-import { defaultEnvironment } from "app/system/relay/createEnvironment"
+import { getRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { isPad } from "app/utils/hardware"
 import { ProvidePlaceholderContext } from "app/utils/placeholders"
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react"
@@ -371,7 +371,7 @@ export const AutosuggestResults: React.FC<{
               @arguments(query: $query, count: $count, entities: $entities)
           }
         `}
-        environment={defaultEnvironment}
+        environment={getRelayEnvironment()}
       />
     )
   },

src/app/Scenes/Search/Search.tests.tsx

@@ -1,12 +1,13 @@
 import { act, fireEvent, screen, waitFor } from "@testing-library/react-native"
+import { Pill } from "app/Components/Pill"
 import { RecentSearch } from "app/Scenes/Search/SearchModel"
 import { __globalStoreTestUtils__ } from "app/store/GlobalStore"
+import { getMockRelayEnvironment } from "app/system/relay/defaultEnvironment"
 import { isPad } from "app/utils/hardware"
 import { flushPromiseQueue } from "app/utils/tests/flushPromiseQueue"
 import { mockTrackEvent } from "app/utils/tests/globallyMockedStuff"
 import { renderWithWrappers } from "app/utils/tests/renderWithWrappers"
 import { resolveMostRecentRelayOperation } from "app/utils/tests/resolveMostRecentRelayOperation"
-import { Pill } from "app/Components/Pill"
 import { RelayEnvironmentProvider } from "react-relay"
 import { createMockEnvironment, MockPayloadGenerator } from "relay-test-utils"
 import { SearchScreen } from "./Search"
@@ -52,9 +53,8 @@ describe("Search Screen", () => {
   let mockEnvironment: ReturnType<typeof createMockEnvironment>
 
   beforeEach(() => {
-    require("app/system/relay/createEnvironment").reset()
     ;(isPad as jest.Mock).mockReset()
-    mockEnvironment = require("app/system/relay/createEnvironment").defaultEnvironment
+    mockEnvironment = getMockRelayEnvironment()
   })
 
   const TestRenderer = () => {