[C-4401] Fix reward in cooldown button (#8537)

AudiusProject · May 20, 2024 · 60ff81e · 60ff81e
1 parent 284df24
commit 60ff81e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx
@@ -130,9 +130,6 @@ export const ChallengeRewardsDrawerContent = ({
       )
     : messages.incomplete
 
-  const claimedAmountText = `(${formatNumberCommas(claimedAmount)} ${
-    messages.claimedLabel
-  })`
   const claimableAmountText = `${formatNumberCommas(claimableAmount)} ${
     messages.claimableLabel
   }`
@@ -213,7 +210,6 @@ export const ChallengeRewardsDrawerContent = ({
             </Text>
           </View>
         </View>
-        {children}
         <View style={styles.claimRewardsContainer}>
           {isClaimable && onClaim ? (
             isCooldownChallenge && isRewardsCooldownEnabled ? (
@@ -241,18 +237,9 @@ export const ChallengeRewardsDrawerContent = ({
               </>
             )
           ) : null}
-          {claimedAmount > 0 && challengeState !== 'disbursed' ? (
-            <Text
-              variant='label'
-              color='subdued'
-              textAlign='center'
-              strength='strong'
-            >
-              {claimedAmountText}
-            </Text>
-          ) : null}
           {claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null}
         </View>
+        {children}
       </ScrollView>
       {isClaimable &&
       onClaim &&

diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx
@@ -83,11 +83,11 @@ export const ChallengeRewardsDrawerProvider = () => {
   if (challenge?.challenge_type === 'aggregate') {
     audioToClaim = challenge.claimableAmount
     audioClaimedSoFar = challenge.disbursed_amount
-  } else if (challenge?.state === 'completed') {
+  } else if (challenge?.state === 'completed' && challenge?.cooldown_days) {
+    audioToClaim = challenge.claimableAmount
+  } else if (challenge?.state === 'completed' && !challenge?.cooldown_days) {
     audioToClaim = challenge.totalAmount
-    audioClaimedSoFar = 0
   } else if (challenge?.state === 'disbursed') {
-    audioToClaim = 0
     audioClaimedSoFar = challenge.totalAmount
   }
 
@@ -143,7 +143,7 @@ export const ChallengeRewardsDrawerProvider = () => {
 
   // Challenge drawer contents
   let contents: Maybe<React.ReactElement>
-  if (challenge?.state && challenge?.state !== 'completed') {
+  if (!audioToClaim) {
     switch (modalType) {
       case 'referrals':
       case 'ref-v':

diff --git a/packages/mobile/src/components/challenge-rewards-drawer/styles.ts b/packages/mobile/src/components/challenge-rewards-drawer/styles.ts
@@ -87,7 +87,7 @@ export const useStyles = makeStyles(({ palette, spacing, typography }) => ({
     width: '100%'
   },
   claimRewardsContainer: {
-    marginTop: spacing(4),
+    marginVertical: spacing(4),
     width: '100%'
   },
   claimRewardsError: {

diff --git a/...ages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx b/...ages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx
@@ -274,11 +274,11 @@ const ChallengeRewardsBody = ({ dismissModal }: BodyProps) => {
   if (challenge?.challenge_type === 'aggregate') {
     audioToClaim = challenge.claimableAmount
     audioClaimedSoFar = challenge.disbursed_amount
-  } else if (challenge?.state === 'completed') {
+  } else if (challenge?.state === 'completed' && challenge?.cooldown_days) {
+    audioToClaim = challenge.claimableAmount
+  } else if (challenge?.state === 'completed' && !challenge?.cooldown_days) {
     audioToClaim = challenge.totalAmount
-    audioClaimedSoFar = 0
   } else if (challenge?.state === 'disbursed') {
-    audioToClaim = 0
     audioClaimedSoFar = challenge.totalAmount
   }
 
@@ -563,7 +563,7 @@ const ChallengeRewardsBody = ({ dismissModal }: BodyProps) => {
         )}
         {renderReferralContent()}
         {renderMobileInstallContent()}
-        {buttonLink && challenge?.state !== 'completed' ? (
+        {buttonLink && !audioToClaim ? (
           <Button
             variant='primary'
             fullWidth={isMobile}