Merge pull request #1377 from InverseFinance/affiliate-fix-status

Affiliates: case checks
InverseFinance · Sep 3, 2024 · 6ac37dc · 6ac37dc
2 parents 7aeb464 + d287b96
commit 6ac37dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/components/F2/Infos/FirmAffiliateDashboard.tsx b/components/F2/Infos/FirmAffiliateDashboard.tsx
@@ -195,7 +195,7 @@ export const FirmAffiliateDashboard = ({
     const account = useAccount();
     const { priceUsd: dbrPriceUsd } = useDBRPrice();
     const { referrals, referralAddresses, affiliatePaymentEvents, affiliatesPublicData } = useFirmAffiliate(account);
-    const affiliateData = affiliatesPublicData?.find(a => a.affiliate === account);
+    const affiliateData = affiliatesPublicData?.find(a => a.affiliate?.toLowerCase() === account?.toLowerCase());
 
     const { userPositions, timestamp, isLoading } = useFirmUsers();
     const { isOpen: isReferralOpen, onOpen: onReferralOpen, onClose: onReferralClose } = useDisclosure();
@@ -206,7 +206,7 @@ export const FirmAffiliateDashboard = ({
             const refData = referrals.find(rd => rd.referred === up.user);
             const accSinceRef = (up.dueTokensAccrued - refData.beforeReferralDueTokensAccrued);
             const affiliateRewards = accSinceRef * 0.1;
-            const paidRewards = affiliatePaymentEvents.filter(pe => pe.affiliate === account).reduce((prev, curr) => prev + curr.amount, 0);
+            const paidRewards = affiliatePaymentEvents.filter(pe => pe.affiliate.toLowerCase() === account?.toLowerCase()).reduce((prev, curr) => prev + curr.amount, 0);
             return {
                 ...up,
                 affiliateRewards,
@@ -233,7 +233,7 @@ export const FirmAffiliateDashboard = ({
     const totalAffiliateRewards = Math.max(referredPositions.reduce((prev, curr) => prev + curr.affiliateRewards, 0), 0);
     const totalDbrAccrued = referredPositions.reduce((prev, curr) => prev + curr.accSinceRef, 0);
     const totalDbrPaid = affiliatePaymentEvents
-        .filter(e => e.affiliate === account)
+        .filter(e => e.affiliate.toLowerCase() === account?.toLowerCase())
         .reduce((prev, curr) => prev + curr.amount, 0);
 
     const totalPaidRewards = referredPositions.reduce((prev, curr) => prev + curr.paidRewards, 0);

diff --git a/components/F2/Infos/FirmAffiliateList.tsx b/components/F2/Infos/FirmAffiliateList.tsx
@@ -241,9 +241,9 @@ export const FirmAffiliateList = ({
 
     const affiliateList = affiliatesPublicData.map(affiliateData => {
         const affiliate = affiliateData.affiliate;
-        const referredList = referredPositions.filter(rp => rp.affiliate === affiliate);
+        const referredList = referredPositions.filter(rp => rp.affiliate.toLowerCase() === affiliate?.toLowerCase());
         const affiliateRewards = referredList.reduce((prev, curr) => prev + curr.affiliateRewards, 0);
-        const paidRewards = affiliatePaymentEvents.filter(pe => pe.affiliate === affiliate).reduce((prev, curr) => prev + curr.amount, 0);
+        const paidRewards = affiliatePaymentEvents.filter(pe => pe.affiliate.toLowerCase() === affiliate?.toLowerCase()).reduce((prev, curr) => prev + curr.amount, 0);
         return {
             ...affiliateData,
             nbReferred: referredList.length,
@@ -260,7 +260,7 @@ export const FirmAffiliateList = ({
     const totalPaidRewards = affiliateList.reduce((prev, curr) => prev + curr.paidRewards, 0);
     const totalPendingRewards = affiliateList.reduce((prev, curr) => prev + curr.pendingRewards, 0);
 
-    const selectedAffiliateReferrals = referredPositions.filter(rp => rp.affiliate === selectedAffiliate);
+    const selectedAffiliateReferrals = referredPositions.filter(rp => rp.affiliate.toLowerCase() === selectedAffiliate?.toLowerCase());
 
     const changeStatus = async (newStatus: string) => {
         if (provider && !!account) {

diff --git a/hooks/useFirm.tsx b/hooks/useFirm.tsx
@@ -867,7 +867,7 @@ export const useFirmLiquidations = (user?: string): SWR & {
 
 export const useFirmAffiliate = (affiliate: string, updateIndex = 0) => {
   const { data, error } = useCustomSWR(`/api/referral?updateIndex=${updateIndex||0}`, fetcher);
-  const referrals = (data?.referrals || []).filter(d => affiliate === 'all' || d.affiliate === affiliate);
+  const referrals = (data?.referrals || []).filter(d => affiliate === 'all' || d.affiliate.toLowerCase() === affiliate?.toLowerCase());
   return {
     timestamp: data?.timestamp,
     referrals,

diff --git a/pages/api/referral.ts b/pages/api/referral.ts
@@ -185,7 +185,7 @@ export default async function handler(req, res) {
                 }
 
                 const affiliatesData = await getCacheFromRedis(affiliatesKey, false, 600) || { affiliates: [] };
-                const affiliateIdx = affiliatesData.affiliates.findIndex(a => a.affiliate === r);
+                const affiliateIdx = affiliatesData.affiliates.findIndex(a => a.affiliate.toLowerCase() === r.toLowerCase());
 
                 if(affiliateIdx === -1) {
                     return res.status(400).json({ status: 'error', message: 'Affiliate not found' });