Uh oh!
There was an error while loading. Please reload this page.
[C-4080] Mobile cooldown and claim all#8263
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,33 @@ | ||
| import React from 'react' | ||
| import { | ||
| formatCooldownChallenges, | ||
| useChallengeCooldownSchedule, | ||
| useFeatureFlag | ||
| } from '@audius/common/hooks' | ||
| import type { | ||
| ChallengeRewardID, | ||
| UserChallengeState | ||
| } from '@audius/common/models' | ||
| import { FeatureFlags } from '@audius/common/services' | ||
| import { ClaimStatus } from '@audius/common/store' | ||
| import { fillString, formatNumberCommas } from '@audius/common/utils' | ||
| import { View } from 'react-native' | ||
| import { ScrollView } from 'react-native-gesture-handler' | ||
| import { | ||
| Text, | ||
| Button, | ||
| IconArrowRight, | ||
| IconCheck, | ||
| IconVerified | ||
| } from '@audius/harmony-native' | ||
| import { ProgressBar } from 'app/components/progress-bar' | ||
| import { formatLabel } from 'app/utils/challenges' | ||
| import { useThemePalette } from 'app/utils/theme' | ||
| import { SummaryTable } from '../summary-table' | ||
| import { ChallengeDescription } from './ChallengeDescription' | ||
| import { ChallengeReward } from './ChallengeReward' | ||
| import { ClaimError } from './ClaimError' | ||
| @@ -25,7 +41,9 @@ const messages = { | ||
| complete: 'Complete', | ||
| claim: 'Claim This Reward', | ||
| claimableLabel: '$AUDIO available to claim', | ||
| claimableAmountLabel: (amount) => `Claim ${amount} $AUDIO`, | ||
| claimedLabel: '$AUDIO claimed so far', | ||
| upcomingRewards: 'Upcoming Rewards' | ||
| } | ||
| type ChallengeRewardsDrawerContentProps = { | ||
| @@ -55,6 +73,10 @@ type ChallengeRewardsDrawerContentProps = { | ||
| /** True if the challenge type is 'aggregate' */ | ||
| showProgressBar: boolean | ||
| children?: React.ReactChild | ||
| /** The identifier for the challenge type */ | ||
| challengeId: ChallengeRewardID | ||
| /** True if challenge has a cooldown */ | ||
| isCooldownChallenge: boolean | ||
| } | ||
| /** Generic drawer content used for most challenges, responsible for rendering the | ||
| @@ -66,6 +88,8 @@ export const ChallengeRewardsDrawerContent = ({ | ||
| currentStep, | ||
| stepCount = 1, | ||
| progressLabel, | ||
| challengeId, | ||
| isCooldownChallenge, | ||
| challengeState, | ||
| claimableAmount, | ||
| claimedAmount, | ||
| @@ -79,6 +103,16 @@ export const ChallengeRewardsDrawerContent = ({ | ||
| const styles = useStyles() | ||
| const palette = useThemePalette() | ||
| const isInProgress = challengeState === 'in_progress' | ||
| const isClaimable = claimableAmount > 0 | ||
| const { | ||
| cooldownChallenges, | ||
| summary, | ||
| isEmpty: isCooldownChallengesEmpty | ||
| } = useChallengeCooldownSchedule({ challengeId }) | ||
| const { isEnabled: isRewardsCooldownEnabled } = useFeatureFlag( | ||
| FeatureFlags.REWARDS_COOLDOWN | ||
| ) | ||
| const claimInProgress = | ||
| claimStatus === ClaimStatus.CLAIMING || | ||
| claimStatus === ClaimStatus.WAITING_FOR_RETRY | ||
| @@ -103,97 +137,140 @@ export const ChallengeRewardsDrawerContent = ({ | ||
| messages.claimableLabel | ||
| }` | ||
| const renderCooldownSummaryTable = () => { | ||
| if (isCooldownChallenge && !isCooldownChallengesEmpty) { | ||
| return ( | ||
| <SummaryTable | ||
| title={messages.upcomingRewards} | ||
| items={formatCooldownChallenges(cooldownChallenges).map(formatLabel)} | ||
| summaryItem={summary} | ||
| secondaryTitle={messages.audio} | ||
| summaryLabelColor='accent' | ||
| summaryValueColor='default' | ||
| /> | ||
| ) | ||
| } | ||
| return null | ||
| } | ||
| return ( | ||
| <> | ||
| <ScrollView style={styles.content}> | ||
| {isVerifiedChallenge ? ( | ||
| <ChallengeDescription | ||
| task={messages.taskVerified} | ||
| taskIcon={ | ||
| <IconVerified | ||
| style={styles.subheaderIcon} | ||
| fill={palette.staticPrimary} | ||
| fillSecondary={palette.staticWhite} | ||
| /> | ||
| } | ||
| description={description} | ||
| /> | ||
| ) : ( | ||
| <ChallengeDescription description={description} /> | ||
| )} | ||
| <View style={styles.statusGrid}> | ||
| <View style={styles.statusGridColumns}> | ||
| <ChallengeReward amount={amount} subtext={messages.audio} /> | ||
| {showProgressBar ? ( | ||
| <View style={styles.progressCell}> | ||
| <Text | ||
| color='subdued' | ||
| style={[styles.subheader, styles.progressSubheader]} | ||
isaacsolo marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| strength='strong' | ||
| textTransform='uppercase' | ||
| variant='label' | ||
| size='l' | ||
| > | ||
| {messages.progress} | ||
| </Text> | ||
| <ProgressBar progress={currentStep} max={stepCount} /> | ||
| </View> | ||
| ) : null} | ||
| </View> | ||
| <View | ||
| style={[ | ||
| styles.statusCell, | ||
| hasCompleted ? styles.statusCellComplete : null | ||
| ]} | ||
| > | ||
| <Text | ||
| style={[styles.subheader]} | ||
| strength='strong' | ||
| textTransform='uppercase' | ||
| variant='label' | ||
| color={ | ||
| hasCompleted | ||
| ? 'staticWhite' | ||
| : isInProgress | ||
| ? 'accent' | ||
| : 'default' | ||
| } | ||
| > | ||
| {statusText} | ||
| </Text> | ||
| </View> | ||
| </View> | ||
| {children} | ||
| <View style={styles.claimRewardsContainer}> | ||
| {isClaimable && onClaim ? ( | ||
| isCooldownChallenge && isRewardsCooldownEnabled ? ( | ||
| renderCooldownSummaryTable() | ||
| ) : ( | ||
| <> | ||
| <Text | ||
| key='claimableAmount' | ||
| style={styles.claimableAmount} | ||
| variant='label' | ||
| strength='strong' | ||
| textTransform='uppercase' | ||
| > | ||
| {claimableAmountText} | ||
| </Text> | ||
| <Button | ||
| style={styles.claimButton} | ||
| variant={claimInProgress ? 'secondary' : 'primary'} | ||
| isLoading={claimInProgress} | ||
| onPress={onClaim} | ||
| iconLeft={IconCheck} | ||
| > | ||
| {messages.claim} | ||
| </Button> | ||
| </> | ||
| ) | ||
| ) : null} | ||
| {claimedAmount > 0 && challengeState !== 'disbursed' ? ( | ||
| <Text | ||
| variant='label' | ||
| color='subdued' | ||
| textAlign='center' | ||
| strength='strong' | ||
| > | ||
| {claimedAmountText} | ||
| </Text> | ||
| ) : null} | ||
| {claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null} | ||
| </View> | ||
| </ScrollView> | ||
| {isClaimable && | ||
| onClaim && | ||
| isCooldownChallenge && | ||
| isRewardsCooldownEnabled ? ( | ||
| <View style={styles.stickyClaimRewardsContainer}> | ||
| <Button | ||
| key='claimButton' | ||
Contributor There was a problem hiding this comment. i dont think key is necessary | ||
| style={styles.claimButton} | ||
Contributor There was a problem hiding this comment. similarly, we should be able to uses defaults | ||
| variant={claimInProgress ? 'secondary' : 'primary'} | ||
| isLoading={claimInProgress} | ||
| onPress={onClaim} | ||
| iconRight={IconArrowRight} | ||
| > | ||
| {messages.claimableAmountLabel(claimableAmount)} | ||
| </Button> | ||
| </View> | ||
| ) : null} | ||
| </> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.