diff --git a/.nvmrc b/.nvmrc index 05f04686d..bb8c76c68 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v22.11.0 \ No newline at end of file +v22.11.0 diff --git a/src/modules/explorer/components/ProposalsList.tsx b/src/modules/explorer/components/ProposalsList.tsx index 18c0280e8..5048e71b6 100644 --- a/src/modules/explorer/components/ProposalsList.tsx +++ b/src/modules/explorer/components/ProposalsList.tsx @@ -40,6 +40,7 @@ interface Props { proposalStyle?: any showFullList?: boolean filters: undefined | Filters + daoId?: string } interface ProposalObj { @@ -53,7 +54,8 @@ export const ProposalsList: React.FC = ({ liteProposals, proposalStyle, showFullList = true, - filters = undefined + filters = undefined, + daoId }) => { const [currentPage, setCurrentPage] = useState(0) const [offset, setOffset] = useState(0) @@ -196,7 +198,7 @@ export const ProposalsList: React.FC = ({ ) : (
- +
) )} diff --git a/src/modules/explorer/pages/Proposals/index.tsx b/src/modules/explorer/pages/Proposals/index.tsx index 0b03174e3..eb567f6c1 100644 --- a/src/modules/explorer/pages/Proposals/index.tsx +++ b/src/modules/explorer/pages/Proposals/index.tsx @@ -307,6 +307,7 @@ const TezosProposals = () => { proposals={undefined} liteProposals={polls} filters={filters} + daoId={daoId} /> )} {!(polls && polls.length > 0) ? ( diff --git a/src/modules/lite/explorer/pages/ProposalDetails/index.tsx b/src/modules/lite/explorer/pages/ProposalDetails/index.tsx index 04f08a7fd..983db500f 100644 --- a/src/modules/lite/explorer/pages/ProposalDetails/index.tsx +++ b/src/modules/lite/explorer/pages/ProposalDetails/index.tsx @@ -94,8 +94,14 @@ export const ProposalDetails: React.FC<{ id: string }> = ({ id }) => { if (historyLength > 1) { navigate.goBack() } else { - const daoUrl = pathname?.replace(`proposal/${proposalId}`, "") - navigate.push(daoUrl) + // If daoId is provided in state, user came from a V3 DAO, navigate to full DAO view + if (state?.daoId) { + navigate.push(`/explorer/dao/${state.daoId}`) + } else { + // Otherwise, navigate to lite DAO view + const daoUrl = pathname?.replace(`proposal/${proposalId}`, "") + navigate.push(daoUrl) + } } }