updates

bitpay · Apr 14, 2023 · bba756a · bba756a
1 parent 08fc635
commit bba756a
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 25 deletions.
diff --git a/src/components/list/ContactRow.tsx b/src/components/list/ContactRow.tsx
@@ -30,7 +30,7 @@ const RowContainer = styled.View`
   align-items: center;
 `;
 
-export type DomainType = 'ens' | 'unstoppable';
+export type DomainType = 'ENSDomain' | 'UnstoppableDomain';
 
 export interface ContactRowProps {
   address: string;

diff --git a/src/navigation/tabs/contacts/components/ContactIcon.tsx b/src/navigation/tabs/contacts/components/ContactIcon.tsx
@@ -53,7 +53,7 @@ const CoinBadge: React.FC<BadgeProps> = ({
   return (
     <CoinBadgeContainer>
       {domainType ? (
-        domainType === 'ens' ? (
+        domainType === 'ENSDomain' ? (
           <ENSDomainIcon size={size} />
         ) : (
           <UnstoppableDomainIcon size={size} />

diff --git a/src/navigation/tabs/contacts/screens/ContactsAdd.tsx b/src/navigation/tabs/contacts/screens/ContactsAdd.tsx
@@ -26,7 +26,10 @@ import {
   SearchInput,
   Column,
 } from '../../../../components/styled/Containers';
-import {ValidateCoinAddress} from '../../../../store/wallet/utils/validations';
+import {
+  ValidateCoinAddress,
+  ValidateURI,
+} from '../../../../store/wallet/utils/validations';
 import {GetCoinAndNetwork} from '../../../../store/wallet/effects/address/address';
 import {
   ContactRowProps,
@@ -396,7 +399,8 @@ const ContactsAdd = ({
           }
         }
       } else {
-        processDomain({domain: address});
+        const data = ValidateURI(address);
+        processDomain({data});
       }
     } else {
       resetValues();
@@ -405,30 +409,35 @@ const ContactsAdd = ({
 
   const processDomain = useMemo(
     () =>
-      debounce(async ({domain}: {domain: string}) => {
+      debounce(async ({data}: {data: any}) => {
         try {
-          if (!domain) {
+          if (!data.data) {
             return;
           }
-          const addressByENS = await dispatch(getAddressByENSDomain({domain}));
-          const addressByUnstoppableDomain = await dispatch(
-            getAddressByUnstoppableDomain({domain}),
-          );
-
-          if (addressByENS) {
-            setValidDomain(true);
-            processAddressOrDomain({
-              address: addressByENS,
-              domain,
-              domainType: 'ens',
-            });
-          } else if (addressByUnstoppableDomain) {
-            setValidDomain(true);
-            processAddressOrDomain({
-              address: addressByUnstoppableDomain,
-              domain,
-              domainType: 'unstoppable',
-            });
+          if (data.type === 'UnstoppableDomain') {
+            const addressByUnstoppableDomain = await dispatch(
+              getAddressByUnstoppableDomain({domain: data.data}),
+            );
+            if (addressByUnstoppableDomain) {
+              setValidDomain(true);
+              processAddressOrDomain({
+                address: addressByUnstoppableDomain,
+                domain: data.data,
+                domainType: data.type,
+              });
+            }
+          } else if (data.type === 'ENSDomain') {
+            const addressByENS = await dispatch(
+              getAddressByENSDomain({domain: data.data}),
+            );
+            if (addressByENS) {
+              setValidDomain(true);
+              processAddressOrDomain({
+                address: addressByENS,
+                domain: data.data,
+                domainType: data.type,
+              });
+            }
           } else {
             resetValues();
           }

diff --git a/src/store/moralis/moralis.constants.ts b/src/store/moralis/moralis.constants.ts
@@ -0,0 +1,14 @@
+export const UnstoppableDomains = [
+  '.crypto',
+  '.nft',
+  '.x',
+  '.wallet',
+  '.polygon',
+  '.dao',
+  '.888',
+  '.zil',
+  '.blockchain',
+  '.bitcoin',
+];
+
+export const ENSDomains = ['.eth'];
diff --git a/src/store/wallet/utils/validations.ts b/src/store/wallet/utils/validations.ts
@@ -1,4 +1,5 @@
 import {BwcProvider} from '../../../lib/bwc';
+import {ENSDomains, UnstoppableDomains} from '../../moralis/moralis.constants';
 import {ExtractBitPayUriAddress} from './decode-uri';
 
 const BWC = BwcProvider.getInstance();
@@ -199,6 +200,14 @@ export const CheckIfLegacyBCH = (address: string): boolean => {
   );
 };
 
+export const IsValidUnstoppableDomain = (domain: string): boolean => {
+  return UnstoppableDomains.some(item => domain.endsWith(item));
+};
+
+export const IsValidENSDomain = (domain: string): boolean => {
+  return ENSDomains.some(item => domain.endsWith(item));
+};
+
 export const ValidateURI = (data: string): any => {
   if (!data) {
     return;
@@ -348,6 +357,22 @@ export const ValidateURI = (data: string): any => {
     };
   }
 
+  if (IsValidUnstoppableDomain(data)) {
+    return {
+      data,
+      type: 'UnstoppableDomain',
+      title: 'Unstoppable Domain',
+    };
+  }
+
+  if (IsValidENSDomain(data)) {
+    return {
+      data,
+      type: 'ENSDomain',
+      title: 'ENS Domain',
+    };
+  }
+
   return;
 };