diff --git a/packages/grant-explorer/src/features/attestations/MintYourImpactComponents.tsx b/packages/grant-explorer/src/features/attestations/MintYourImpactComponents.tsx index 23faa669a..ec63a365f 100755 --- a/packages/grant-explorer/src/features/attestations/MintYourImpactComponents.tsx +++ b/packages/grant-explorer/src/features/attestations/MintYourImpactComponents.tsx @@ -34,6 +34,14 @@ export const AttestationFrame = ({ ensName: string | null | undefined; }) => { const { attestationFrameLogo } = useColorAndBackground(); + const projectsLength = projects.length; + const padding = + projectsLength === 3 + ? "threeProjectsPadding" + : projectsLength === 2 + ? "py-11" + : "py-28"; + return (
{ensName ? ( -
+
{ensName}
) : ( -
+
{address}
)}
Logo
{/* Main Body */} -
+
{/* Left Section (Top Projects and Top Round) */} -
+
{/* Top Projects Header */} -
-

- Top Projects -

-
+
+
+

+ Top Projects +

+
- {/* Project List (3/4 of the height) */} -
+ {/* Project List */} {projects.map((project, index) => (
{project.rank} @@ -120,11 +109,12 @@ export const AttestationFrame = ({ alt="Project" src={project.image} /> -
+ +

{project.name}

-

+

{project.round}

@@ -132,37 +122,34 @@ export const AttestationFrame = ({ ))}
- {/* Top Round Section (1/4 of the height) */} -
-
-

+ {/* Top Round Section */} + +

+
+
Top Round -

+
-
-

- {topRound} -

+
+
+
+ {topRound}
{/* Right Section (Stats) */} -
+
{[ { value: projectsFunded, label: "Projects Funded" }, { value: roundsSupported, label: "Rounds Supported" }, { value: checkedOutChains, label: "Chains" }, ].map((stat, index) => ( -
+
{stat.value}
-
+
{stat.label}
diff --git a/packages/grant-explorer/src/features/contributors/components/Buttons/MintDonationImpactAction.tsx b/packages/grant-explorer/src/features/contributors/components/Buttons/MintDonationImpactAction.tsx index b95d7498e..ee8f40f68 100644 --- a/packages/grant-explorer/src/features/contributors/components/Buttons/MintDonationImpactAction.tsx +++ b/packages/grant-explorer/src/features/contributors/components/Buttons/MintDonationImpactAction.tsx @@ -14,9 +14,7 @@ import { Contribution } from "data-layer"; import { ProgressStatus } from "../../../../hooks/attestations/config"; import { useEstimateGas } from "../../../../hooks/attestations/useEstimateGas"; -import { - AttestationChainId, -} from "../../../attestations/utils/constants"; +import { AttestationChainId } from "../../../attestations/utils/constants"; import { ethers } from "ethers"; import { useAttestationFee } from "../../hooks/useMintingAttestations"; @@ -57,7 +55,11 @@ export function MintDonationImpactAction({ [[transactionHash]] ); - const { data: imagesBase64, isLoading: isLoadingImages } = useGetImages( + const { + data: imagesBase64, + isLoading: isLoadingImages, + isFetched: imagesFetched, + } = useGetImages( FrameProps.projects.map((project) => project.image), isOpen ); @@ -65,7 +67,11 @@ export function MintDonationImpactAction({ const { data, isLoading, isRefetching } = useGetAttestationData( [transactionHash], handleGetAttestationPreview, - isLoadingENS || isLoadingImages || !isOpen || !startAction, + isLoadingENS || + isLoadingImages || + !isOpen || + !startAction || + !imagesFetched, selectedColor ); @@ -91,7 +97,7 @@ export function MintDonationImpactAction({ }); const { data: attestationFee } = useAttestationFee(); - console.log("====> A1", attestationFee) + console.log("====> A1", attestationFee); const notEnoughFunds = balance?.value && gasEstimation diff --git a/packages/grant-explorer/src/features/round/ThankYou.tsx b/packages/grant-explorer/src/features/round/ThankYou.tsx index 73173565d..75de7fe7b 100755 --- a/packages/grant-explorer/src/features/round/ThankYou.tsx +++ b/packages/grant-explorer/src/features/round/ThankYou.tsx @@ -26,9 +26,7 @@ import { useResolveENS } from "../../hooks/useENS"; import { useAccount, useBalance } from "wagmi"; import { useGetImages } from "../../hooks/attestations/useGetImages"; import { useEstimateGas } from "../../hooks/attestations/useEstimateGas"; -import { - AttestationChainId, -} from "../attestations/utils/constants"; +import { AttestationChainId } from "../attestations/utils/constants"; import { ethers } from "ethers"; import { useAttestationFee } from "../contributors/hooks/useMintingAttestations"; import { useAttestationStore } from "../../attestationStore"; @@ -141,7 +139,11 @@ export default function ThankYou() { const { data: name, isLoading: isLoadingENS } = useResolveENS(address); - const { data: imagesBase64, isLoading: isLoadingImages } = useGetImages( + const { + data: imagesBase64, + isLoading: isLoadingImages, + isFetched: imagesFetched, + } = useGetImages( ImpactFrameProps.projects.map((project) => project.image), isModalOpen ); @@ -149,7 +151,11 @@ export default function ThankYou() { const { data, isLoading } = useGetAttestationData( transactions, handleGetAttestationPreview, - isLoadingENS || isLoadingImages || !isModalOpen || isLoadingRoundNames, + isLoadingENS || + isLoadingImages || + !isModalOpen || + isLoadingRoundNames || + !imagesFetched, selectedBackground ); diff --git a/packages/grant-explorer/src/index.css b/packages/grant-explorer/src/index.css index 02b94c915..fd6b0ff1c 100644 --- a/packages/grant-explorer/src/index.css +++ b/packages/grant-explorer/src/index.css @@ -44,7 +44,7 @@ } .font-modern-era-bold { - font-family: 'Modern Era Bold', serif; + font-family: "Modern Era Bold", serif; } .blurred::before { @@ -101,21 +101,36 @@ .rainbow-button { border-radius: 8px; - border: 1px solid rgba(0, 0, 0, 0.20); - background: linear-gradient(0deg, rgba(255, 255, 255, 0.60) 0%, rgba(255, 255, 255, 0.60) 100%), linear-gradient(124deg, #FF9776 17.77%, #5F94BC 35.47%, #25BDCE 59.3%, #DEAB0C 91.61%); + border: 1px solid rgba(0, 0, 0, 0.2); + background: linear-gradient( + 0deg, + rgba(255, 255, 255, 0.6) 0%, + rgba(255, 255, 255, 0.6) 100% + ), + linear-gradient( + 124deg, + #ff9776 17.77%, + #5f94bc 35.47%, + #25bdce 59.3%, + #deab0c 91.61% + ); box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.05); } -.chakra-accordion .chakra-accordion__item{ +.chakra-accordion .chakra-accordion__item { border: 0; } - @keyframes reverse-spin { to { - transform: rotate(-360deg); + transform: rotate(-360deg); } } .animate-reverse-spin { animation: reverse-spin 1s linear infinite; -} \ No newline at end of file +} + +.threeProjectsPadding { + padding-top: 1.33rem; + padding-bottom: 1.33rem; +}