fix: polygon network configurations issue (#790)

Signed-off-by: bhavanakarwade <[email protected]>
credebl · Oct 21, 2024 · 8179d60 · 8179d60
1 parent 48c1d5b
commit 8179d60
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,3 +1,4 @@
+PUBLIC_MODE= 
 PUBLIC_BASE_URL=
 PUBLIC_CRYPTO_PRIVATE_KEY=
 

diff --git a/src/common/enums.ts b/src/common/enums.ts
@@ -145,4 +145,10 @@ export enum RequestType {
 export enum ProofType {
 	polygon = 'EcdsaSecp256k1Signature2019',
 	no_ledger = 'Ed25519Signature2018'
+}
+
+export enum Environment {
+	PROD = 'PROD',
+	DEV = 'DEV',
+	QA = 'QA'
 }
diff --git a/src/components/organization/walletCommonComponents/DedicatedAgent.tsx b/src/components/organization/walletCommonComponents/DedicatedAgent.tsx
@@ -11,7 +11,7 @@ import {
 	getLedgerConfig,
 	getLedgers
 } from '../../../api/Agent';
-import { DidMethod, Ledgers, Network} from '../../../common/enums';
+import { DidMethod, Environment, Ledgers, Network} from '../../../common/enums';
 import type { IDedicatedAgentForm, ILedgerConfigData, ILedgerItem, IValuesShared, IDedicatedAgentData} from './interfaces';
 import { getFromLocalStorage } from '../../../api/Auth';
 import CopyDid from '../../../commonComponents/CopyDid';
@@ -20,6 +20,7 @@ import SetPrivateKeyValueInput from './SetPrivateKeyValue';
 import { getOrganizationById, setAgentConfigDetails } from '../../../api/organization';
 import type { IDedicatedAgentConfig} from '../interfaces';
 import React from 'react';
+import { envConfig } from '../../../config/envConfig';
 
 const RequiredAsterisk = () => <span className="text-xs text-red-500">*</span>
 
@@ -236,12 +237,14 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 		return null;
 	}
 
-	let filteredNetworks = Object.keys(networks);
-	if (selectedMethod === DidMethod.POLYGON) {
-		filteredNetworks = filteredNetworks.filter(network => network === Network.TESTNET);
+	let filterNetworks = Object.keys(networks);
+	if (envConfig.MODE === Environment.PROD && selectedMethod === DidMethod.POLYGON) {
+		filterNetworks = filterNetworks.filter(network => network === Network.MAINNET);
+	} else if (envConfig.MODE === Environment.DEV || Environment.QA && selectedMethod === DidMethod.POLYGON) {
+		filterNetworks = filterNetworks.filter(network => network === Network.TESTNET);
 	}
 
-	return filteredNetworks.map((network) => (
+	return filterNetworks.map((network) => (
 		<div key={network} className="mt-2">
 			<input
 				type="radio"

diff --git a/src/components/organization/walletCommonComponents/SharedAgent.tsx b/src/components/organization/walletCommonComponents/SharedAgent.tsx
@@ -6,11 +6,12 @@ import { apiStatusCodes } from "../../../config/CommonConstant";
 import * as yup from 'yup';
 import type { AxiosResponse } from 'axios';
 import CopyDid from '../../../commonComponents/CopyDid';
-import { DidMethod, Ledgers, Network } from '../../../common/enums';
+import { DidMethod, Environment, Ledgers, Network } from '../../../common/enums';
 import SetDomainValueInput from './SetDomainValueInput';
 import SetPrivateKeyValueInput from './SetPrivateKeyValue';
 import type { ISharedAgentForm, IValuesShared } from "./interfaces";
 import React from "react";
+import { envConfig } from "../../../config/envConfig";
 interface IDetails {
     [key: string]: string | { [subKey: string]: string };
 }
@@ -211,8 +212,10 @@ const SharedAgentForm = ({
 		}
 
 		let filteredNetworks = Object.keys(networks);
-		if (selectedMethod === DidMethod.POLYGON) {
+		if (envConfig.MODE === Environment.PROD && selectedMethod === DidMethod.POLYGON) {
 			filteredNetworks = filteredNetworks.filter(network => network === Network.MAINNET);
+		} else if (envConfig.MODE === Environment.DEV || Environment.QA && selectedMethod === DidMethod.POLYGON) {
+			filteredNetworks = filteredNetworks.filter(network => network === Network.TESTNET);
 		}
 
 		return filteredNetworks.map((network) => (

diff --git a/src/config/envConfig.ts b/src/config/envConfig.ts
@@ -17,7 +17,7 @@ if (import.meta.env) {
 	}
 }
 
-const { PUBLIC_BASE_URL, PUBLIC_ECOSYSTEM_FRONT_END_URL, PUBLIC_POLYGON_TESTNET_URL, PUBLIC_POLYGON_MAINNET_URL, PUBLIC_CRYPTO_PRIVATE_KEY,PUBLIC_SHOW_NAME_AS_LOGO, PUBLIC_PLATFORM_NAME, PUBLIC_PLATFORM_LOGO, PUBLIC_POWERED_BY, PUBLIC_PLATFORM_WEB_URL, PUBLIC_POWERED_BY_URL, PUBLIC_PLATFORM_DOCS_URL, PUBLIC_PLATFORM_GIT, PUBLIC_PLATFORM_SUPPORT_EMAIL, PUBLIC_PLATFORM_TWITTER_URL, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET, PUBLIC_PLATFORM_SUPPORT_INVITE, PUBLIC_PLATFORM_DISCORD_URL, PUBLIC_ALLOW_DOMAIN, PUBLIC_ECOSYSTEM_BASE_URL }: any = envVariables;
+const { PUBLIC_BASE_URL, PUBLIC_ECOSYSTEM_FRONT_END_URL, PUBLIC_POLYGON_TESTNET_URL, PUBLIC_POLYGON_MAINNET_URL, PUBLIC_CRYPTO_PRIVATE_KEY,PUBLIC_SHOW_NAME_AS_LOGO, PUBLIC_PLATFORM_NAME, PUBLIC_PLATFORM_LOGO, PUBLIC_POWERED_BY, PUBLIC_PLATFORM_WEB_URL, PUBLIC_POWERED_BY_URL, PUBLIC_PLATFORM_DOCS_URL, PUBLIC_PLATFORM_GIT, PUBLIC_PLATFORM_SUPPORT_EMAIL, PUBLIC_PLATFORM_TWITTER_URL, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET, PUBLIC_PLATFORM_SUPPORT_INVITE, PUBLIC_PLATFORM_DISCORD_URL, PUBLIC_ALLOW_DOMAIN, PUBLIC_ECOSYSTEM_BASE_URL, PUBLIC_MODE }: any = envVariables;
 
 export const envConfig = {
 	PUBLIC_BASE_URL:
@@ -73,5 +73,6 @@ export const envConfig = {
 		    PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET ||
 			import.meta.env.PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET,
 	},
-	PUBLIC_ALLOW_DOMAIN: PUBLIC_ALLOW_DOMAIN || import.meta.env.PUBLIC_ALLOW_DOMAIN
+	PUBLIC_ALLOW_DOMAIN: PUBLIC_ALLOW_DOMAIN || import.meta.env.PUBLIC_ALLOW_DOMAIN,
+	MODE: PUBLIC_MODE
 }