From dcce10fabae3645f0bf3349a75f84983f8403e18 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Tue, 27 Feb 2024 17:19:30 -0500 Subject: [PATCH 1/5] Add comments to items in .env --- .env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env b/.env index af5b17617d..79d8b56f1c 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ NEXT_PUBLIC_ALCHEMY_API_KEY="" +# Alchemy provider API key, used on Sepolia NEXT_PUBLIC_ALCHEMY_SEPOLIA_API_KEY="" # automated testing workflows NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY="" @@ -12,6 +13,7 @@ NEXT_PUBLIC_INFURA_IPFS_API_KEY="" NEXT_PUBLIC_INFURA_IPFS_API_SECRET="" # site preview links NEXT_PUBLIC_SITE_URL="https://app.dev.fractalframework.xyz/" +# WalletConnect Cloud Project ID NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID="" # Shutter Public Key NEXT_PUBLIC_SHUTTER_EON_PUBKEY=0x0e6493bbb4ee8b19aa9b70367685049ff01dc9382c46aed83f8bc07d2a5ba3e6030bd83b942c1fd3dff5b79bef3b40bf6b666e51e7f0be14ed62daaffad47435265f5c9403b1a801921981f7d8659a9bd91fe92fb1cf9afdb16178a532adfaf51a237103874bb03afafe9cab2118dae1be5f08a0a28bf488c1581e9db4bc23ca \ No newline at end of file From 11415b3b50c501a1545c4bf4dceab7da3b4a8a8e Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Tue, 27 Feb 2024 17:20:03 -0500 Subject: [PATCH 2/5] Remove extra slash from etherscan base urls --- src/providers/NetworkConfig/networks/polygon.ts | 2 +- src/providers/NetworkConfig/networks/sepolia.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/providers/NetworkConfig/networks/polygon.ts b/src/providers/NetworkConfig/networks/polygon.ts index b5bf44c120..792e80a1f7 100644 --- a/src/providers/NetworkConfig/networks/polygon.ts +++ b/src/providers/NetworkConfig/networks/polygon.ts @@ -27,7 +27,7 @@ const SAFE_VERSION = '1.3.0'; export const polygonConfig: NetworkConfig = { safeBaseURL: 'https://safe-transaction-polygon.safe.global', - etherscanBaseURL: 'https://polygonscan.com/', + etherscanBaseURL: 'https://polygonscan.com', etherscanAPIBaseUrl: 'https://api.polygonscan.com/api', // TODO test ABISelector on template builder chainId: CHAIN_ID, name: polygon.name, diff --git a/src/providers/NetworkConfig/networks/sepolia.ts b/src/providers/NetworkConfig/networks/sepolia.ts index 360f30b568..1f909d17f7 100644 --- a/src/providers/NetworkConfig/networks/sepolia.ts +++ b/src/providers/NetworkConfig/networks/sepolia.ts @@ -28,7 +28,7 @@ const SAFE_VERSION = '1.3.0'; export const sepoliaConfig: NetworkConfig = { safeBaseURL: 'https://safe-transaction-sepolia.safe.global', - etherscanBaseURL: 'https://sepolia.etherscan.io/', + etherscanBaseURL: 'https://sepolia.etherscan.io', etherscanAPIBaseUrl: 'https://api-sepolia.etherscan.io', chainId: CHAIN_ID, name: sepolia.name, From 6f0205b14f501467f19a63d93cc18fe9c2028447 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Tue, 27 Feb 2024 17:21:29 -0500 Subject: [PATCH 3/5] Remove the link to the proposal's target address from Card title. Executive decision, I don't like it. Plus it was creating nested links (see next commit), and the browsers don't like that. --- .../Activity/ActivityDescriptionGovernance.tsx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/components/Activity/ActivityDescriptionGovernance.tsx b/src/components/Activity/ActivityDescriptionGovernance.tsx index b210ceaf1e..af00c5c41c 100644 --- a/src/components/Activity/ActivityDescriptionGovernance.tsx +++ b/src/components/Activity/ActivityDescriptionGovernance.tsx @@ -10,7 +10,6 @@ import { SnapshotProposal, FractalProposal, } from '../../types'; -import { ActivityAddress } from './ActivityAddress'; const formatId = (proposalId: string) => { if (proposalId.startsWith('0x')) { @@ -22,15 +21,6 @@ const formatId = (proposalId: string) => { } }; -function TargetAddress({ activity }: { activity: Activity }) { - const governanceActivity = activity as GovernanceActivity; - if (governanceActivity.targets.length === 1) { - return ; - } else { - return null; - } -} - function OnChainRejectionMessage({ activity }: { activity: Activity }) { const { t } = useTranslation('dashboard'); const governanceActivity = activity as MultisigProposal; @@ -71,7 +61,6 @@ export function ProposalTitle({ activity }: { activity: Activity }) { <> {formatId((activity as GovernanceActivity).proposalId)} {metaData.title || metaData.description} - {hasTransfers && {t('proposalDescriptionCont', { ns: 'dashboard' })} } From c3b2cd8badf2f7debd0e6b3e972f690f4c5ba255 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Tue, 27 Feb 2024 17:25:04 -0500 Subject: [PATCH 4/5] Wrap the proposal card in a link to the proposal's detail page --- .../Activity/ActivityGovernance.tsx | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/components/Activity/ActivityGovernance.tsx b/src/components/Activity/ActivityGovernance.tsx index 1e43aa96b8..9e194388bc 100644 --- a/src/components/Activity/ActivityGovernance.tsx +++ b/src/components/Activity/ActivityGovernance.tsx @@ -1,6 +1,8 @@ import { Flex } from '@chakra-ui/react'; import { format } from 'date-fns'; +import Link from 'next/link'; import { useTranslation } from 'react-i18next'; +import { DAO_ROUTES } from '../../constants/routes'; import { useFractal } from '../../providers/App/AppProvider'; import { FractalProposal, ActivityEventType, SnapshotProposal } from '../../types'; import { DEFAULT_DATE_FORMAT } from '../../utils/numberFormats'; @@ -26,31 +28,37 @@ export function ActivityGovernance({ activity }: { activity: FractalProposal }) : 'created' ); + const { + node: { daoAddress }, + } = useFractal(); + return ( - - ) - } - description={} - RightElement={ - - - - - - - } - eventDate={format(activity.eventDate, DEFAULT_DATE_FORMAT)} - eventDateLabel={eventDateLabel} - isSnapshot={!!(activity as SnapshotProposal).snapshotProposalId} - /> + + + ) + } + description={} + RightElement={ + + + + + + + } + eventDate={format(activity.eventDate, DEFAULT_DATE_FORMAT)} + eventDateLabel={eventDateLabel} + isSnapshot={!!(activity as SnapshotProposal).snapshotProposalId} + /> + ); } From a1885de243624a17b68e0cc2376551dcd759acd8 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Wed, 28 Feb 2024 08:57:19 -0500 Subject: [PATCH 5/5] empty commit