Merge pull request #1219 from dacadeorg/fix/adapt-to-backend

refactor: adapt to the user referral changes from the backend

Author: musayann

src/components/cards/profile/Referral.tsx

@@ -7,7 +7,7 @@ import { Referral as ReferralType } from "@/types/community";
 import Link from "next/link";
 import TimeIcon from "@/icons/time.svg";
 import RewardBadge from "@/components/badges/RewardBadge";
-import { Evaluation, Submission } from "@/types/bounty";
+import { Evaluation } from "@/types/bounty";
 
 interface ReferralProps {
   referral: ReferralType;
@@ -29,7 +29,6 @@ export default function Referral({ referral }: ReferralProps): ReactElement {
   const { locale } = useRouter();
   const joinedAt = useMemo(() => DateManager.fromNow(referral.created_at, locale), [locale, referral.created_at]);
   const rewardAt = useMemo(() => (referral.rewarded ? DateManager.fromNow(referral.updated_at, locale) : null), [locale, referral.rewarded, referral.updated_at]);
-  const challengeLink = (submission: Submission) => `/communities/${submission.community.slug}/challenges/${submission.challenge.id}/submissions/${submission.id}`
   const status = (evaluation: Evaluation) => {
     if (!evaluation) return t("referrals.challenge.evaluation.status.pending")
     return t(evaluation?.reward ? "referrals.challenge.evaluation.status.passed" : "referrals.challenge.evaluation.status.failed")
@@ -51,11 +50,11 @@ export default function Referral({ referral }: ReferralProps): ReactElement {
         <div className="flex-grow md:ml-19">
           <div className="pt-1">
             <ul className="pb-1 font-light leading-loose text-gray-700 grid divide-y-2 space-y-4 divide-gray-200">
-              {referral?.submissions?.length ? referral.submissions.map((submission) => (
+              {referral.user.submissions.length ? referral.user.submissions.map((submission) => (
                 <li key={submission.id} className="grid md:flex justify-between pt-4 gap-2 md:gap-0">
                   <span className="grid gap-2">
                     <span>
-                      {status(submission.metadata.evaluation)} <Link href={challengeLink(submission)} className="font-bold underline text-base- underline-offset-2">{submission.challenge.name} {t("referrals.submission.challenge")}</Link>
+                      {status(submission.metadata.evaluation)} <Link href={submission.link} className="font-bold underline text-base- underline-offset-2">{submission.challengeData.name} {t("referrals.submission.challenge")}</Link>
                     </span>
                     {!submission?.metadata?.evaluation && <span className="mr-0 flex items-center gap-2.5 leading-none "> <TimeIcon />{t("referrals.challenge.evaluation.pending")}</span>}
                   </span>

src/types/community.d.ts

@@ -42,8 +42,14 @@ export interface Colors {
     background: string;
   };
 }
+interface ReferralSubmission extends Submission {
+  challengeData: Challenge,
+  link: string
+}
+interface UserReferral extends User {
+  submissions: ReferralSubmission[]
+}
 export interface Referral {
-  user: User;
   id: string;
   name: string;
   ref: string;
@@ -53,13 +59,11 @@ export interface Referral {
   community: Community;
   timestamp: number;
   reward: Reward;
-  user: User;
   challenge: Challenge;
-  community: Community;
   submissions: Submission[];
   rewarded: boolean;
   metadata?: {
     reward: Reward;
   };
-  user: User;
+  user: UserReferral;
 }