Merge pull request #103 from PotLock/staging

Staging => main
PotLock · May 14, 2024 · cd394a9 · cd394a9
2 parents a6eae2c + 08fc477
commit cd394a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/pages/Pot/components/DonationsTable/DonationsTable.tsx b/src/pages/Pot/components/DonationsTable/DonationsTable.tsx
@@ -106,17 +106,7 @@ const DonationsTable = (props: any) => {
     <Container>
       <div className="transcation">
         <div className="header">
-          <div
-            className="address"
-            onClick={() => {
-              setSuccessFlag({
-                address: "re.near",
-                reason: "test tEST Tetset",
-              });
-            }}
-          >
-            Donor
-          </div>
+          <div className="address">Donor</div>
           <div className="address">Project</div>
           <div className="sort price" onClick={() => sortDonation("price")}>
             Amount

diff --git a/src/pages/Pot/components/FlagModal/FlagModal.tsx b/src/pages/Pot/components/FlagModal/FlagModal.tsx
@@ -1,4 +1,4 @@
-import { Big, Near, context, useState } from "alem";
+import { Big, Near, context, useParams, useState } from "alem";
 import BannerBg from "@app/assets/svgs/banner-bg";
 import Button from "@app/components/Button";
 import TextArea from "@app/components/Inputs/TextArea/TextArea";
@@ -10,10 +10,12 @@ const FlagModal = (props: any) => {
   const SOCIAL_CONTRACT_ID = "social.near";
   const accountId = context.accountId || "";
 
+  const { potId } = useParams();
+
   const [reason, setReason] = useState("");
   const [reasonErr, setReasonErr] = useState("");
 
-  const { onClose, flagAddress, potId, setSuccessFlag } = props;
+  const { onClose, flagAddress, setSuccessFlag } = props;
 
   const onCancel = () => {
     onClose();

diff --git a/src/pages/Pot/components/FlagSuccessModal/FlagSuccessModal.tsx b/src/pages/Pot/components/FlagSuccessModal/FlagSuccessModal.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import ModalOverlay from "@app/modals/ModalOverlay";
 import { Container } from "./styles";
 
@@ -15,7 +14,7 @@ const FlagSuccessModal = (props: any) => {
           />
         </svg>
         <div className="title">
-          <span> {successFlag.address} </span> has been flagged
+          <span> {successFlag.account} </span> has been flagged
         </div>
         <div className="reason">{successFlag.reason}</div>
       </Container>