From aa55a624a2f9c9516858eb123755051bc9a06870 Mon Sep 17 00:00:00 2001
From: Terry Li <terryli0095@gmail.com>
Date: Sat, 6 Apr 2024 16:47:53 -0700
Subject: [PATCH 1/3] Staging (#2248)

* add member modal

* add nan check
---
 wondrous-bot-admin/src/pages/quests/members/MemberAddModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wondrous-bot-admin/src/pages/quests/members/MemberAddModal.tsx b/wondrous-bot-admin/src/pages/quests/members/MemberAddModal.tsx
index 9489a62ef..c69e115fb 100644
--- a/wondrous-bot-admin/src/pages/quests/members/MemberAddModal.tsx
+++ b/wondrous-bot-admin/src/pages/quests/members/MemberAddModal.tsx
@@ -106,7 +106,7 @@ const MemberAddBody = ({ onClose }) => {
             }
             if (points) {
               const integerPoints = parseInt(points);
-              if (!integerPoints || integerPoints < 0) {
+              if (isNaN(integerPoints)|| integerPoints < 0) {
                 setError("Points must be a positive integer");
                 return;
               }

From ffd706bfcef4a9759c4deddddff38c6d8e8cf68b Mon Sep 17 00:00:00 2001
From: Terry Li <terryli0095@gmail.com>
Date: Mon, 13 May 2024 13:44:55 -0700
Subject: [PATCH 2/3] show ref message (#2258) (#2259)

Co-authored-by: Adrian <mustea.adrian95@gmail.com>
---
 .../components/StartReferralQuests/index.tsx  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx b/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
index 915247840..19ba5bf9b 100644
--- a/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
+++ b/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
@@ -5,12 +5,22 @@ import { OrgProfilePicture } from "components/Shared/ProjectProfilePicture";
 import { Reward } from "components/ViewQuestResults/ViewRewards";
 import { useMemo, useState } from "react";
 import { constructRewards } from "utils/common";
-import { REFERRAL_REWARD_SCHEME } from "utils/constants";
+import { REFERRAL_REWARD_SCHEME, REFERRAL_STATUSES } from "utils/constants";
 import InfoModal from "./InfoModal";
 import IndividualQuestComponent from "./IndividualQuestComponent";
 import useStartQuest from "./utils/hooks";
 import SafeImage from "components/SafeImage";
 import InactiveQuestInfoModal from "./InactiveQuest";
+import moment from "moment";
+
+const TopBarMessage = ({ displayName, hasEnded }) => {
+  if (hasEnded) return <>This campaign has ended, but you can still complete the quests below!</>;
+  return (
+    <>
+      <strong>{displayName}</strong> referred you, complete the quests below!
+    </>
+  );
+};
 
 const StartReferralQuests = ({ referralCampaign, referralCode, referralCampaignExternalId, referralCodeInfo }) => {
   const [infoModalQuestId, setInfoModalQuestId] = useState(null);
@@ -69,6 +79,11 @@ const StartReferralQuests = ({ referralCampaign, referralCode, referralCampaignE
 
   const referralBannerImage = referralCampaign?.media?.[0]?.slug;
 
+  const endDate = referralCampaign?.endDate ? moment(referralCampaign?.endDate) : null;
+  const hasEnded =
+    referralCampaign?.status !== REFERRAL_STATUSES.ACTIVE ||
+    (endDate && endDate.isBefore(moment().utcOffset(0)?.endOf("day")?.toISOString()));
+
   return (
     <>
       <InfoModal
@@ -113,12 +128,13 @@ const StartReferralQuests = ({ referralCampaign, referralCode, referralCampaignE
             justifyContent="space-between"
             alignSelf="stretch"
             borderRadius="12px"
-            border="1px solid #2A8D5C"
-            bgcolor="#d0e1d6"
+            border="1px solid transparent"
+            borderColor={hasEnded ? "#F2C30C" : "#2A8D5C"}
+            bgcolor={hasEnded ? "rgba(242, 195, 12, 0.30)" : "#d0e1d6"}
           >
             <Box />
-            <Typography color="black" fontSize="14px" fontFamily="Poppins" fontWeight={500}>
-              {<strong>{referralCodeInfo?.referrerDisplayName}</strong>} referred you, complete the quests below!
+            <Typography color="black" fontSize="14px" fontFamily="Poppins" fontWeight={500} textAlign={"center"}>
+              <TopBarMessage hasEnded={hasEnded} displayName={referralCodeInfo?.referrerDisplayName} />
             </Typography>
             <ButtonBase
               onClick={() => setDisplayReferrer(false)}

From 695bbfd6b674fc4bcd2003b92697c49c4036aeca Mon Sep 17 00:00:00 2001
From: Terry Li <terryli0095@gmail.com>
Date: Mon, 13 May 2024 15:21:06 -0700
Subject: [PATCH 3/3] Staging (#2260)

* show ref message (#2258)

* remove points if ended

---------

Co-authored-by: Adrian <mustea.adrian95@gmail.com>
---
 .../src/components/StartReferralQuests/index.tsx              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx b/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
index 19ba5bf9b..85d9daa11 100644
--- a/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
+++ b/wondrous-bot-admin/src/components/StartReferralQuests/index.tsx
@@ -227,9 +227,9 @@ const StartReferralQuests = ({ referralCampaign, referralCode, referralCampaignE
             <Typography fontFamily="Poppins" fontSize="13px" color="black" fontWeight={500}>
               Earn rewards for completing these quests!
             </Typography>
-            <Grid container alignItems="center" gap="14px" flex="1" justifyContent="center">
+            {!hasEnded &&<Grid container alignItems="center" gap="14px" flex="1" justifyContent="center">
               {rewardsValue.map(Reward)}
-            </Grid>
+            </Grid>}
           </Box>
         ) : null}
         {/* //TODO: REPLACE THIS WITH NEWEST CARD */}