act based on PactIc and not senderAccount

kadena-community · Nov 9, 2023 · 2e36857 · 2e36857
1 parent ce61864
commit 2e36857
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/...ages/apps/graph-client/src/components/compact-transfers-table/compact-transfers-table.tsx b/...ages/apps/graph-client/src/components/compact-transfers-table/compact-transfers-table.tsx
@@ -56,9 +56,9 @@ export const CompactTransfersTable = (
         </Table.Head>
         <Table.Body>
           {transfers.edges.map((edge, index) => {
-            // This way we avoid repeated transfers
-            // These transfers are going to be added to their crosschain counterpart
-            if (!edge?.node.senderAccount) {
+            /**  These transfers are going to be added to their crosschain counterpart and
+             this way we avoid repeated transfers in the table */
+            if (!chainId && edge?.node.transaction?.pactId) {
               return <></>;
             }
 

diff --git a/packages/apps/graph-client/src/graphql/queries.graph.ts b/packages/apps/graph-client/src/graphql/queries.graph.ts
@@ -103,6 +103,9 @@ export const getAccount: DocumentNode = gql`
             crossChainTransfer {
               ...CoreTransferFields
             }
+            transaction {
+              pactId
+            }
           }
         }
       }
@@ -140,6 +143,9 @@ export const getChainAccount: DocumentNode = gql`
             crossChainTransfer {
               ...CoreTransferFields
             }
+            transaction {
+              pactId
+            }
           }
         }
       }
@@ -228,6 +234,9 @@ export const getTransfers: DocumentNode = gql`
           crossChainTransfer {
             ...CoreTransferFields
           }
+          transaction {
+            pactId
+          }
         }
       }
     }

diff --git a/packages/apps/graph-client/src/pages/account/transfers/[module]/[account].tsx b/packages/apps/graph-client/src/pages/account/transfers/[module]/[account].tsx
@@ -116,9 +116,9 @@ const AccountTransfers: React.FC = () => {
                 </Table.Head>
                 <Table.Body>
                   {data.transfers.edges.map((edge, index) => {
-                    // This way we avoid repeated transfers
-                    // These transfers are going to be added to their crosschain counterpart
-                    if (!edge?.node.senderAccount) {
+                    /**  These transfers are going to be added to their crosschain counterpart and
+                     this way we avoid repeated transfers in the table */
+                    if (edge?.node.transaction?.pactId) {
                       return <></>;
                     }
 
@@ -149,7 +149,7 @@ const AccountTransfers: React.FC = () => {
                             >
                               {edge?.node.receiverAccount}
                             </Link>
-                          ) : edge.node.crossChainTransfer?.receiverAccount ? (
+                          ) : edge?.node.crossChainTransfer?.receiverAccount ? (
                             <Link
                               href={`${routes.ACCOUNT}/${router.query.module}/${edge?.node.crossChainTransfer.receiverAccount}`}
                             >