fix: minor code cleanup and fixes

Plant-for-the-Planet-org · Nov 18, 2024 · fb98cd9 · fb98cd9
1 parent 448c65d
commit fb98cd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Donations/Micros/GiftForm.tsx b/src/Donations/Micros/GiftForm.tsx
@@ -33,8 +33,7 @@ export default function GiftForm(): ReactElement {
     recipientName: giftDetails.recipientName || "",
     recipientEmail:
       (giftDetails.type === "invitation" && giftDetails.recipientEmail) || "",
-    message:
-      (giftDetails.type === "invitation" && giftDetails.recipientName) || "",
+    message: (giftDetails.type === "invitation" && giftDetails.message) || "",
   };
 
   const {

diff --git a/src/Donations/Micros/PaymentStatus/ThankyouMessage.tsx b/src/Donations/Micros/PaymentStatus/ThankyouMessage.tsx
@@ -45,10 +45,7 @@ function ThankyouMessage({
   // EXAMPLE: We've sent an email to Sagar Aryal about the gift.
   // TO DO - if recipientEmail is not present, then show message - You will receive the Gift certificate for {{recipientName}} on your email
   const donationGiftMessage =
-    donation &&
-    donation.gift &&
-    donation.gift.type === "invitation" &&
-    donation.gift.recipientEmail //TODOO - address TS warnings after /donations is updated to send gift data
+    donation?.gift?.type === "invitation" && donation.gift.recipientEmail //TODOO - address TS warnings after /donations is updated to send gift data
       ? " " +
         t("common:giftSentMessage", {
           recipientName: donation.gift.recipientName,