diff --git a/src/app/Scenes/HomeView/Components/FollowArtistsOnboardingCompletionBottomSheet.tsx b/src/app/Scenes/HomeView/Components/FollowArtistsOnboardingCompletionBottomSheet.tsx index 589cc886a21..23d0ff8307c 100644 --- a/src/app/Scenes/HomeView/Components/FollowArtistsOnboardingCompletionBottomSheet.tsx +++ b/src/app/Scenes/HomeView/Components/FollowArtistsOnboardingCompletionBottomSheet.tsx @@ -159,7 +159,7 @@ export const FollowArtistsOnboardingCompletionBottomSheet = () => { textAlign="center" style={{ width: 350, paddingHorizontal: 10 }} > - Find them any time in the Favorites tab at the bottom of your screen. + Find them anytime in the Favorites tab at the bottom of your screen. @@ -177,7 +177,7 @@ export const FollowArtistsOnboardingCompletionBottomSheet = () => { - We'll let you know when new works arrive. + We’ll let you know when new works arrive. @@ -188,7 +188,7 @@ export const FollowArtistsOnboardingCompletionBottomSheet = () => { textAlign="center" style={{ width: 350, paddingHorizontal: 10 }} > - When there's a new work by an artist you follow, you'll see a notification at the + When there’s a new work by an artist you follow, you’ll see a notification at the top of your For You page. diff --git a/src/app/Scenes/HomeView/Components/__tests__/FollowArtistsOnboardingCompletionBottomSheet.tests.tsx b/src/app/Scenes/HomeView/Components/__tests__/FollowArtistsOnboardingCompletionBottomSheet.tests.tsx index d9ae6855526..c73eec4ffb9 100644 --- a/src/app/Scenes/HomeView/Components/__tests__/FollowArtistsOnboardingCompletionBottomSheet.tests.tsx +++ b/src/app/Scenes/HomeView/Components/__tests__/FollowArtistsOnboardingCompletionBottomSheet.tests.tsx @@ -135,7 +135,7 @@ describe("FollowArtistsOnboardingCompletionBottomSheet", () => { await screen.findByText("Your followed artists are saved to Favorites.") ).toBeOnTheScreen() expect( - screen.getByText("Find them any time in the Favorites tab at the bottom of your screen.") + screen.getByText("Find them anytime in the Favorites tab at the bottom of your screen.") ).toBeOnTheScreen() }) @@ -144,10 +144,10 @@ describe("FollowArtistsOnboardingCompletionBottomSheet", () => { renderWithWrappers() - expect(await screen.findByText("We'll let you know when new works arrive.")).toBeOnTheScreen() + expect(await screen.findByText("We’ll let you know when new works arrive.")).toBeOnTheScreen() expect( screen.getByText( - /When there's a new work by an artist you follow, you'll see a notification/ + /When there’s a new work by an artist you follow, you’ll see a notification/ ) ).toBeOnTheScreen() }) diff --git a/src/app/Scenes/InfiniteDiscovery/Components/InfiniteDiscoveryOnboarding.tsx b/src/app/Scenes/InfiniteDiscovery/Components/InfiniteDiscoveryOnboarding.tsx index 840126b065a..75bd819edbc 100644 --- a/src/app/Scenes/InfiniteDiscovery/Components/InfiniteDiscoveryOnboarding.tsx +++ b/src/app/Scenes/InfiniteDiscovery/Components/InfiniteDiscoveryOnboarding.tsx @@ -190,7 +190,7 @@ export const InfiniteDiscoveryOnboarding: React.FC {isNewUserOnboardingSession ? ( - Swipe to see the next artwork, tap the heart to save it. + Swipe to see the next artwork. Tap the heart to save it. ) : ( diff --git a/src/app/Scenes/InfiniteDiscovery/Components/NewUserOnboardingCompletionBottomSheet.tsx b/src/app/Scenes/InfiniteDiscovery/Components/NewUserOnboardingCompletionBottomSheet.tsx index 46793b722a2..24ff8ec2ddb 100644 --- a/src/app/Scenes/InfiniteDiscovery/Components/NewUserOnboardingCompletionBottomSheet.tsx +++ b/src/app/Scenes/InfiniteDiscovery/Components/NewUserOnboardingCompletionBottomSheet.tsx @@ -115,14 +115,12 @@ export const NewUserOnboardingCompletionBottomSheet: React.FC = () => { - - Five works is all it takes to start. - - - We're beginning to see what moves you. + + First five saved: We’re beginning to understand your taste. + - Visit your For You page, or stay and keep exploring. + Go to Home or keep exploring works. @@ -130,11 +128,11 @@ export const NewUserOnboardingCompletionBottomSheet: React.FC = () => { diff --git a/src/app/Scenes/InfiniteDiscovery/Components/__tests__/InfiniteDiscoveryOnboarding.tests.tsx b/src/app/Scenes/InfiniteDiscovery/Components/__tests__/InfiniteDiscoveryOnboarding.tests.tsx index 1ce29181282..bd51c9996d3 100644 --- a/src/app/Scenes/InfiniteDiscovery/Components/__tests__/InfiniteDiscoveryOnboarding.tests.tsx +++ b/src/app/Scenes/InfiniteDiscovery/Components/__tests__/InfiniteDiscoveryOnboarding.tests.tsx @@ -51,9 +51,8 @@ describe("InfiniteDiscoveryOnboarding", () => { jest.runAllTimers() }) - expect( - screen.getByText("Swipe to see the next artwork, tap the heart to save it.") - ).toBeOnTheScreen() + expect(screen.getByText(/Swipe to see the next artwork/)).toBeOnTheScreen() + expect(screen.getByText(/Tap the heart to save it/)).toBeOnTheScreen() }) }) diff --git a/src/app/Scenes/InfiniteDiscovery/Components/__tests__/NewUserOnboardingCompletionBottomSheet.tests.tsx b/src/app/Scenes/InfiniteDiscovery/Components/__tests__/NewUserOnboardingCompletionBottomSheet.tests.tsx index bcf013485e7..db144de0a93 100644 --- a/src/app/Scenes/InfiniteDiscovery/Components/__tests__/NewUserOnboardingCompletionBottomSheet.tests.tsx +++ b/src/app/Scenes/InfiniteDiscovery/Components/__tests__/NewUserOnboardingCompletionBottomSheet.tests.tsx @@ -22,18 +22,20 @@ describe("NewUserOnboardingCompletionBottomSheet", () => { renderWithWrappers() - expect(screen.getByText("Five works is all it takes to start.")).toBeOnTheScreen() - expect(screen.getByText("Continue Browsing")).toBeOnTheScreen() - expect(screen.getByText("Go to home")).toBeOnTheScreen() + expect( + screen.getByText("First five saved: We’re beginning to understand your taste.") + ).toBeOnTheScreen() + expect(screen.getByText("See More Works")).toBeOnTheScreen() + expect(screen.getByText("Take Me Home")).toBeOnTheScreen() }) - it('"Continue Browsing" hides the sheet and keeps onboarding incomplete', () => { + it('"See More Works" hides the sheet and keeps onboarding incomplete', () => { GlobalStore.actions.onboarding.setOnboardingState("incomplete") GlobalStore.actions.infiniteDiscovery.setNewUserOnboardingCompletionBottomSheetVisible(true) renderWithWrappers() - fireEvent.press(screen.getByText("Continue Browsing")) + fireEvent.press(screen.getByText("See More Works")) const state = __globalStoreTestUtils__?.getCurrentState() expect( @@ -42,13 +44,13 @@ describe("NewUserOnboardingCompletionBottomSheet", () => { expect(state?.onboarding.onboardingState).toBe("incomplete") }) - it('"Go to home" hides the sheet and completes onboarding', () => { + it('"Take Me Home" hides the sheet and completes onboarding', () => { GlobalStore.actions.onboarding.setOnboardingState("incomplete") GlobalStore.actions.infiniteDiscovery.setNewUserOnboardingCompletionBottomSheetVisible(true) renderWithWrappers() - fireEvent.press(screen.getByText("Go to home")) + fireEvent.press(screen.getByText("Take Me Home")) const state = __globalStoreTestUtils__?.getCurrentState() expect( @@ -57,7 +59,7 @@ describe("NewUserOnboardingCompletionBottomSheet", () => { expect(state?.onboarding.onboardingState).toBe("complete") }) - it('"Go to home" defers Home tooltips to the next session when at least one artwork was saved', () => { + it('"Take Me Home" defers Home tooltips to the next session when at least one artwork was saved', () => { GlobalStore.actions.progressiveOnboarding.setDeferHomeTooltipsThisSession(false) GlobalStore.actions.onboarding.setOnboardingState("incomplete") SAVED_ARTWORKS.forEach((artwork) => { @@ -67,20 +69,20 @@ describe("NewUserOnboardingCompletionBottomSheet", () => { renderWithWrappers() - fireEvent.press(screen.getByText("Go to home")) + fireEvent.press(screen.getByText("Take Me Home")) const state = __globalStoreTestUtils__?.getCurrentState() expect(state?.progressiveOnboarding.sessionState.deferHomeTooltipsThisSession).toBe(true) }) - it('"Go to home" does not defer Home tooltips when no artworks were saved', () => { + it('"Take Me Home" does not defer Home tooltips when no artworks were saved', () => { GlobalStore.actions.progressiveOnboarding.setDeferHomeTooltipsThisSession(false) GlobalStore.actions.onboarding.setOnboardingState("incomplete") GlobalStore.actions.infiniteDiscovery.setNewUserOnboardingCompletionBottomSheetVisible(true) renderWithWrappers() - fireEvent.press(screen.getByText("Go to home")) + fireEvent.press(screen.getByText("Take Me Home")) const state = __globalStoreTestUtils__?.getCurrentState() expect(state?.progressiveOnboarding.sessionState.deferHomeTooltipsThisSession).toBe(false) @@ -94,6 +96,8 @@ describe("NewUserOnboardingCompletionBottomSheet", () => { renderWithWrappers() - expect(screen.getByText("Five works is all it takes to start.")).toBeOnTheScreen() + expect( + screen.getByText("First five saved: We’re beginning to understand your taste.") + ).toBeOnTheScreen() }) }) diff --git a/src/app/Scenes/Onboarding/Screens/Auth/components/AuthBackground.tsx b/src/app/Scenes/Onboarding/Screens/Auth/components/AuthBackground.tsx index 29547737b98..3716cdfe754 100644 --- a/src/app/Scenes/Onboarding/Screens/Auth/components/AuthBackground.tsx +++ b/src/app/Scenes/Onboarding/Screens/Auth/components/AuthBackground.tsx @@ -49,7 +49,7 @@ export const AuthBackground: React.FC = () => { > - Discover and Buy Art that Moves You + Discover and Buy Art That Moves You diff --git a/src/app/Scenes/Onboarding/Screens/Auth/scenes/SignUpNameStep.tsx b/src/app/Scenes/Onboarding/Screens/Auth/scenes/SignUpNameStep.tsx index 26c7b999511..7c10ab32f1c 100644 --- a/src/app/Scenes/Onboarding/Screens/Auth/scenes/SignUpNameStep.tsx +++ b/src/app/Scenes/Onboarding/Screens/Auth/scenes/SignUpNameStep.tsx @@ -126,7 +126,7 @@ const SignUpNameStepForm: React.FC = () => { returnKeyType="done" spellCheck={false} textContentType="none" - title="Full Name" + title="Full name" value={values.name} onChangeText={(text) => { if (errors.name) { diff --git a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/BrowsePromptStep.tsx b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/BrowsePromptStep.tsx index c1608d224ee..5fa1edec16c 100644 --- a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/BrowsePromptStep.tsx +++ b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/BrowsePromptStep.tsx @@ -21,7 +21,7 @@ export const BrowsePromptStep: React.FC = ({ onNext, onSk - We'll show you a selection of art. To get started, save 5 that speak to you. + We’ll show you a selection of art. To get started, save 5 that speak to you. = ({ onNext, onSk Start browsing diff --git a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/FollowArtistsOrderedSet.tsx b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/FollowArtistsOrderedSet.tsx index ac9f7b2d31f..03ee7a99a93 100644 --- a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/FollowArtistsOrderedSet.tsx +++ b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/FollowArtistsOrderedSet.tsx @@ -60,7 +60,7 @@ const FollowArtistsOrderedSet: React.FC = ({ {nodes.length > 0 && ( <> {!!hasFollowedArtists && } - Leading artists on Artsy + Popular on Artsy )} diff --git a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/QuestionStep.tsx b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/QuestionStep.tsx index e2f729d75f0..38af0bc9a09 100644 --- a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/QuestionStep.tsx +++ b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/QuestionStep.tsx @@ -9,10 +9,22 @@ import { Logo } from "./Logo" export type Experience = "experienced" | "beginner" const EXPERIENCE_OPTIONS: { label: string; experience: Experience }[] = [ - { label: "I'm an experienced collector (4+ works)", experience: "experienced" }, - { label: "I've started my collection (1-3 works)", experience: "experienced" }, - { label: "I'm new to collecting, but I have something in mind", experience: "beginner" }, - { label: "I'm new to collecting and ready to explore", experience: "beginner" }, + { + label: "I’m an experienced collector (4+ works)", + experience: "experienced", + }, + { + label: "I’ve started my collection (1–3 works)", + experience: "experienced", + }, + { + label: "I’m new to collecting, but I have something in mind", + experience: "beginner", + }, + { + label: "I’m new to collecting and ready to explore", + experience: "beginner", + }, ] const HORIZONTAL_MARGIN = 20 diff --git a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/__tests__/FollowArtistsOrderedSet.tests.tsx b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/__tests__/FollowArtistsOrderedSet.tests.tsx index b355e21c205..0a78a735a26 100644 --- a/src/app/Scenes/Onboarding/Screens/Onboarding/Components/__tests__/FollowArtistsOrderedSet.tests.tsx +++ b/src/app/Scenes/Onboarding/Screens/Onboarding/Components/__tests__/FollowArtistsOrderedSet.tests.tsx @@ -40,7 +40,7 @@ describe("FollowArtistsOrderedSet", () => { }) }) - describe("the 'Leading artists on Artsy' section", () => { + describe("the 'Popular on Artsy' section", () => { it("shows the heading and separator when there are followed artists and artists left to follow", async () => { renderWithRelay( { @@ -57,7 +57,7 @@ describe("FollowArtistsOrderedSet", () => { screen.queryByTestId("FollowArtistsOrderedSetPlaceholder") ) - expect(screen.getByText("Leading artists on Artsy")).toBeOnTheScreen() + expect(screen.getByText("Popular on Artsy")).toBeOnTheScreen() expect(screen.UNSAFE_queryAllByType(Separator)).toHaveLength(1) }) @@ -77,7 +77,7 @@ describe("FollowArtistsOrderedSet", () => { screen.queryByTestId("FollowArtistsOrderedSetPlaceholder") ) - expect(screen.getByText("Leading artists on Artsy")).toBeOnTheScreen() + expect(screen.getByText("Popular on Artsy")).toBeOnTheScreen() expect(screen.UNSAFE_queryAllByType(Separator)).toHaveLength(0) }) @@ -97,7 +97,7 @@ describe("FollowArtistsOrderedSet", () => { screen.queryByTestId("FollowArtistsOrderedSetPlaceholder") ) - expect(screen.queryByText("Leading artists on Artsy")).not.toBeOnTheScreen() + expect(screen.queryByText("Popular on Artsy")).not.toBeOnTheScreen() expect(screen.UNSAFE_queryAllByType(Separator)).toHaveLength(0) }) }) diff --git a/src/app/Scenes/Onboarding/Screens/Onboarding/FollowArtists.tsx b/src/app/Scenes/Onboarding/Screens/Onboarding/FollowArtists.tsx index bc44e586742..04de677b3a7 100644 --- a/src/app/Scenes/Onboarding/Screens/Onboarding/FollowArtists.tsx +++ b/src/app/Scenes/Onboarding/Screens/Onboarding/FollowArtists.tsx @@ -93,7 +93,7 @@ export const FollowArtists: React.FC = () => { - Show us what you're drawn to, follow {MIN_FOLLOWED} or more artists to get started. + What art are you drawn to? Follow {MIN_FOLLOWED} or more artists to get started.