Fixes after code review

Author: pawell24

src/components/Claim/Claim.tsx

@@ -13,6 +13,7 @@ import * as assets from '@/assets'
 import * as consts from '@/constants'
 import * as _utils from './Claim.utils'
 import FlowManager from './Link/FlowManager'
+import { ActionType, estimatePoints } from '../utils/utils'
 
 export const Claim = ({}) => {
     const [step, setStep] = useState<_consts.IClaimScreenState>(_consts.INIT_VIEW_STATE)
@@ -51,7 +52,7 @@ export const Claim = ({}) => {
     const [userType, setUserType] = useState<'NEW' | 'EXISTING' | undefined>(undefined)
     const [userId, setUserId] = useState<string | undefined>(undefined)
     const { address } = useAccount()
-    const { getAttachmentInfo, estimatePoints } = useClaimLink()
+    const { getAttachmentInfo } = useClaimLink()
 
     const handleOnNext = () => {
         if (step.idx === _consts.CLAIM_SCREEN_FLOW.length - 1) return
@@ -153,6 +154,7 @@ export const Claim = ({}) => {
                         address: address ?? '',
                         chainId: linkDetails.chainId,
                         amountUSD: Number(linkDetails.tokenAmount) * (tokenPrice?.price ?? 0),
+                        actionType: ActionType.CLAIM,
                     })
                     setEstimatedPoints(estimatedPoints)
                 }

src/components/Claim/Link/Initial.view.tsx

@@ -18,6 +18,7 @@ import * as _interfaces from '../Claim.interfaces'
 import * as _utils from '../Claim.utils'
 import { Popover } from '@headlessui/react'
 import { useAuth } from '@/context/authContext'
+import { ActionType, estimatePoints } from '@/components/utils/utils'
 export const InitialClaimLinkView = ({
     onNext,
     claimLinkData,
@@ -56,7 +57,7 @@ export const InitialClaimLinkView = ({
         context.tokenSelectorContext
     )
     const mappedData: _interfaces.CombinedType[] = _utils.mapToIPeanutChainDetailsArray(crossChainDetails)
-    const { estimatePoints, claimLink } = useClaimLink()
+    const { claimLink } = useClaimLink()
     const { open } = useWeb3Modal()
     const { isConnected, address } = useAccount()
     const { user } = useAuth()
@@ -123,6 +124,7 @@ export const InitialClaimLinkView = ({
             address: recipient.address ?? address ?? '',
             chainId: claimLinkData.chainId,
             amountUSD: USDValue,
+            actionType: ActionType.CLAIM,
         })
         setEstimatedPoints(estimatedPoints)
     }

src/components/Claim/useClaimLink.tsx

@@ -86,7 +86,7 @@ export const useClaimLink = () => {
                 currentChainId: String(currentChain?.id),
                 setLoadingState,
                 switchChainAsync: async ({ chainId }) => {
-                    await switchChainAsync({ chainId: chainId as number });
+                    await switchChainAsync({ chainId: chainId as number })
                 },
             })
             console.log(`Switched to chain ${chainId}`)
@@ -96,46 +96,6 @@ export const useClaimLink = () => {
     }
     const checkTxStatus = async (txHash: string) => {}
 
-    const estimatePoints = async ({
-        address,
-        chainId,
-        amountUSD,
-    }: {
-        address: string
-        chainId: string
-        amountUSD: number
-    }) => {
-        try {
-            const response = await fetch(`${consts.PEANUT_API_URL}/calculate-pts-for-action`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    actionType: 'CLAIM',
-                    userAddress: address,
-                    chainId: chainId,
-                    amountUsd: amountUSD,
-                    transaction: {
-                        from: address,
-                        to: address,
-                        data: '',
-                        value: '',
-                    },
-                }),
-            })
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`)
-            }
-
-            const data = await response.json()
-            return Math.round(data.points)
-        } catch (error) {
-            console.error('Failed to estimate points:', error)
-            return 0
-        }
-    }
-
     const getAttachmentInfo = async (link: string) => {
         try {
             const response = await fetch('/api/peanut/get-attachment-info', {
@@ -165,7 +125,6 @@ export const useClaimLink = () => {
         getSquidRoute,
         switchNetwork,
         checkTxStatus,
-        estimatePoints,
         getAttachmentInfo,
     }
 }

src/components/Request/Pay/Pay.tsx

@@ -8,7 +8,7 @@ import { peanut, interfaces as peanutInterfaces } from '@squirrel-labs/peanut-sd
 import * as generalViews from './Views/GeneralViews'
 import * as utils from '@/utils'
 import { useCreateLink } from '@/components/Create/useCreateLink'
-import useClaimLink from '@/components/Claim/useClaimLink'
+import { ActionType, estimatePoints } from '@/components/utils/utils'
 
 export const PayRequestLink = () => {
     const [step, setStep] = useState<_consts.IPayScreenState>(_consts.INIT_VIEW_STATE)
@@ -20,7 +20,6 @@ export const PayRequestLink = () => {
     const [estimatedGasCost, setEstimatedGasCost] = useState<number | undefined>(undefined)
     const [transactionHash, setTransactionHash] = useState<string>('')
     const [unsignedTx, setUnsignedTx] = useState<peanutInterfaces.IPeanutUnsignedTransaction | undefined>(undefined)
-    const { estimatePoints } = useClaimLink()
 
     const fetchPointsEstimation = async (
         requestLinkDetails: { recipientAddress: any; chainId: any; tokenAmount: any },
@@ -30,6 +29,7 @@ export const PayRequestLink = () => {
             address: requestLinkDetails.recipientAddress,
             chainId: requestLinkDetails.chainId,
             amountUSD: Number(requestLinkDetails.tokenAmount) * (tokenPrice?.price ?? 0),
+            actionType: ActionType.FULFILL,
         })
 
         setEstimatedPoints(estimatedPoints)

src/components/Request/Pay/Views/Initial.view.tsx

@@ -162,7 +162,6 @@ export const InitialView = ({
                     payerAddress: address ?? '',
                     link: requestLinkData.link,
                     apiUrl: '/api/proxy/patch/',
-                    estimatedPoints,
                     amountUsd,
                 })
 

src/components/utils/utils.ts

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import * as consts from '@/constants'
 
 export async function checkTransactionStatus(txHash: string): Promise<void> {
     try {
@@ -45,3 +46,50 @@ export async function loopUntilSuccess(
         }
     }, 5000)
 }
+
+export enum ActionType {
+    CLAIM = 'CLAIM',
+    FULFILL = 'FULFILL',
+}
+
+export const estimatePoints = async ({
+    address,
+    chainId,
+    amountUSD,
+    actionType,
+}: {
+    address: string
+    chainId: string
+    amountUSD: number
+    actionType: ActionType
+}) => {
+    try {
+        const response = await fetch(`${consts.PEANUT_API_URL}/calculate-pts-for-action`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                actionType: actionType,
+                userAddress: address,
+                chainId: chainId,
+                amountUsd: amountUSD,
+                transaction: {
+                    from: address,
+                    to: address,
+                    data: '',
+                    value: '',
+                },
+            }),
+        })
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`)
+        }
+
+        const data = await response.json()
+        return Math.round(data.points)
+    } catch (error) {
+        console.error('Failed to estimate points:', error)
+        return 0
+    }
+}