fix(ui-ux): fully disable send to evm (#4138)

* fix(ui-ux): fully disable send to evm * change error message for evm address * change error message for evm address
BirthdayResearch · Nov 21, 2023 · e0d2511 · e0d2511
1 parent 5b63897
commit e0d2511
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/AddressRow.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/AddressRow.tsx
@@ -68,7 +68,7 @@ export function AddressRow({
   setAddressLabel?: React.Dispatch<React.SetStateAction<string | undefined>>;
 }): JSX.Element {
   const { fetchWalletAddresses } = useWalletAddress();
-  const { domain } = useDomainContext();
+  const { domain, isEvmFeatureEnabled } = useDomainContext();
 
   const defaultValue = "";
 
@@ -134,6 +134,7 @@ export function AddressRow({
         if (onlyLocalAddress) {
           setAddressType(undefined);
         } else if (
+          isEvmFeatureEnabled &&
           getAddressType(address, networkName) === JellyfishAddressType.ETH
         ) {
           // Unsaved and valid EVM address
@@ -267,14 +268,27 @@ export function AddressRow({
         rules={{
           required: true,
           validate: {
-            isValidAddress: (address) =>
-              // Check if its either a valid EVM/DVM address &&
-              !!getAddressType(address, networkName) &&
-              // EVM -> EVM domain transfer is not allowed
-              !(
-                getAddressType(address, networkName) ===
-                  JellyfishAddressType.ETH && domain === DomainType.EVM
-              ),
+            isValidAddress: (address) => {
+              const addressType = getAddressType(address, networkName);
+
+              // Check if address is EVM and feature flag is enabled
+              if (
+                !isEvmFeatureEnabled &&
+                addressType === JellyfishAddressType.ETH
+              ) {
+                return false;
+              }
+
+              return (
+                // Check if its either a valid EVM/DVM address &&
+                !!addressType &&
+                // EVM -> EVM domain transfer is not allowed
+                !(
+                  addressType === JellyfishAddressType.ETH &&
+                  domain === DomainType.EVM
+                )
+              );
+            },
           },
         }}
       />

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendScreen.tsx
@@ -517,7 +517,8 @@ export function SendScreen({ route, navigation }: Props): JSX.Element {
               !formState.isValid ||
               hasPendingJob ||
               hasPendingBroadcastJob ||
-              token === undefined
+              token === undefined ||
+              (isEvmAddress && !isEvmFeatureEnabled)
             }
             label={translate("screens/SendScreen", "Continue")}
             onSubmit={onSubmit}