refactor: pr comments

src/app/collective-rewards/allocations/components/BuilderAllocationHeader.tsx

@@ -3,15 +3,12 @@ import { Badge } from '@/components/Badge'
 import { Jdenticon } from '@/components/Header/Jdenticon'
 import { Paragraph, Typography } from '@/components/Typography'
 import { FC } from 'react'
-import { Builder, BuilderProposal, BuilderStateFlags } from '../../types'
+import { Builder, BuilderProposal, BuilderStateFlags } from '@/app/collective-rewards/types'
+import { isBuilderActive } from '@/app/collective-rewards/utils'
 
 export type BuilderAllocationHeaderProps = Pick<Builder, 'builderName' | 'address' | 'stateFlags' | 'gauge'> &
   Pick<BuilderProposal, 'date'>
 
-const isBuilderActive = ({ communityApproved, kycApproved, paused }: BuilderStateFlags) => {
-  return communityApproved && kycApproved && !paused
-}
-
 export const BuilderAllocationHeader: FC<BuilderAllocationHeaderProps> = ({
   address,
   builderName,

src/app/collective-rewards/settings/builder/BuilderRewardsSettingsForm.tsx

@@ -40,7 +40,7 @@ const formSchema = z.object({
 export const BuilderRewardsSettingsForm: FC = () => {
   const router = useRouter()
   const [backButtonName, setBackButtonName] = useState('Cancel')
-  let {
+  const {
     current: { refetch, isLoading: isCurrentRewardsLoading },
     update: { isSuccess, setNewReward, isPending },
     isBuilderOperational,

src/app/collective-rewards/settings/builder/context/BuilderSettingsContext.tsx

@@ -8,13 +8,14 @@ import {
 import { createContext, FC, ReactNode, useContext } from 'react'
 import { Address } from 'viem'
 import { useAccount } from 'wagmi'
-import { useGetIsBuilderOperational } from '@/app/collective-rewards/settings'
+import { useBuilderContext } from '@/app/collective-rewards/user'
+import { isBuilderActive } from '@/app/collective-rewards/utils'
 
 type BackerRewardsPercentageContext = {
   update: SetBackerRewardsForBuilder
   current: BackerRewardResponse
   rewardPercentageToApply: RewardPercentageToApply
-  isBuilderOperational?: boolean
+  isBuilderOperational: boolean
 }
 
 const BuilderSettingsContext = createContext<BackerRewardsPercentageContext>(
@@ -24,11 +25,13 @@ const BuilderSettingsContext = createContext<BackerRewardsPercentageContext>(
 export const useBuilderSettingsContext = () => useContext(BuilderSettingsContext)
 
 export const BuilderSettingsProvider: FC<{ children: ReactNode }> = ({ children }) => {
+  const { getBuilderByAddress } = useBuilderContext()
   const { address } = useAccount()
   const current = useGetBackerRewardsForBuilder(address as Address)
   const update = useSetBackerRewardsForBuilder()
   const rewardPercentageToApply = useGetRewardPercentageToApply(address as Address)
-  const { data: isBuilderOperational } = useGetIsBuilderOperational(address as Address)
+  const builder = getBuilderByAddress(address as Address)
+  const isBuilderOperational = builder ? isBuilderActive(builder.stateFlags) : false
 
   const contextValue: BackerRewardsPercentageContext = {
     update,

src/app/collective-rewards/settings/builder/hooks/index.ts

@@ -1,2 +1 @@
 export * from './useBuilderConfig'
-export * from './useGetIsBuilderOperational'

src/app/collective-rewards/shared/components/Table/TableCells.tsx

@@ -13,6 +13,7 @@ import { ProgressBar } from '@/components/ProgressBar'
 import { Button } from '@/components/Button'
 import { BuilderStateFlags } from '@/app/collective-rewards/types'
 import { AllocationsContext } from '@/app/collective-rewards/allocations/context'
+import { isBuilderOperational } from '@/app/collective-rewards/utils'
 
 export function getFormattedCurrency(value: number, symbol: string) {
   const formattedCurrency = formatCurrency(value, symbol)
@@ -207,12 +208,7 @@ export const ActionCell: FC<ActionCellProps> = ({ tableHeader: { className }, bu
       console.log('Builder not found in selection') // TODO: handle this case better
       return
     }
-    return (
-      builder.stateFlags &&
-      builder.stateFlags.kycApproved &&
-      builder.stateFlags.communityApproved &&
-      !builder.stateFlags.paused
-    )
+    return isBuilderOperational(builder.stateFlags)
   }, [builder])
 
   const selectBuilder = () => {

src/app/collective-rewards/utils/getMostAdvancedProposal.ts

@@ -4,8 +4,8 @@ import { ProposalState } from '@/shared/types'
 
 const inactiveProposalsStates = [ProposalState.Canceled, ProposalState.Defeated, ProposalState.Expired]
 const isActive = (state: ProposalState) => !inactiveProposalsStates.includes(state)
-const isBuilderActive = (status?: BuilderStateFlags) =>
-  !status || status.activated || status.communityApproved
+const isBuilderActive = (stateFlags?: BuilderStateFlags) =>
+  !stateFlags || stateFlags.activated || stateFlags.communityApproved
 
 export const getMostAdvancedProposal = (
   proposalsEvent: CreateBuilderProposalEventLog[],

src/app/collective-rewards/utils/index.ts

@@ -4,3 +4,4 @@ export * from './getCoinbaseAddress'
 export * from './getMostAdvancedProposal'
 export * from './handleErrors'
 export * from './removeBrackets'
+export * from './isBuilderActive'

src/app/collective-rewards/utils/isBuilderActive.ts

@@ -1,7 +1,5 @@
-import { Builder } from '../types'
+import { BuilderStateFlags } from '../types'
 
-export const isBuilderActive = (builder: Builder) => {
-  return (
-    builder.stateFlags?.communityApproved && builder.stateFlags?.kycApproved && !builder.stateFlags?.paused
-  )
+export const isBuilderActive = (stateFlags?: BuilderStateFlags) => {
+  return !!(stateFlags && stateFlags.communityApproved && stateFlags.kycApproved && !stateFlags.paused)
 }