Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change openings reward display #4745

Merged
merged 2 commits into from
Jan 30, 2024
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
8 changes: 2 additions & 6 deletions packages/ui/src/app/pages/WorkingGroups/UpcomingOpening.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ import { NumericValueStat } from '@/common/components/statistics/NumericValueSta
import { TextSmall } from '@/common/components/typography'
import { ApplicationStatusWrapper } from '@/working-groups/components/ApplicationStatusWrapper'
import { OpeningIcon } from '@/working-groups/components/OpeningIcon'
import { useRewardPeriod } from '@/working-groups/hooks/useRewardPeriod'
import { useUpcomingOpening } from '@/working-groups/hooks/useUpcomingOpening'
import { asWeeklyRewards } from '@/working-groups/model/asWeeklyRewards'

export const UpcomingOpening = () => {
const { id } = useParams<{ id: string }>()
const { isLoading, opening } = useUpcomingOpening(id)
const rewardPeriod = useRewardPeriod(opening?.groupId)

if (isLoading || !opening) {
return (
Expand Down Expand Up @@ -82,10 +81,7 @@ export const UpcomingOpening = () => {
value={opening.expectedEnding}
from={opening.expectedStart}
/>
<TokenValueStat
title={`Reward per ${rewardPeriod?.toString()} blocks`}
value={rewardPeriod?.mul(opening.rewardPerBlock)}
/>
<TokenValueStat title={'Reward per week'} value={asWeeklyRewards(opening.rewardPerBlock)} />
{opening.hiringLimit ? (
<NumericValueStat title="Hiring limit" value={opening.hiringLimit} />
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import { ApplicationStatusWrapper } from '@/working-groups/components/Applicatio
import { OpeningIcon } from '@/working-groups/components/OpeningIcon'
import { MappedStatuses, OpeningStatuses, WorkingGroupsRoutes } from '@/working-groups/constants'
import { useOpening } from '@/working-groups/hooks/useOpening'
import { useRewardPeriod } from '@/working-groups/hooks/useRewardPeriod'
import { ApplyForRoleModalCall } from '@/working-groups/modals/ApplyForRoleModal'
import { asWeeklyRewards } from '@/working-groups/model/asWeeklyRewards'
import { urlParamToOpeningId } from '@/working-groups/model/workingGroupName'
import { WorkingGroupOpening as WorkingGroupOpeningType } from '@/working-groups/types'

Expand All @@ -62,7 +62,6 @@ export const WorkingGroupOpening = () => {
return activeApplications.find(({ id }) => id === activeMembership?.id)
}
}, [opening?.id, activeMembership?.id])
const rewardPeriod = useRewardPeriod(opening?.groupId)

if (isLoading || !opening) {
return (
Expand Down Expand Up @@ -150,10 +149,7 @@ export const WorkingGroupOpening = () => {
</BadgesRow>
<StatisticsStyle>
<DurationStatistics title="Time Left" value={opening.expectedEnding} />
<TokenValueStat
title={`Reward per ${rewardPeriod?.toString()} blocks`}
value={rewardPeriod?.mul(opening.rewardPerBlock)}
/>
<TokenValueStat title={'Reward per week'} value={asWeeklyRewards(opening.rewardPerBlock)} />
<TokenValueStat
title="Minimal stake"
tooltipText="Minimum tokens free of rivalrous locks required as application stake to this role."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ import {
OpenedTop,
OpenedWrapper,
} from '@/working-groups/components/ToggleableItemStyledComponents'
import { useRewardPeriod } from '@/working-groups/hooks/useRewardPeriod'
import { ApplyForRoleModalCall } from '@/working-groups/modals/ApplyForRoleModal'
import { asWeeklyRewards } from '@/working-groups/model/asWeeklyRewards'
import { isOpeningOpen } from '@/working-groups/model/isOpeningOpen'
import { groupNameToURLParam } from '@/working-groups/model/workingGroupName'

export const OpeningDetails = ({ opening, onClick, past }: OpeningListItemProps) => {
const { showModal } = useModal()
const rewardPeriod = useRewardPeriod(opening.groupId)
const groupName = groupNameToURLParam(nameMapping(opening.groupName))
const openingRoute = `/working-groups/openings/${groupName}-${opening.runtimeId}`

Expand All @@ -42,9 +41,9 @@ export const OpeningDetails = ({ opening, onClick, past }: OpeningListItemProps)
<StatisticsStyle withMargin>
<StatsBlock size="m" centered>
<TextBig>
<TokenValue value={rewardPeriod?.mul(opening.rewardPerBlock)} />
<TokenValue value={asWeeklyRewards(opening.rewardPerBlock)} />
</TextBig>
<Subscription>Reward per {rewardPeriod?.toString()} blocks</Subscription>
<Subscription>Reward per week</Subscription>
</StatsBlock>
<StatsBlock size="m" centered>
<MultiColumnsStatistic>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
ToggleableItemWrap,
OpenItemSummaryColumn,
} from '@/working-groups/components/ToggleableItemStyledComponents'
import { useRewardPeriod } from '@/working-groups/hooks/useRewardPeriod'
import { asWeeklyRewards } from '@/working-groups/model/asWeeklyRewards'
import { WorkingGroupOpening } from '@/working-groups/types'

export type OpeningListItemProps = {
Expand All @@ -25,7 +25,6 @@ export type OpeningListItemProps = {
}

export const OpeningListItem = ({ opening, past, onClick }: OpeningListItemProps) => {
const rewardPeriod = useRewardPeriod(opening.groupId)
const hiringTarget = opening.hiring.limit || 1

return (
Expand All @@ -44,9 +43,9 @@ export const OpeningListItem = ({ opening, past, onClick }: OpeningListItemProps
<ToggleableItemSummary>
<OpenItemSummaryColumn>
<TextInlineBig>
<TokenValue value={rewardPeriod?.mul(opening.rewardPerBlock)} />
<TokenValue value={asWeeklyRewards(opening.rewardPerBlock)} />
</TextInlineBig>
<ToggleableSubscriptionWide>Reward per {rewardPeriod?.toString()} blocks.</ToggleableSubscriptionWide>
<ToggleableSubscriptionWide>Reward per week.</ToggleableSubscriptionWide>
</OpenItemSummaryColumn>
<OpenItemSummaryColumn>
<TextBig>{opening.applicants}</TextBig>
Expand Down
9 changes: 9 additions & 0 deletions packages/ui/src/working-groups/model/asWeeklyRewards.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import BN from 'bn.js'

import { A_WEEK } from '@/common/constants'
import { MILLISECONDS_PER_BLOCK } from '@/common/model/formatters'

export const asWeeklyRewards = (rewardPerBlock: BN) => {
const BLOCKS_PER_WEEK = A_WEEK / MILLISECONDS_PER_BLOCK
return rewardPerBlock.muln(BLOCKS_PER_WEEK)
}
Loading