From 22c2e49a98bf497653a0cb021e1020e02cf6b5f2 Mon Sep 17 00:00:00 2001 From: sam-keen Date: Wed, 7 Sep 2022 12:35:49 +0100 Subject: [PATCH] Feat/800: Improved way to pass docs url --- apps/token/.env.devnet | 2 +- apps/token/.env.mainnet | 2 +- apps/token/.env.stagnet3 | 2 +- apps/token/.env.testnet | 2 +- apps/token/src/config/env.ts | 3 ++- .../governance/components/propose/proposal-form-terms.tsx | 5 +++-- apps/token/src/routes/governance/propose/propose.tsx | 5 +++-- libs/environment/src/utils/compile-environment.ts | 2 ++ libs/environment/src/utils/validate-environment.ts | 1 + 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/token/.env.devnet b/apps/token/.env.devnet index fea193898..c6cacfa0b 100644 --- a/apps/token/.env.devnet +++ b/apps/token/.env.devnet @@ -8,4 +8,4 @@ NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz -NX_DOCS_URL=https://docs.vega.xyz/docs/testnet +NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet diff --git a/apps/token/.env.mainnet b/apps/token/.env.mainnet index e5d58abe2..ed828c268 100644 --- a/apps/token/.env.mainnet +++ b/apps/token/.env.mainnet @@ -8,4 +8,4 @@ NX_ETHERSCAN_URL=https://etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_REST=https://api.token.vega.xyz/ NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz -NX_DOCS_URL=https://docs.vega.xyz/docs/mainnet +NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/mainnet diff --git a/apps/token/.env.stagnet3 b/apps/token/.env.stagnet3 index 411ff586e..76e0b5b31 100644 --- a/apps/token/.env.stagnet3 +++ b/apps/token/.env.stagnet3 @@ -8,7 +8,7 @@ NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json NX_VEGA_EXPLORER_URL=https://staging3.explorer.vega.xyz -NX_DOCS_URL=https://docs.vega.xyz/docs/mainnet +NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/mainnet # App flags NX_EXPLORER_ASSETS=1 diff --git a/apps/token/.env.testnet b/apps/token/.env.testnet index cb6c70cbf..17a65e6a2 100644 --- a/apps/token/.env.testnet +++ b/apps/token/.env.testnet @@ -8,4 +8,4 @@ NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_REST=https://api.n11.testnet.vega.xyz NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf -NX_DOCS_URL=https://docs.vega.xyz/docs/testnet +NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet diff --git a/apps/token/src/config/env.ts b/apps/token/src/config/env.ts index d5ede1140..f88c84d1c 100644 --- a/apps/token/src/config/env.ts +++ b/apps/token/src/config/env.ts @@ -52,8 +52,9 @@ export const ENV = { branch: windowOrDefault('NX_BRANCH'), vegaUrl: windowOrDefault('NX_VEGA_URL'), restUrl: windowOrDefault('NX_VEGA_REST'), + explorerUrl: windowOrDefault('NX_VEGA_EXPLORER'), urlConnect: TRUTHY.includes(windowOrDefault('NX_ETH_URL_CONNECT')), - docsUrl: windowOrDefault('NX_DOCS_URL'), + docsUrl: windowOrDefault('NX_VEGA_DOCS_URL'), ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'), localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'), flags: { 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 fa1522239..50b18dcd7 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 @@ -1,6 +1,6 @@ import { useTranslation } from 'react-i18next'; import { FormGroup, InputError, TextArea } from '@vegaprotocol/ui-toolkit'; -import { ENV } from '../../../../config'; +import { useEnvironment } from '@vegaprotocol/environment'; import { ProposalDocsLink } from './proposal-docs-link'; import type { UseFormRegisterReturn } from 'react-hook-form'; @@ -15,6 +15,7 @@ export const ProposalFormTerms = function ({ errorMessage, labelOverride, }: ProposalFormTermsProps) { + const { VEGA_DOCS_URL } = useEnvironment(); const { t } = useTranslation(); return (
- + {VEGA_DOCS_URL && }