diff --git a/.env.example b/.env.example index 53ec7a2a97..a9d155aa26 100644 --- a/.env.example +++ b/.env.example @@ -30,7 +30,7 @@ REACT_APP_PASSPORT_API_COMMUNITY_ID_AVALANCHE=0000 ##Indexer & Data Layer - DEFAULTS SUFFICIENT # URL of the indexer. http://localhost:8080 for local indexer REACT_APP_INDEXER_V1_API_URL=https://grants-stack-indexer-v2.gitcoin.co -REACT_APP_INDEXER_V2_API_URL=http://gitcoin-data-layer-staging-lb-242619440.us-east-2.elb.amazonaws.com/v1 +REACT_APP_INDEXER_V2_API_URL=https://beta.indexer.gitcoin.co/v1 # Search API URL where the Data Layer should point to REACT_APP_GRANTS_STACK_SEARCH_API_BASE_URL=https://d2n9vtjeq685yt.cloudfront.net diff --git a/packages/common/package.json b/packages/common/package.json index cf50c81f3c..0480286477 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -28,6 +28,7 @@ "@wagmi/chains": "^1.8.0", "abitype": "^0.10.3", "classnames": "^2.3.2", + "@heroicons/react": "^2.0.13", "data-layer": "workspace:*", "dompurify": "^2.4.3", "eslint-config-gitcoin": "workspace:*", diff --git a/packages/grant-explorer/src/assets/icons/ethereum-icon.svg b/packages/common/src/assets/ethereum-icon.svg similarity index 100% rename from packages/grant-explorer/src/assets/icons/ethereum-icon.svg rename to packages/common/src/assets/ethereum-icon.svg diff --git a/packages/grant-explorer/src/features/round/CopyToClipboard.tsx b/packages/common/src/components/CopyToClipboard.tsx similarity index 95% rename from packages/grant-explorer/src/features/round/CopyToClipboard.tsx rename to packages/common/src/components/CopyToClipboard.tsx index 768ad8ccb3..eb682536fa 100644 --- a/packages/grant-explorer/src/features/round/CopyToClipboard.tsx +++ b/packages/common/src/components/CopyToClipboard.tsx @@ -3,7 +3,7 @@ import { CheckCircleIcon, DocumentDuplicateIcon, } from "@heroicons/react/24/outline"; -import { truncate } from "../common/utils/truncate"; +import { truncate } from "./truncate"; import { isAddress } from "viem"; const CopyToClipboard = ({ text }: { text: string | undefined }) => { diff --git a/packages/grant-explorer/src/features/common/utils/truncate.ts b/packages/common/src/components/truncate.ts similarity index 100% rename from packages/grant-explorer/src/features/common/utils/truncate.ts rename to packages/common/src/components/truncate.ts diff --git a/packages/grant-explorer/src/features/round/ViewProjectDetails.tsx b/packages/grant-explorer/src/features/round/ViewProjectDetails.tsx index 782072efbf..c2ad65221c 100644 --- a/packages/grant-explorer/src/features/round/ViewProjectDetails.tsx +++ b/packages/grant-explorer/src/features/round/ViewProjectDetails.tsx @@ -26,7 +26,7 @@ import { useAccount, useEnsName } from "wagmi"; import DefaultLogoImage from "../../assets/default_logo.png"; import { ReactComponent as GithubIcon } from "../../assets/github-logo.svg"; import { ReactComponent as TwitterIcon } from "../../assets/twitter-logo.svg"; -import { ReactComponent as EthereumIcon } from "../../assets/icons/ethereum-icon.svg"; +import { ReactComponent as EthereumIcon } from "common/src/assets/ethereum-icon.svg"; import { ReactComponent as GlobeIcon } from "../../assets/icons/globe-icon.svg"; import { useRoundById } from "../../context/RoundContext"; import { CartProject, GrantApplicationFormAnswer, Project } from "../api/types"; @@ -56,7 +56,7 @@ import { useApplication, } from "../projects/hooks/useApplication"; import { PassportWidget } from "../common/PassportWidget"; -import CopyToClipboard from "./CopyToClipboard"; +import CopyToClipboard from "common/src/components/CopyToClipboard"; const CalendarIcon = (props: React.SVGProps) => { return ( diff --git a/packages/grant-explorer/src/features/round/__tests__/ViewProjectDetails.test.tsx b/packages/grant-explorer/src/features/round/__tests__/ViewProjectDetails.test.tsx index d8bb70fc35..241750f2c7 100644 --- a/packages/grant-explorer/src/features/round/__tests__/ViewProjectDetails.test.tsx +++ b/packages/grant-explorer/src/features/round/__tests__/ViewProjectDetails.test.tsx @@ -7,7 +7,7 @@ import { setWindowDimensions, } from "../../../test-utils"; import ViewProjectDetails from "../ViewProjectDetails"; -import { truncate } from "../../common/utils/truncate"; +import { truncate } from "common/src/components/truncate"; import { formatDateWithOrdinal } from "common"; import { useApplication } from "../../projects/hooks/useApplication"; import { beforeEach, expect, Mock } from "vitest"; diff --git a/packages/grant-explorer/tsconfig.json b/packages/grant-explorer/tsconfig.json index 36c00fd5f8..aebe01de1c 100644 --- a/packages/grant-explorer/tsconfig.json +++ b/packages/grant-explorer/tsconfig.json @@ -19,5 +19,5 @@ "types": ["vitest/globals", "@testing-library/jest-dom"], "incremental": true }, - "include": ["src"] + "include": ["src", "../common/src/components/CopyToClipboard.tsx", "../common/src/components/truncate.ts"] } diff --git a/packages/round-manager/src/features/round/ViewApplicationPage.tsx b/packages/round-manager/src/features/round/ViewApplicationPage.tsx index 3409050e7c..6a761d1e85 100644 --- a/packages/round-manager/src/features/round/ViewApplicationPage.tsx +++ b/packages/round-manager/src/features/round/ViewApplicationPage.tsx @@ -52,6 +52,9 @@ import { isDirectRound, ApplicationOpenDateRange, } from "./ViewRoundPage"; +import CopyToClipboard from "common/src/components/CopyToClipboard"; +import { ReactComponent as EthereumIcon } from "common/src/assets/ethereum-icon.svg"; +import { useEnsName } from "wagmi"; import { CalendarIcon, @@ -135,6 +138,9 @@ export default function ViewApplicationPage() { contractUpdatingStatus == ProgressStatus.IN_PROGRESS || indexingStatus == ProgressStatus.IN_PROGRESS; + const recipient = application?.recipient; + // @ts-expect-error Temp until viem (could also cast recipient as Address or update the type) + const ens = useEnsName({ address: recipient, enabled: Boolean(recipient) }); const progressSteps: ProgressStep[] = [ { name: "Updating", @@ -806,6 +812,16 @@ export default function ViewApplicationPage() { : "-"} + {/* Application wallet address */} + + + + + +
{/* Description */} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6785368f26..cdb3bb48e5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -394,6 +394,9 @@ importers: '@gitcoinco/passport-sdk-types': specifier: ^0.2.0 version: 0.2.0 + '@heroicons/react': + specifier: ^2.0.13 + version: 2.2.0(react@18.3.1) '@openzeppelin/merkle-tree': specifier: 1.0.2 version: 1.0.2 @@ -22578,13 +22581,13 @@ snapshots: '@types/webpack-sources@3.2.3': dependencies: - '@types/node': 18.19.80 + '@types/node': 20.17.24 '@types/source-list-map': 0.1.6 source-map: 0.7.4 '@types/webpack@4.41.40': dependencies: - '@types/node': 18.19.80 + '@types/node': 20.17.24 '@types/tapable': 1.0.12 '@types/uglify-js': 3.17.5 '@types/webpack-sources': 3.2.3