diff --git a/apps/token/src/routes/governance/components/propose/proposal-form-terms.spec.tsx b/apps/token/src/routes/governance/components/propose/proposal-form-terms.spec.tsx index 430b0dcc1..f8fe0e629 100644 --- a/apps/token/src/routes/governance/components/propose/proposal-form-terms.spec.tsx +++ b/apps/token/src/routes/governance/components/propose/proposal-form-terms.spec.tsx @@ -28,20 +28,13 @@ describe('Proposal Form Terms', () => { expect(screen.getByText('Error text')).toBeInTheDocument(); }); - it('should render the generic docs link if no custom override', () => { - renderComponent(); - expect( - screen.getByText('https://docs.vega.xyz/tutorials/proposals') - ).toBeInTheDocument(); - }); - - it('should render the custom docs link if provided', () => { + it('should render the docs link', () => { const register = jest.fn(); render( ); expect( diff --git a/apps/token/src/routes/governance/components/propose/proposal-form-terms.tsx b/apps/token/src/routes/governance/components/propose/proposal-form-terms.tsx index d2fd4c404..0ffb259f1 100644 --- a/apps/token/src/routes/governance/components/propose/proposal-form-terms.tsx +++ b/apps/token/src/routes/governance/components/propose/proposal-form-terms.tsx @@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'; import { FormGroup, InputError, - Link, + ExternalLink, TextArea, } from '@vegaprotocol/ui-toolkit'; import { useEnvironment } from '@vegaprotocol/environment'; @@ -12,14 +12,14 @@ interface ProposalFormTermsProps { registerField: UseFormRegisterReturn<'proposalTerms'>; errorMessage: string | undefined; labelOverride?: string; - customDocLink?: string; + docsLink?: string; } export const ProposalFormTerms = ({ registerField: register, errorMessage, labelOverride, - customDocLink, + docsLink, }: ProposalFormTermsProps) => { const { VEGA_DOCS_URL } = useEnvironment(); const { t } = useTranslation(); @@ -28,13 +28,13 @@ export const ProposalFormTerms = ({ label={labelOverride || t('ProposalTerms')} labelFor="proposal-terms" > - {VEGA_DOCS_URL && ( + {docsLink && VEGA_DOCS_URL && (
{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${customDocLink || ''}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${docsLink}`}
)} diff --git a/apps/token/src/routes/governance/propose/freeform/propose-freeform.tsx b/apps/token/src/routes/governance/propose/freeform/propose-freeform.tsx index 20c8f383d..932cec2b7 100644 --- a/apps/token/src/routes/governance/propose/freeform/propose-freeform.tsx +++ b/apps/token/src/routes/governance/propose/freeform/propose-freeform.tsx @@ -15,7 +15,7 @@ import { ProposalFormVoteAndEnactmentDeadline, } from '../../components/propose'; import { ProposalMinRequirements } from '../../components/shared'; -import { AsyncRenderer, Link } from '@vegaprotocol/ui-toolkit'; +import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit'; import { Heading } from '../../../../components/heading'; import { VegaWalletContainer } from '../../../../components/vega-wallet-container'; import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers'; @@ -88,20 +88,20 @@ export const ProposeFreeform = () => { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals/${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals/${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreProposalsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/governance`} + >{`${VEGA_EXPLORER_URL}/governance`}

)} diff --git a/apps/token/src/routes/governance/propose/network-parameter/propose-network-parameter.tsx b/apps/token/src/routes/governance/propose/network-parameter/propose-network-parameter.tsx index b451e612b..4a8d0d5cf 100644 --- a/apps/token/src/routes/governance/propose/network-parameter/propose-network-parameter.tsx +++ b/apps/token/src/routes/governance/propose/network-parameter/propose-network-parameter.tsx @@ -23,10 +23,10 @@ import { import { ProposalMinRequirements } from '../../components/shared'; import { AsyncRenderer, + ExternalLink, FormGroup, Input, InputError, - Link, Select, SyntaxHighlighter, TextArea, @@ -155,20 +155,20 @@ export const ProposeNetworkParameter = () => { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreNetParamsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/network-parameters`} + >{`${VEGA_EXPLORER_URL}/network-parameters`}

)} diff --git a/apps/token/src/routes/governance/propose/new-asset/propose-new-asset.tsx b/apps/token/src/routes/governance/propose/new-asset/propose-new-asset.tsx index 2f2679477..f81098084 100644 --- a/apps/token/src/routes/governance/propose/new-asset/propose-new-asset.tsx +++ b/apps/token/src/routes/governance/propose/new-asset/propose-new-asset.tsx @@ -23,7 +23,7 @@ import { ProposalFormVoteAndEnactmentDeadline, } from '../../components/propose'; import { ProposalMinRequirements } from '../../components/shared'; -import { AsyncRenderer, Link } from '@vegaprotocol/ui-toolkit'; +import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit'; import { Heading } from '../../../../components/heading'; import { VegaWalletContainer } from '../../../../components/vega-wallet-container'; import { ProposalUserAction } from '../../components/shared'; @@ -117,20 +117,20 @@ export const ProposeNewAsset = () => { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreAssetsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/assets`} + >{`${VEGA_EXPLORER_URL}/assets`}

)} @@ -163,7 +163,7 @@ export const ProposeNewAsset = () => { })} labelOverride={'Terms.newAsset (JSON format)'} errorMessage={errors?.proposalTerms?.message} - customDocLink={DOCS_LINK} + docsLink={DOCS_LINK} /> { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreMarketsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/markets`} + >{`${VEGA_EXPLORER_URL}/markets`}

)} @@ -158,7 +158,7 @@ export const ProposeNewMarket = () => { })} labelOverride={'Terms.newMarket (JSON format)'} errorMessage={errors?.proposalTerms?.message} - customDocLink={DOCS_LINK} + docsLink={DOCS_LINK} /> { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals`} + >{`${VEGA_DOCS_URL}/tutorials/proposals`}

)} {VEGA_EXPLORER_URL && (

{t('MoreProposalsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/governance`} + >{`${VEGA_EXPLORER_URL}/governance`}

)} diff --git a/apps/token/src/routes/governance/propose/raw/propose-raw.tsx b/apps/token/src/routes/governance/propose/raw/propose-raw.tsx index 32d12557d..528721bad 100644 --- a/apps/token/src/routes/governance/propose/raw/propose-raw.tsx +++ b/apps/token/src/routes/governance/propose/raw/propose-raw.tsx @@ -5,9 +5,9 @@ import { Heading } from '../../../../components/heading'; import { VegaWalletContainer } from '../../../../components/vega-wallet-container'; import { AsyncRenderer, + ExternalLink, FormGroup, InputError, - Link, TextArea, } from '@vegaprotocol/ui-toolkit'; import { @@ -87,20 +87,20 @@ export const ProposeRaw = () => { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals`} + >{`${VEGA_DOCS_URL}/tutorials/proposals`}

)} {VEGA_EXPLORER_URL && (

{t('MoreProposalsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/governance`} + >{`${VEGA_EXPLORER_URL}/governance`}

)} diff --git a/apps/token/src/routes/governance/propose/update-asset/propose-update-asset.tsx b/apps/token/src/routes/governance/propose/update-asset/propose-update-asset.tsx index 66fe3d156..54275e74c 100644 --- a/apps/token/src/routes/governance/propose/update-asset/propose-update-asset.tsx +++ b/apps/token/src/routes/governance/propose/update-asset/propose-update-asset.tsx @@ -22,7 +22,7 @@ import { ProposalFormVoteAndEnactmentDeadline, } from '../../components/propose'; import { ProposalMinRequirements } from '../../components/shared'; -import { AsyncRenderer, Link } from '@vegaprotocol/ui-toolkit'; +import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit'; import { Heading } from '../../../../components/heading'; import { VegaWalletContainer } from '../../../../components/vega-wallet-container'; import { ProposalUserAction } from '../../components/shared'; @@ -112,20 +112,20 @@ export const ProposeUpdateAsset = () => { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreAssetsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/assets`} + >{`${VEGA_EXPLORER_URL}/assets`}

)} @@ -160,7 +160,7 @@ export const ProposeUpdateAsset = () => { })} labelOverride={'Terms.updateAsset (JSON format)'} errorMessage={errors?.proposalTerms?.message} - customDocLink={DOCS_LINK} + docsLink={DOCS_LINK} /> { {VEGA_DOCS_URL && (

{t('ProposalTermsText')} - {`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`} + >{`${VEGA_DOCS_URL}/tutorials/proposals${DOCS_LINK}`}

)} {VEGA_EXPLORER_URL && (

{t('MoreMarketsInfo')}{' '} - {`${VEGA_EXPLORER_URL}/markets`} + >{`${VEGA_EXPLORER_URL}/markets`}

)} @@ -277,7 +277,7 @@ export const ProposeUpdateMarket = () => { })} labelOverride={t('ProposeUpdateMarketTerms')} errorMessage={errors?.proposalTerms?.message} - customDocLink={DOCS_LINK} + docsLink={DOCS_LINK} />