Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging => main #103

Merged
merged 2 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/pages/Pot/components/DonationsTable/DonationsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/pages/Pot/components/FlagModal/FlagModal.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from "react";
import ModalOverlay from "@app/modals/ModalOverlay";
import { Container } from "./styles";

Expand All @@ -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>
Expand Down
Loading