From 5058eead2ffa6bf6dc8255c58e273a35e8fc99b5 Mon Sep 17 00:00:00 2001
From: nrjsuthar <neerajsuthar@bitgo.com>
Date: Thu, 19 Sep 2024 12:59:42 +0530
Subject: [PATCH] feat(avaxc): add support for evm ccr

feat(avaxc): add support for evm ccr
TICKET-1708
---
 .../EvmCrossChainRecoveryWallet/ColdWalletForm.tsx          | 2 +-
 .../EvmCrossChainRecoveryBaseForm.tsx                       | 6 +++---
 .../EvmCrossChainRecoveryWallet.tsx                         | 2 +-
 .../EvmCrossChainRecoveryWallet/HotWalletForm.tsx           | 2 +-
 src/helpers/index.ts                                        | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/containers/EvmCrossChainRecoveryWallet/ColdWalletForm.tsx b/src/containers/EvmCrossChainRecoveryWallet/ColdWalletForm.tsx
index 979e046a..ecd16b56 100644
--- a/src/containers/EvmCrossChainRecoveryWallet/ColdWalletForm.tsx
+++ b/src/containers/EvmCrossChainRecoveryWallet/ColdWalletForm.tsx
@@ -11,7 +11,7 @@ const validationSchema = Yup.object({
   userKeyId: Yup.string(),
   walletContractAddress: Yup.string().required(),
   tokenContractAddress: Yup.string(),
-  apiKey: Yup.string().required(),
+  apiKey: Yup.string(),
   wrongChain: Yup.string().required(),
   intendedChain: Yup.string().required(),
 }).required();
diff --git a/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryBaseForm.tsx b/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryBaseForm.tsx
index b7011f99..e94a5a20 100644
--- a/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryBaseForm.tsx
+++ b/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryBaseForm.tsx
@@ -8,8 +8,7 @@ import {
   CoinMetadata,
   allWalletMetas,
 } from '~/helpers/config';
-import { BitgoEnv, isBscChain, safeEnv } from '~/helpers';
-import { allCoinMetas } from '~/helpers/config';
+import { BitgoEnv, isAvaxcCoin, safeEnv } from '~/helpers';
 
 export function EvmCrossChainRecoveryBaseForm({
   formik,
@@ -34,6 +33,7 @@ export function EvmCrossChainRecoveryBaseForm({
       {`${coin.Title}: ${coin.Description}`}
     </option>
   ));
+
   wrongChainCoinsChildren.unshift(
     <option disabled selected value="">
       {' '}
@@ -128,7 +128,7 @@ export function EvmCrossChainRecoveryBaseForm({
           Width="fill"
         />
       </div>
-      {!isCustodyWallet && (
+      {!isCustodyWallet && !isAvaxcCoin(wrongChain) &&(
         <div className="tw-mb-4">
           <FormikTextfield
             HelperText="An Api-Key Token required for the explorer."
diff --git a/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryWallet.tsx b/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryWallet.tsx
index d5dda0ff..b7a8f8d9 100644
--- a/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryWallet.tsx
+++ b/src/containers/EvmCrossChainRecoveryWallet/EvmCrossChainRecoveryWallet.tsx
@@ -42,7 +42,7 @@ interface CustodyWalletParams extends BaseParams {
 interface NonCustodyWalletParams extends BaseParams {
   walletContractAddress: string;
   bitgoFeeAddress: string;
-  apiKey: string;
+  apiKey?: string;
 }
 
 interface HotWalletParams extends NonCustodyWalletParams {
diff --git a/src/containers/EvmCrossChainRecoveryWallet/HotWalletForm.tsx b/src/containers/EvmCrossChainRecoveryWallet/HotWalletForm.tsx
index 271515d3..9429ebf8 100644
--- a/src/containers/EvmCrossChainRecoveryWallet/HotWalletForm.tsx
+++ b/src/containers/EvmCrossChainRecoveryWallet/HotWalletForm.tsx
@@ -11,7 +11,7 @@ const validationSchema = Yup.object({
   walletContractAddress: Yup.string().required(),
   walletPassphrase: Yup.string().required(),
   tokenContractAddress: Yup.string(),
-  apiKey: Yup.string().required(),
+  apiKey: Yup.string(),
   wrongChain: Yup.string().required(),
   intendedChain: Yup.string().required(),
 }).required();
diff --git a/src/helpers/index.ts b/src/helpers/index.ts
index 3604c9c1..362afccf 100644
--- a/src/helpers/index.ts
+++ b/src/helpers/index.ts
@@ -274,3 +274,8 @@ export function getEip1559Params(coin: string, maxFeePerGas: number, maxPriority
     maxPriorityFeePerGas: toWei(maxPriorityFeePerGas),
   }
 }
+
+
+export function isAvaxcCoin(chainName: string) {
+  return (chainName === 'tavaxc' || chainName === 'avaxc') ;
+}