From 22f33d554763cffcefd2d6eff9741a0a41309e88 Mon Sep 17 00:00:00 2001
From: Nelito Junior <ngvjqp@gmail.com>
Date: Thu, 23 Jan 2025 16:33:34 -0300
Subject: [PATCH] simplify

---
 .../TxOperationsSimple/TxOperationDrawer.tsx  |   2 +-
 .../TxOperationsSimple/TxOperationsList.tsx   |  11 +-
 .../TxViewSimple/TxOperationsSimple/index.ts  |   1 -
 .../operations/TxOperation.tsx                | 110 ++++++++++++++++++
 4 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/operations/TxOperation.tsx

diff --git a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationDrawer.tsx b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationDrawer.tsx
index 295550a9f..1ad26bb47 100644
--- a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationDrawer.tsx
+++ b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationDrawer.tsx
@@ -39,7 +39,7 @@ export function TxOperationDrawer({
                 Function: {operation.metadata.functionName}
               </Text>
             )}
-            <Text fontSize="sm">Contract: {operation.to}</Text>
+            <Text fontSize="sm">{operation.to}</Text>
             {operation.metadata?.operationCount && (
               <Text fontSize="sm">
                 Total Calls: {operation.metadata.operationCount}
diff --git a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationsList.tsx b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationsList.tsx
index 0c85a871a..7ba885b06 100644
--- a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationsList.tsx
+++ b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/TxOperationsList.tsx
@@ -1,9 +1,7 @@
 import { Box } from '@fuel-ui/react';
 import { useMemo } from 'react';
 import type { SimplifiedOperation } from '../../../types';
-import { TxCategory } from '../../../types';
-import { TxOperationContract } from './operations/TxOperationContract';
-import { TxOperationTransfer } from './operations/TxOperationTransfer';
+import { TxOperation } from './operations/TxOperation';
 
 type TxOperationsListProps = {
   operations: SimplifiedOperation[];
@@ -14,12 +12,7 @@ export function TxOperationsList({ operations }: TxOperationsListProps) {
     return operations.map((operation, index) => {
       console.log('Rendering operation:', operation);
       const key = `${operation.type}-${operation.from}-${operation.to}-${index}`;
-
-      if (operation.type === TxCategory.SEND) {
-        return <TxOperationTransfer key={key} operation={operation} />;
-      }
-
-      return <TxOperationContract key={key} operation={operation} />;
+      return <TxOperation key={key} operation={operation} />;
     });
   }, [operations]);
 
diff --git a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/index.ts b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/index.ts
index ecb55f59a..3e3002428 100644
--- a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/index.ts
+++ b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/index.ts
@@ -1,4 +1,3 @@
 export * from './TxOperationDrawer';
 export * from './TxOperationHeader';
-export * from './TxOperationSend';
 export * from './utils';
diff --git a/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/operations/TxOperation.tsx b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/operations/TxOperation.tsx
new file mode 100644
index 000000000..e1d414e6b
--- /dev/null
+++ b/packages/app/src/systems/Transaction/components/TxViewSimple/TxOperationsSimple/operations/TxOperation.tsx
@@ -0,0 +1,110 @@
+import { cssObj } from '@fuel-ui/css';
+import { Box, Icon, Text } from '@fuel-ui/react';
+import { ReceiptType } from 'fuels';
+import { TxCategory } from '../../../../types';
+import type { SimplifiedOperation } from '../../../../types';
+import { TxAddressDisplay } from './TxAddressDisplay';
+import { TxAssetDisplay } from './TxAssetDisplay';
+import { TxOperationNesting } from './TxOperationNesting';
+
+type TxOperationProps = {
+  operation: SimplifiedOperation;
+};
+
+export function TxOperation({ operation }: TxOperationProps) {
+  const metadata = operation.metadata;
+  const amount = metadata?.amount || operation.amount;
+  const assetId = metadata?.assetId || operation.assetId;
+  const hasAsset = Boolean(amount && assetId);
+  const depth = metadata?.depth || 0;
+  const receiptType = metadata?.receiptType;
+  const isContract = operation.type === TxCategory.CONTRACTCALL;
+
+  const receiptTypeLabel = receiptType ? ReceiptType[receiptType] : null;
+
+  if (depth !== 0) return null;
+
+  return (
+    <Box.Flex css={styles.root}>
+      <TxOperationNesting depth={depth} />
+      <Box.Stack gap="$2" css={styles.contentCol}>
+        <Box.Flex css={styles.header}>
+          <Text fontSize="xs" css={styles.typeLabel}>
+            {isContract ? 'Contract Call' : 'Transfer'}
+          </Text>
+          {receiptType && (
+            <Text fontSize="xs" css={styles.receiptLabel}>
+              {receiptTypeLabel}
+            </Text>
+          )}
+        </Box.Flex>
+        <TxAddressDisplay address={operation.from} label="From" />
+        <TxAddressDisplay
+          address={operation.to}
+          label={isContract ? 'Contract' : 'To'}
+          isContract={isContract}
+        />
+        {hasAsset && amount && assetId && (
+          <Box.Stack gap="$0">
+            {!isContract && <Icon icon="ArrowDown" css={styles.arrow} />}
+            <TxAssetDisplay
+              amount={amount.toString()}
+              assetId={assetId}
+              showLabel={!isContract}
+            />
+          </Box.Stack>
+        )}
+        {metadata?.functionName && (
+          <Box css={styles.functionName}>Function: {metadata.functionName}</Box>
+        )}
+      </Box.Stack>
+    </Box.Flex>
+  );
+}
+// root level rule is only for contract calls, all transfers should show as well
+// we also have the operations not related to the account in a group, and intermediate contract calls
+const styles = {
+  root: cssObj({
+    display: 'flex',
+    alignItems: 'flex-start',
+    gap: '$2',
+    padding: '$3',
+    backgroundColor: '$cardBg',
+    borderRadius: '$md',
+    width: '100%',
+    minWidth: 0,
+  }),
+  contentCol: cssObj({
+    display: 'flex',
+    flex: 1,
+    minWidth: 0,
+  }),
+  header: cssObj({
+    display: 'flex',
+    alignItems: 'center',
+    gap: '$2',
+  }),
+  typeLabel: cssObj({
+    color: '$gray8',
+    backgroundColor: '$gray3',
+    padding: '$1 $2',
+    borderRadius: '$md',
+    fontWeight: '$normal',
+  }),
+  receiptLabel: cssObj({
+    color: '$blue9',
+    backgroundColor: '$blue3',
+    padding: '$1 $2',
+    borderRadius: '$md',
+    fontWeight: '$normal',
+  }),
+  arrow: cssObj({
+    color: '$gray8',
+    marginTop: '$1',
+    marginLeft: '$2',
+  }),
+  functionName: cssObj({
+    fontSize: '$sm',
+    color: '$gray8',
+  }),
+};