From 453aa5aa1aeaf82660f0d0a68f039b347063f4d3 Mon Sep 17 00:00:00 2001
From: Usame Algan <usame@safe.global>
Date: Mon, 2 Dec 2024 11:39:46 +0100
Subject: [PATCH] Split SAP claim and redeem into two functions

---
 src/components/Points/index.tsx   | 47 ++++++++++++++++++++-----------
 src/hooks/useTaggedAllocations.ts |  2 ++
 src/utils/claim.ts                | 34 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/components/Points/index.tsx b/src/components/Points/index.tsx
index 599957d..263f6a0 100644
--- a/src/components/Points/index.tsx
+++ b/src/components/Points/index.tsx
@@ -12,7 +12,7 @@ import { formatEther } from 'ethers/lib/utils'
 import Spotlight from '@/public/images/spotlight.svg'
 import Star from '@/public/images/star.svg'
 import Star1 from '@/public/images/star1.svg'
-import { createSAPClaimTxs } from '@/utils/claim'
+import { createSAPClaimTxs, createSAPRedeemTxs } from '@/utils/claim'
 import { useSafeTokenAllocation } from '@/hooks/useSafeTokenAllocation'
 import { useSafeAppsSDK } from '@safe-global/safe-apps-react-sdk'
 import { FingerprintJSPro } from '@fingerprintjs/fingerprintjs-pro-react'
@@ -53,6 +53,23 @@ const Points = () => {
     // Something went wrong with fetching the eligibility for this user so we don't let them redeem
     if (!eligibility) return
 
+    const txs = createSAPRedeemTxs({
+      vestingData: allocation?.vestingData ?? [],
+      sapBoostedClaimable: eligibility.isAllowed ? sapBoosted.inVesting : '0',
+      sapUnboostedClaimable: sapUnboosted.inVesting,
+    })
+
+    try {
+      await sdk.txs.send({ txs })
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
+  const claimSAP = async () => {
+    // Something went wrong with fetching the eligibility for this user so we don't let them redeem
+    if (!eligibility) return
+
     const txs = createSAPClaimTxs({
       vestingData: allocation?.vestingData ?? [],
       sapBoostedClaimable: eligibility.isAllowed ? sapBoosted.inVesting : '0',
@@ -149,7 +166,7 @@ const Points = () => {
                         Redeem successful! You will be able to claim your tokens starting from {SAP_LOCK_DATE}.
                       </Alert>
                     ) : hasSAPStarted ? (
-                      <ClaimButton startClaiming={startClaiming} text="Claim" />
+                      <ClaimButton startClaiming={claimSAP} text="Claim" />
                     ) : !loading ? (
                       <ClaimButton startClaiming={startClaiming} text="Start claiming" />
                     ) : null}
@@ -213,20 +230,18 @@ const Points = () => {
 
       {globalRank && (
         <Grid container pt={3} spacing={3}>
-          <Grid item xs={12} lg={4}>
-            <PaperContainer>
-              <Stack alignItems="center">
-                {aggregateRank && (
-                  <>
-                    <PointsCounter value={aggregateRank.totalPoints} variant="h2" fontWeight={700} fontSize="44px" />
-                    <Typography color="text.secondary" mt={1}>
-                      {`Campaign${aggregateRank.totalPoints > 1 ? 's' : ''} completed`}
-                    </Typography>
-                  </>
-                )}
-              </Stack>
-            </PaperContainer>
-          </Grid>
+          {aggregateRank && (
+            <Grid item xs={12} lg={4}>
+              <PaperContainer>
+                <Stack alignItems="center">
+                  <PointsCounter value={aggregateRank.totalPoints} variant="h2" fontWeight={700} fontSize="44px" />
+                  <Typography color="text.secondary" mt={1}>
+                    {`Campaign${aggregateRank.totalPoints > 1 ? 's' : ''} completed`}
+                  </Typography>
+                </Stack>
+              </PaperContainer>
+            </Grid>
+          )}
 
           <Grid item xs={12} lg={4}>
             <PaperContainer>
diff --git a/src/hooks/useTaggedAllocations.ts b/src/hooks/useTaggedAllocations.ts
index 0c71081..4df7a6c 100644
--- a/src/hooks/useTaggedAllocations.ts
+++ b/src/hooks/useTaggedAllocations.ts
@@ -65,6 +65,8 @@ export const useTaggedAllocations = (
   const [sapBoostedClaimable, sapBoostedInVesting] = useAmounts(sapBoostedVesting)
   const [sapUnboostedClaimable, sapUnboostedInVesting] = useAmounts(sapUnboostedVesting)
 
+  console.log({ sapBoostedClaimable, sapBoostedInVesting })
+
   // Calculate total of claimable vs. vested amounts
   const totalAmountClaimable = getTotal(sep5Claimable, userClaimable, ecosystemClaimable, investorClaimable)
 
diff --git a/src/utils/claim.ts b/src/utils/claim.ts
index fd598ae..7796c12 100644
--- a/src/utils/claim.ts
+++ b/src/utils/claim.ts
@@ -192,6 +192,40 @@ export const createClaimTxs = ({
   return txs
 }
 
+export const createSAPRedeemTxs = ({
+  vestingData,
+  sapBoostedClaimable,
+  sapUnboostedClaimable,
+}: {
+  vestingData: Vesting[]
+  sapBoostedClaimable: string
+  sapUnboostedClaimable: string
+}) => {
+  const txs: BaseTransaction[] = []
+
+  const { sapBoostedVesting, sapUnboostedVesting } = getVestingTypes(vestingData)
+
+  if (sapBoostedVesting && BigNumber.from(sapBoostedClaimable).gt(0) && !sapBoostedVesting.isRedeemed) {
+    const redeemTx = createRedeemTx({
+      vestingClaim: sapBoostedVesting,
+      airdropAddress: sapBoostedVesting.contract,
+    })
+
+    txs.push(redeemTx)
+  }
+
+  if (sapUnboostedVesting && BigNumber.from(sapUnboostedClaimable).gt(0) && !sapUnboostedVesting.isRedeemed) {
+    const redeemTx = createRedeemTx({
+      vestingClaim: sapUnboostedVesting,
+      airdropAddress: sapUnboostedVesting.contract,
+    })
+
+    txs.push(redeemTx)
+  }
+
+  return txs
+}
+
 export const createSAPClaimTxs = ({
   vestingData,
   sapBoostedClaimable,