Merge pull request #138 from PotLock/fix/donation

Fix/donation
PotLock · Jan 30, 2024 · c8d4256 · c8d4256
2 parents c5da420 + 3fe81a2
commit c8d4256
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 89 deletions.
diff --git a/apps/potlock/widget/Cart/BreakdownSummary.jsx b/apps/potlock/widget/Cart/BreakdownSummary.jsx
@@ -154,7 +154,8 @@ const handleDonate = () => {
   //     }
   //   }
   const transactions = [];
-  Object.entries(props.cart).forEach(([projectId, { ft, amount, referrerId, potId }]) => {
+
+  Object.entries(props.cart).forEach(([projectId, { ft, amount, referrerId, note, potId }]) => {
     const amountFloat = parseFloat(amount || 0);
     const amountIndivisible = props.SUPPORTED_FTS[ft].toIndivisible(amountFloat);
     const donateContractArgs = {};
@@ -165,6 +166,7 @@ const handleDonate = () => {
     } else {
       donateContractArgs.recipient_id = projectId;
       donateContractArgs.referrer_id = referrerId;
+      donateContractArgs.message = note;
     }
     transactions.push({
       contractName: potId ?? donationContractId,
@@ -173,6 +175,7 @@ const handleDonate = () => {
       deposit: amountIndivisible.toString(),
     });
   });
+
   const now = Date.now();
   Near.call(transactions);
   // NB: we won't get here if user used a web wallet, as it will redirect to the wallet

diff --git a/apps/potlock/widget/Cart/CheckoutItem.jsx b/apps/potlock/widget/Cart/CheckoutItem.jsx
@@ -231,7 +231,8 @@ return (
                 amount,
                 props.cart[projectId]?.ft,
                 props.cart[projectId]?.referrerId,
-                props.cart[projectId]?.potId
+                props.cart[projectId]?.potId,
+                props.cart[projectId]?.note
               ); // TODO: update this to use selected FT ID
             },
             inputStyles: {
@@ -250,7 +251,13 @@ return (
                   ],
                   value: { text: props.cart[projectId]?.ft, value: props.cart[projectId]?.ft },
                   onChange: ({ text, value }) => {
-                    props.updateCartItem(projectId, undefined, value, props.cart[projectId]?.potId);
+                    props.updateCartItem(
+                      projectId,
+                      undefined,
+                      value,
+                      props.cart[projectId]?.potId,
+                      Storage.get("note")
+                    );
                   },
                   containerStyles: {
                     width: "auto",

diff --git a/apps/potlock/widget/Components/ListSection.jsx b/apps/potlock/widget/Components/ListSection.jsx
@@ -1,4 +1,13 @@
-const { ownerId, removeProjectsFromCart, addProjectsToCart, setIsCartModalOpen, tab } = props;
+const {
+  ownerId,
+  removeProjectsFromCart,
+  addProjectsToCart,
+  setIsCartModalOpen,
+  tab,
+  setAmount,
+  setProjectId,
+  setNote,
+} = props;
 const filterList = [
   "Newest to Oldest",
   "Oldest to Newest",
@@ -462,7 +471,7 @@ return (
               src={`${ownerId}/widget/Components.ProjectCard`}
               props={{
                 ...item,
-                ...props,
+                referrerId: props.referrerId,
                 ownerId: ownerId,
                 showModal: true,
                 transactionHashes: props.transactionHashes,
@@ -476,6 +485,15 @@ return (
                 setIsCartModalOpen: (isOpen) => {
                   setIsCartModalOpen(isOpen);
                 },
+                setAmount: (value) => {
+                  setAmount(value);
+                },
+                setProjectId: (id) => {
+                  setProjectId(id);
+                },
+                setNote: (note) => {
+                  setNote(note);
+                },
                 totalAmount: (donations) => totalAmount(donations),
               }}
               key={key}