Merge pull request #516 from bitpay/revert-513-fix/contactName

Revert "[FIX] get contact name function"
bitpay · Oct 28, 2022 · 5fe7c8c · 5fe7c8c
2 parents 85efb68 + 66e697c
commit 5fe7c8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/navigation/wallet/components/MultipleOutputsTx.tsx b/src/navigation/wallet/components/MultipleOutputsTx.tsx
@@ -116,7 +116,7 @@ const MultipleOutputsTx = ({tx}: {tx: any}) => {
     output.addressToShow =
       addressToShow === 'false' ? t('Unparsed address') : addressToShow;
 
-    output.contactName = GetContactName(outputAddr, chain, contactList);
+    output.contactName = GetContactName(outputAddr, contactList);
   });
 
   const getDesc = () => {

diff --git a/src/store/wallet/effects/transactions/transactions.ts b/src/store/wallet/effects/transactions/transactions.ts
@@ -546,15 +546,13 @@ export const EditTxNote = (wallet: Wallet, args: NoteArgs): Promise<any> => {
 
 export const GetContactName = (
   address: string | undefined,
-  chain: string,
   contactList: any[] = [],
 ) => {
   if (!address || !contactList.length) {
     return null;
   }
   const existsContact = contactList.find(
-    contact =>
-      contact.address === address && contact.chain === chain.toLowerCase(),
+    contact => contact.address === address,
   );
   if (existsContact) {
     return existsContact.name;
@@ -625,7 +623,6 @@ export const BuildUiFriendlyList = (
       note,
       message,
       creatorName,
-      chain,
     } = transaction || {};
     const {
       service: customDataService,
@@ -640,9 +637,9 @@ export const BuildUiFriendlyList = (
     if (
       contactList?.length &&
       outputs?.length &&
-      GetContactName(outputs[0]?.address, chain, contactList)
+      GetContactName(outputs[0]?.address, contactList)
     ) {
-      contactName = GetContactName(outputs[0]?.address, chain, contactList);
+      contactName = GetContactName(outputs[0]?.address, contactList);
     }
 
     const isSent = IsSent(action);