fix: handle missing referral data

mrgnlabs · Dec 9, 2023 · 710c5a0 · 710c5a0 · vercel · Dec 10, 2023
1 parent 46eb4bc
commit 710c5a0
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 21 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/desktop/DesktopAccountSummary/DesktopAccountSummary.tsx b/apps/marginfi-v2-ui/src/components/desktop/DesktopAccountSummary/DesktopAccountSummary.tsx
@@ -23,7 +23,7 @@ const AccountSummary = () => {
 
   return (
     <div className={cn("flex flex-col py-[10px] px-4 lg:flex-row w-full justify-between items-center")}>
-      <div className="font-[500] lg:block w-full h-[118px]">
+      <div className="font-[500] lg:block w-full">
         <div className="h-full rounded-xl">
           <span className="w-full flex justify-start text-xl">Global stats</span>
           <GlobalStats
@@ -37,7 +37,7 @@ const AccountSummary = () => {
 
       <div className="w-full">
         {connected && (
-          <div className="font-[500] h-full rounded-xl">
+          <div className="font-[500] rounded-xl">
             <span className="w-full h-full flex justify-start text-xl text-white">Your account</span>
             <UserStats
               accountSummary={isStoreInitialized && selectedAccount ? accountSummary : null}

diff --git a/apps/marginfi-v2-ui/src/components/desktop/Points/PointsOverview.tsx b/apps/marginfi-v2-ui/src/components/desktop/Points/PointsOverview.tsx
@@ -15,7 +15,12 @@ export const PointsOverview: FC<PointsOverviewProps> = ({ userPointsData }) => {
       <div className="grid grid-cols-2 gap-5 max-w-[800px] mx-auto w-full mt-2">
         <Card className="bg-[#131619] h-24 rounded-xl" elevation={0}>
           <CardContent>
-            <Typography color="#868E95" className="font-aeonik font-[300] text-base flex gap-1" gutterBottom>
+            <Typography
+              color="#868E95"
+              className="font-aeonik font-[300] text-base flex gap-1"
+              gutterBottom
+              component="div"
+            >
               Total Points
               <div className="self-center">
                 <MrgnTooltip
@@ -64,7 +69,12 @@ export const PointsOverview: FC<PointsOverviewProps> = ({ userPointsData }) => {
       <div className="grid grid-cols-2 sm:grid-cols-3 gap-5 max-w-[800px] mx-auto w-full">
         <Card className="bg-[#131619]  h-24 rounded-xl" elevation={0}>
           <CardContent>
-            <Typography color="#868E95" className="font-aeonik font-[300] text-base flex gap-1" gutterBottom>
+            <Typography
+              color="#868E95"
+              className="font-aeonik font-[300] text-base flex gap-1"
+              gutterBottom
+              component="div"
+            >
               Lending Points
               <div className="self-center">
                 <MrgnTooltip
@@ -93,7 +103,12 @@ export const PointsOverview: FC<PointsOverviewProps> = ({ userPointsData }) => {
         </Card>
         <Card className="bg-[#131619] h-24 rounded-xl" elevation={0}>
           <CardContent>
-            <Typography color="#868E95" className="font-aeonik font-[300] text-base flex gap-1" gutterBottom>
+            <Typography
+              color="#868E95"
+              className="font-aeonik font-[300] text-base flex gap-1"
+              gutterBottom
+              component="div"
+            >
               Borrowing Points
               <div className="self-center">
                 <MrgnTooltip
@@ -122,7 +137,12 @@ export const PointsOverview: FC<PointsOverviewProps> = ({ userPointsData }) => {
         </Card>
         <Card className="bg-[#131619] h-24 rounded-xl" elevation={0}>
           <CardContent>
-            <Typography color="#868E95" className="font-aeonik font-[300] text-base flex gap-1" gutterBottom>
+            <Typography
+              color="#868E95"
+              className="font-aeonik font-[300] text-base flex gap-1"
+              gutterBottom
+              component="div"
+            >
               Referral Points
               <div className="self-center">
                 <MrgnTooltip

diff --git a/packages/marginfi-v2-ui-state/src/lib/points.ts b/packages/marginfi-v2-ui-state/src/lib/points.ts
@@ -155,32 +155,47 @@ const getPointsDataForUser = async (wallet: string | undefined): Promise<UserPoi
   const userPointsDoc = doc(firebaseApi.db, "points", wallet);
   const userPublicProfileDoc = doc(firebaseApi.db, "users_public", wallet);
 
-  const [userPointsSnap, userPublicProfileSnap] = await Promise.all([
-    getDoc(userPointsDoc),
-    getDoc(userPublicProfileDoc),
-  ]);
+  let userPointsSnap;
+  let userPublicProfileSnap;
+  let userReferralData;
+  let userReferralCode = "";
+  let isCustomReferralLink = false;
 
-  if (!userPointsSnap.exists() || !userPublicProfileSnap.exists()) {
+  try {
+    userPointsSnap = await getDoc(userPointsDoc);
+  } catch (e) {
     return {
       ...DEFAULT_USER_POINTS_DATA,
       owner: wallet,
     };
   }
 
-  const userReferralData = userPublicProfileSnap.data();
-  let userReferralCode = "";
-  let isCustomReferralLink;
-  if (userReferralData && Array.isArray(userReferralData?.referralCode)) {
-    const uuidPattern = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-\b[0-9a-fA-F]{12}$/;
-    userReferralCode = userReferralData.referralCode.find((code) => !uuidPattern.test(code));
-    isCustomReferralLink = true;
-  } else {
-    userReferralCode = userReferralData?.referralCode || "";
-    isCustomReferralLink = false;
+  try {
+    userPublicProfileSnap = await getDoc(userPublicProfileDoc);
+    userReferralData = userPublicProfileSnap.data();
+    if (userReferralData && Array.isArray(userReferralData?.referralCode)) {
+      const uuidPattern = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-\b[0-9a-fA-F]{12}$/;
+      userReferralCode = userReferralData.referralCode.find((code) => !uuidPattern.test(code));
+      isCustomReferralLink = true;
+    } else {
+      userReferralCode = userReferralData?.referralCode || "";
+      isCustomReferralLink = false;
+    }
+  } catch (e) {
+    console.log("error", e);
   }
 
   const pointsData = userPointsSnap.data();
 
+  if (!pointsData) {
+    return {
+      ...DEFAULT_USER_POINTS_DATA,
+      owner: wallet,
+    };
+  }
+
+  console.log("pointsData", pointsData);
+
   const depositPoints = pointsData.total_deposit_points.toFixed(4);
   const borrowPoints = pointsData.total_borrow_points.toFixed(4);
   const referralPoints = (pointsData.total_referral_deposit_points + pointsData.total_referral_borrow_points).toFixed(