refactor: pr comments

RootstockCollective · Nov 28, 2024 · 7e633be · 7e633be
1 parent 342a5b1
commit 7e633be
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/src/app/collective-rewards/rewards/builders/ClaimableRewards.tsx b/src/app/collective-rewards/rewards/builders/ClaimableRewards.tsx
@@ -15,7 +15,6 @@ import { withSpinner } from '@/components/LoadingSpinner/withLoadingSpinner'
 import { usePricesContext } from '@/shared/context/PricesContext'
 import { FC } from 'react'
 import { Address } from 'viem'
-import { Popover } from '../../../../components/Popover'
 
 type TokenRewardsMetricsProps = {
   builder: Address
@@ -58,19 +57,11 @@ const TokenRewardsMetrics: FC<TokenRewardsMetricsProps> = ({
     fiatAmount,
     isLoading: rewardsLoading,
     children: (
-      <Popover
-        content={
-          <div className="text-[12px] font-bold mb-1">
-            <p data-testid="adjustBackerRewardPctTooltip">You cannot be paused to claim rewards</p>
-          </div>
-        }
-        size="small"
-        position="top"
-        trigger="hover"
-        disabled={!isPaused}
-      >
-        <ClaimYourRewardsButton onClick={() => claimRewards()} disabled={!isClaimable || isPaused} />
-      </Popover>
+      <ClaimYourRewardsButton
+        onClick={() => claimRewards()}
+        disabled={!isClaimable || isPaused}
+        isPaused={isPaused}
+      />
     ),
   })
 }

diff --git a/src/app/collective-rewards/rewards/builders/Rewards.tsx b/src/app/collective-rewards/rewards/builders/Rewards.tsx
@@ -40,6 +40,7 @@ const RewardsContent: FC<RewardsProps> = props => {
               <p data-testid="adjustBackerRewardPctTooltip">You cannot be paused to claim rewards</p>
             </div>
           }
+          className="w-full"
           size="small"
           position="top"
           trigger="hover"

diff --git a/src/app/collective-rewards/rewards/builders/hooks/useClaimBuilderRewards.ts b/src/app/collective-rewards/rewards/builders/hooks/useClaimBuilderRewards.ts
@@ -3,15 +3,14 @@ import { GaugeAbi } from '@/lib/abis/v2/GaugeAbi'
 import { Address } from 'viem'
 import { useWaitForTransactionReceipt, useWriteContract } from 'wagmi'
 import { useGetBuilderRewards } from '@/app/collective-rewards/rewards'
-import { useBuilderContext } from '../../../user'
+import { useBuilderContext } from '@/app/collective-rewards/user'
 
 const useClaimBuilderReward = (builder: Address, gauge: Address, rewardToken?: Address) => {
   const { writeContractAsync, error: executionError, data: hash, isPending } = useWriteContract()
   const { getBuilderByAddress } = useBuilderContext()
 
   const claimingBuilder = getBuilderByAddress(builder)
-  console.log('🚀 ~ useClaimBuilderReward ~ claimingBuilder:', claimingBuilder)
-  const isPaused = !!claimingBuilder?.stateFlags?.paused
+  const isPaused = claimingBuilder?.stateFlags?.paused ?? false
 
   const { isLoading, isSuccess, data, error: receiptError } = useWaitForTransactionReceipt({ hash })
 

diff --git a/src/app/collective-rewards/rewards/components/ClaimYouRewardButton.tsx b/src/app/collective-rewards/rewards/components/ClaimYouRewardButton.tsx
@@ -14,12 +14,16 @@ const ClaimYourRewardsSvg = () => (
   </svg>
 )
 
-export const ClaimYourRewardsButton: FC<Pick<ButtonProps, 'onClick' | 'disabled'>> = buttonProps => (
+export const ClaimYourRewardsButton: FC<
+  Pick<ButtonProps, 'onClick' | 'disabled'> & { isPaused?: boolean }
+> = ({ isPaused, ...buttonProps }) => (
   <div className="self-start justify-self-end pt-[10px]">
     <Popover
       content={
         <div className="text-[12px] font-bold mb-1">
-          <p data-testid="claimYouRewardsButtonTooltip">Claim your rewards</p>
+          <p data-testid="claimYouRewardsButtonTooltip">
+            {isPaused ? 'You cannot be paused to claim rewards' : 'Claim your rewards'}
+          </p>
         </div>
       }
       size="small"