Skip to content

Commit

Permalink
chore: Hardcode cascading interval message copy and fix spacing (#9770)
Browse files Browse the repository at this point in the history
* Remove cascading end time intervalLabel

* Add extra spacing to match figma designs

* Remove helper and hardcode values

* Update src/v2/Apps/Auction/Components/AuctionDetails/AuctionDetails.tsx

Co-authored-by: Matt Zikherman <mzikherman@gmail.com>

Co-authored-by: Matt Zikherman <mzikherman@gmail.com>
  • Loading branch information
annacarey and mzikherman committed Mar 30, 2022
1 parent 87de142 commit 4060689
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 204 deletions.
9 changes: 3 additions & 6 deletions src/v2/Apps/Auction/AuctionApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ export const AuctionApp: React.FC<AuctionAppProps> = ({
showBuyNowTab: sale.showBuyNowTab,
}

const { cascadingEndTimeInterval, cascadingEndTime } = sale
const { cascadingEndTimeInterval } = sale

const isFullBleedHeaderFixed = !cascadingEndTimeInterval

return (
Expand All @@ -58,7 +59,7 @@ export const AuctionApp: React.FC<AuctionAppProps> = ({
>
{cascadingEndTimeInterval && (
<CascadingEndTimesBanner
intervalMessage={cascadingEndTime?.intervalLabel!}
cascadingEndTimeInterval={cascadingEndTimeInterval}
/>
)}

Expand Down Expand Up @@ -151,10 +152,6 @@ export const AuctionAppFragmentContainer = createFragmentContainer(AuctionApp, {
showBuyNowTab: promotedSale {
internalID
}
cascadingEndTime {
intervalLabel
}
cascadingEndTimeInterval
}
`,
Expand Down
61 changes: 31 additions & 30 deletions src/v2/Apps/Auction/Components/AuctionDetails/AuctionDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ const AuctionDetails: React.FC<AuctionDetailsProps> = ({ sale, me }) => {
? formatIsoDateNoZoneOffset(sale.liveStartAt, 4)
: sale.endAt

const cascadingEndTimeIntervalLabel =
!!sale.cascadingEndTimeInterval &&
!sale.endedAt &&
sale.cascadingEndTime?.intervalLabel
const showCascadingEndTimeIntervalMessage: boolean =
!!sale.cascadingEndTimeInterval && !sale.isClosed

return (
<>
Expand All @@ -48,35 +46,42 @@ const AuctionDetails: React.FC<AuctionDetailsProps> = ({ sale, me }) => {
<RegisterButtonFragmentContainer sale={sale} me={me} />
</Column>
</GridColumns>
<Spacer my={4} />
<Flex alignItems="center" justifyContent="space-between">
{!!sale.cascadingEndTimeInterval && (
<SaleDetailTimerFragmentContainer sale={sale} />
<>
<SaleDetailTimerFragmentContainer sale={sale} />
<Spacer my={2} />
</>
)}
</Flex>
<Flex alignItems="center" justifyContent="space-between">
<Flex alignItems="center">
<AuctionDetailsStartTimeQueryRenderer id={sale.internalID} pr={2} />
<Flex alignItems="center">
<AuctionDetailsStartTimeQueryRenderer id={sale.internalID} pr={2} />

{!sale.isClosed && (
<Box mt={0.5}>
<AddToCalendar
startDate={sale.liveStartAt || sale.startAt!}
endDate={endDate!}
title={sale.name!}
description={sale.description!}
href={`${getENV("APP_URL")}${sale.href!}`}
liveAuctionUrl={liveAuctionUrl}
contextModule={ContextModule.auctionHome}
/>
</Box>
)}
</Flex>
{!sale.isClosed && (
<Box mt={0.5}>
<AddToCalendar
startDate={sale.liveStartAt || sale.startAt!}
endDate={endDate!}
title={sale.name!}
description={sale.description!}
href={`${getENV("APP_URL")}${sale.href!}`}
liveAuctionUrl={liveAuctionUrl}
contextModule={ContextModule.auctionHome}
/>
</Box>
)}
</Flex>

{cascadingEndTimeIntervalLabel && (
<Text variant="md" pr={2}>
{cascadingEndTimeIntervalLabel}
</Text>
{showCascadingEndTimeIntervalMessage && (
<>
<Spacer my={2} />
<Text variant="md" pr={2}>
{`Lots close at ${
sale.cascadingEndTimeInterval! / 60
}-minute intervals`}
</Text>
</>
)}

<Spacer my={2} />
Expand Down Expand Up @@ -107,14 +112,10 @@ export const AuctionDetailsFragmentContainer = createFragmentContainer(
liveStartAt
startAt
endAt
endedAt
description(format: HTML)
href
isClosed
cascadingEndTimeInterval
cascadingEndTime {
intervalLabel
}
}
`,
me: graphql`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { HorizontalPadding } from "v2/Apps/Components/HorizontalPadding"
import { getENV } from "v2/Utils/getENV"

interface CascadingEndTimesBannerProps {
intervalMessage: string
cascadingEndTimeInterval: number
}

export const CascadingEndTimesBanner: React.FC<CascadingEndTimesBannerProps> = ({
intervalMessage,
cascadingEndTimeInterval,
}) => {
const helpArticleLink = getENV("CASCADING_AUCTION_HELP_ARTICLE_LINK")

Expand All @@ -19,8 +19,7 @@ export const CascadingEndTimesBanner: React.FC<CascadingEndTimesBannerProps> = (
<AppContainer>
<HorizontalPadding>
<Banner dismissable pl={0} variant="brand">
This auction has staggered closing times.&nbsp;
{intervalMessage}.
{`Lots close at ${cascadingEndTimeInterval / 60}-minute intervals`}.
{hasLink && (
<>
&nbsp;
Expand Down
Empty file.
29 changes: 2 additions & 27 deletions src/v2/__generated__/AuctionAppTestQuery.graphql.ts

Large diffs are not rendered by default.

23 changes: 1 addition & 22 deletions src/v2/__generated__/AuctionApp_sale.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 2 additions & 31 deletions src/v2/__generated__/AuctionDetailsTestQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 1 addition & 30 deletions src/v2/__generated__/AuctionDetails_sale.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4060689

Please sign in to comment.