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.

Sign up for GitHub

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

chore: remove REACT_APP_DIRECT_GRANT_ENABLED and make it the default #2465

Merged
merged 3 commits into from
Oct 18, 2023
Merged

chore: remove REACT_APP_DIRECT_GRANT_ENABLED and make it the default #2465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4abf51
chore: remove REACT_APP_DIRECT_GRANT_ENABLED and make it the default
vacekj Oct 16, 2023
be75f34
Merge branch 'main' into 2425-remove-the-react_app_direct_grant_enabl…
vacekj Oct 17, 2023
eeb308e
chore: address pr feedback
vacekj Oct 18, 2023
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
3 changes: 0 additions & 3 deletions packages/round-manager/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
REACT_APP_BUILDER_URL="https://builder.gitcoin.co"
REACT_APP_GRANT_EXPLORER="https://explorer.gitcoin.co"

# Whether to enable direct grants functionality. Cannot be off, included for posterity.
REACT_APP_DIRECT_GRANT_ENABLED="true"

#### End round-manager specific

# development for local, production for prod builds
Expand Down
127 changes: 58 additions & 69 deletions packages/round-manager/src/features/program/ViewProgramPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link, useNavigate, useParams } from "react-router-dom";
import { Link, useParams } from "react-router-dom";
import { Dialog, Transition } from "@headlessui/react";
import { Fragment } from "react";
import {
Expand Down Expand Up @@ -39,8 +39,6 @@ export default function ViewProgram() {
datadogLogs.logger.info("====> Route: /program/:id");
datadogLogs.logger.info(`====> URL: ${window.location.href}`);

const navigate = useNavigate();

const { id: programId } = useParams();

const { address } = useWallet();
Expand All @@ -56,9 +54,7 @@ export default function ViewProgram() {
const [hasAccess, setHasAccess] = useState(true);
const [grantType, setGrantType] = useState<
"quadraticFunding" | "directGrant" | undefined
>(
process.env.REACT_APP_DIRECT_GRANT_ENABLED ? undefined : "quadraticFunding"
);
>();
vacekj marked this conversation as resolved.
Show resolved Hide resolved
const debugModeEnabled = useDebugMode();

useEffect(() => {
Expand Down Expand Up @@ -94,15 +90,15 @@ export default function ViewProgram() {
<div className="flex-1 min-w-0">
{/* Round type */}
{getPayoutRoundDescription(
round.payoutStrategy.strategyName || ""
round.payoutStrategy.strategyName || "",
) && (
<div
className={`text-xs text-gray-900 h-[20px] inline-flex flex-col justify-center bg-grey-100 px-3 mb-3`}
style={{ borderRadius: "20px" }}
data-testid="round-payout-strategy-type"
>
{getPayoutRoundDescription(
round.payoutStrategy.strategyName || ""
round.payoutStrategy.strategyName || "",
)}
</div>
)}
Expand Down Expand Up @@ -302,50 +298,48 @@ export default function ViewProgram() {
className="object-cover pl-6 pr-4"
/>
</button>
{process.env.REACT_APP_DIRECT_GRANT_ENABLED && (
<button
onClick={() => setGrantType("directGrant")}
className={`flex w-full rounded border ${
<button
onClick={() => setGrantType("directGrant")}
className={`flex w-full rounded border ${
grantType === "directGrant"
? "border-violet-400"
: "border-grey-100"
} bg-white p-6 cursor-pointer`}
style={{
boxShadow:
grantType === "directGrant"
? "border-violet-400"
: "border-grey-100"
} bg-white p-6 cursor-pointer`}
style={{
boxShadow:
? " 0px 10px 15px -3px #0000001A"
vacekj marked this conversation as resolved.
Show resolved Hide resolved
: "none",
}}
>
<div className="flex pr-6 m-auto">
<div
className={`rounded-full border ${
grantType === "directGrant"
? " 0px 10px 15px -3px #0000001A"
: "none",
}}
>
<div className="flex pr-6 m-auto">
<div
className={`rounded-full border ${
grantType === "directGrant"
? "border-violet-400"
: "border-grey-100"
} h-[24px] w-[24px]`}
style={{
borderWidth: grantType === "directGrant" ? "6px" : "2px",
}}
></div>
</div>
<div className="pr-6 flex-grow text-left mt-auto mb-auto">
<h3 className="text-xl mb-2">Direct Grants</h3>
<p
className="text-grey-400 text-sm pr-4"
data-testid="program-details-intro"
>
Choose this type of round to directly allocate funds to
selected projects yourself.
</p>
</div>
<img
src={DirectGrants}
alt="Direct Grants"
className="object-cover pl-6 pr-4"
/>
</button>
)}
? "border-violet-400"
: "border-grey-100"
} h-[24px] w-[24px]`}
style={{
borderWidth: grantType === "directGrant" ? "6px" : "2px",
}}
></div>
</div>
<div className="pr-6 flex-grow text-left mt-auto mb-auto">
<h3 className="text-xl mb-2">Direct Grants</h3>
<p
className="text-grey-400 text-sm pr-4"
data-testid="program-details-intro"
>
Choose this type of round to directly allocate funds to
selected projects yourself.
</p>
</div>
<img
src={DirectGrants}
alt="Direct Grants"
className="object-cover pl-6 pr-4"
/>
</button>
</div>
<div className="w-full px-12">
<div className="border-t border-grey-100 h-[1px] mt-6 mb-6" />
Expand All @@ -360,20 +354,19 @@ export default function ViewProgram() {
</Button>
</Link>
)}
{grantType === "directGrant" &&
process.env.REACT_APP_DIRECT_GRANT_ENABLED && (
<Link
to={`/round/create?programId=${programToRender?.id}&roundCategory=direct`}
>
<Button className="px-4 w-full h-[48px]">
<PlusIcon
className="h-4 w-4 inline-flex -translate-y-0.5"
aria-hidden="true"
/>
&nbsp;Create round
</Button>
</Link>
)}
{grantType === "directGrant" && (
<Link
to={`/round/create?programId=${programToRender?.id}&roundCategory=direct`}
vacekj marked this conversation as resolved.
Show resolved Hide resolved
>
<Button className="px-4 w-full h-[48px]">
<PlusIcon
className="h-4 w-4 inline-flex -translate-y-0.5"
aria-hidden="true"
/>
&nbsp;Create round
</Button>
</Link>
)}
</div>
</div>
</div>
Expand Down Expand Up @@ -424,11 +417,7 @@ export default function ViewProgram() {
<p className="font-bold">My Rounds</p>
<span
onClick={() => {
process.env.REACT_APP_DIRECT_GRANT_ENABLED
? setIsModalOpen(true)
: navigate(
`/round/create?programId=${programToRender?.id}`
);
setIsModalOpen(true);
}}
className="text-violet-400 font-thin ml-auto mr-4 cursor-pointer"
data-testid="create-round-small-link"
Expand Down