Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
</Text>

<Spacer y={2} />
Expand All @@ -177,7 +177,7 @@ export const FollowArtistsOnboardingCompletionBottomSheet = () => {
<Spacer y={2} />

<Text variant="sm-display" weight="medium" textAlign="center">
We'll let you know when new works arrive.
Well let you know when new works arrive.
</Text>

<Spacer y={1} />
Expand All @@ -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 theres a new work by an artist you follow, youll see a notification at the
top of your For You page.
</Text>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})

Expand All @@ -144,10 +144,10 @@ describe("FollowArtistsOnboardingCompletionBottomSheet", () => {

renderWithWrappers(<FollowArtistsOnboardingCompletionBottomSheet />)

expect(await screen.findByText("We'll let you know when new works arrive.")).toBeOnTheScreen()
expect(await screen.findByText("Well 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 theres a new work by an artist you follow, youll see a notification/
)
).toBeOnTheScreen()
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const InfiniteDiscoveryOnboarding: React.FC<InfiniteDiscoveryOnboardingPr
<Flex flex={1} px={2}>
{isNewUserOnboardingSession ? (
<Text variant="lg-display" numberOfLines={2} adjustsFontSizeToFit>
Swipe to see the next artwork, tap the heart to save it.
Swipe to see the next artwork. Tap the heart to save it.
</Text>
) : (
<Text variant="lg-display" numberOfLines={2} adjustsFontSizeToFit>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,24 @@ export const NewUserOnboardingCompletionBottomSheet: React.FC = () => {
<Spacer y={2} />

<Flex gap={1} alignItems="center">
<Text variant="lg-display" textAlign="center">
Five works is all it takes to start.
</Text>
<Text variant="sm" textAlign="center">
We're beginning to see what moves you.
<Text variant="lg-display" textAlign="center" weight="medium">
First five saved: We’re beginning to understand your taste.
</Text>

<Text variant="xs" textAlign="center">
Visit your For You page, or stay and keep exploring.
Go to Home or keep exploring works.
</Text>
Comment thread
JanaeHijaz marked this conversation as resolved.
</Flex>

<Spacer y={2} />

<Flex gap={1}>
<Button block variant="outline" onPress={handleContinueBrowsing}>
Continue Browsing
See More Works
</Button>

<Button block variant="fillDark" onPress={handleTakeMeHome}>
Go to home
Take Me Home
Comment thread
JanaeHijaz marked this conversation as resolved.
</Button>
Comment thread
github-actions[bot] marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
</Flex>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Comment thread
JanaeHijaz marked this conversation as resolved.
})
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,20 @@ describe("NewUserOnboardingCompletionBottomSheet", () => {

renderWithWrappers(<NewUserOnboardingCompletionBottomSheet />)

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(<NewUserOnboardingCompletionBottomSheet />)

fireEvent.press(screen.getByText("Continue Browsing"))
fireEvent.press(screen.getByText("See More Works"))

const state = __globalStoreTestUtils__?.getCurrentState()
expect(
Expand All @@ -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(<NewUserOnboardingCompletionBottomSheet />)

fireEvent.press(screen.getByText("Go to home"))
fireEvent.press(screen.getByText("Take Me Home"))

const state = __globalStoreTestUtils__?.getCurrentState()
expect(
Expand All @@ -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) => {
Expand All @@ -67,20 +69,20 @@ describe("NewUserOnboardingCompletionBottomSheet", () => {

renderWithWrappers(<NewUserOnboardingCompletionBottomSheet />)

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(<NewUserOnboardingCompletionBottomSheet />)

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)
Expand All @@ -94,6 +96,8 @@ describe("NewUserOnboardingCompletionBottomSheet", () => {

renderWithWrappers(<NewUserOnboardingCompletionBottomSheet />)

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()
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const AuthBackground: React.FC = () => {
>
<Flex maxWidth={isTablet() ? 600 : undefined} gap={isTablet() ? 2 : 1}>
<Text variant={isTablet() ? "xxl" : "xl"} color={ALWAYS_WHITE} selectable={false}>
Discover and Buy Art that Moves You
Discover and Buy Art That Moves You
</Text>

<Text variant={isTablet() ? "lg" : "sm"} color={ALWAYS_WHITE} selectable={false}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const BrowsePromptStep: React.FC<BrowsePromptStepProps> = ({ onNext, onSk
<Logo fill="mono100" />
<Flex flex={1} justifyContent="center">
<Text variant="xl" color="mono100">
We'll show you a selection of art. To get started, save 5 that speak to you.
Well show you a selection of art. To get started, save 5 that speak to you.
</Text>
</Flex>
<AnimatedFlex
Expand All @@ -35,7 +35,7 @@ export const BrowsePromptStep: React.FC<BrowsePromptStepProps> = ({ onNext, onSk
Start browsing
</Button>
<Button variant="fillLight" block onPress={onSkip}>
Skip to home
Skip to Home
Comment thread
github-actions[bot] marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
</Button>
</AnimatedFlex>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const FollowArtistsOrderedSet: React.FC<FollowArtistsOrderedSetProps> = ({
{nodes.length > 0 && (
<>
{!!hasFollowedArtists && <Separator my={2} />}
<Text variant="md">Leading artists on Artsy</Text>
<Text variant="md">Popular on Artsy</Text>
<Spacer y={2} />
</>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Comment thread
JanaeHijaz marked this conversation as resolved.
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",
},
]
Comment thread
JanaeHijaz marked this conversation as resolved.

const HORIZONTAL_MARGIN = 20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
{
Expand All @@ -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)
})

Expand All @@ -77,7 +77,7 @@ describe("FollowArtistsOrderedSet", () => {
screen.queryByTestId("FollowArtistsOrderedSetPlaceholder")
)

expect(screen.getByText("Leading artists on Artsy")).toBeOnTheScreen()
expect(screen.getByText("Popular on Artsy")).toBeOnTheScreen()
Comment thread
github-actions[bot] marked this conversation as resolved.
Comment thread
JanaeHijaz marked this conversation as resolved.
expect(screen.UNSAFE_queryAllByType(Separator)).toHaveLength(0)
})

Expand All @@ -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)
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const FollowArtists: React.FC = () => {
<Screen.Body disableKeyboardAvoidance>
<Box mt={2}>
<Text variant="lg-display">
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.
</Text>
</Box>
<Spacer y={2} />
Expand Down
Loading