refactor: improve transaction operation categorization and sorting

FuelLabs · Feb 6, 2025 · b1a9ab8 · b1a9ab8
1 parent e2b9258
commit b1a9ab8
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/packages/app/src/systems/Transaction/utils/simplifyTransaction.ts b/packages/app/src/systems/Transaction/utils/simplifyTransaction.ts
@@ -226,6 +226,7 @@ function categorizeOperations(
   const otherRoot: SimplifiedOperation[] = [];
   const intermediate: SimplifiedOperation[] = [];
 
+  // First pass: separate operations
   for (const op of operations) {
     // Check if operation has assets or is a contract call with amount
     const hasAssets =
@@ -237,21 +238,23 @@ function categorizeOperations(
     }
 
     const depth = op.metadata?.depth || 0;
-    const isTransfer = op.type === TxCategory.SEND;
+    const isTransfer =
+      op.type === TxCategory.SEND || op.type === TxCategory.RECEIVE;
     const isFromCurrentAccount =
       currentAccount &&
       op.from.address.toLowerCase() === currentAccount.toLowerCase();
     const isToCurrentAccount =
       currentAccount &&
       op.to.address.toLowerCase() === currentAccount.toLowerCase();
 
-    if (isTransfer) {
-      main.push(op);
-      continue;
-    }
-
     if (depth === 0) {
-      if (isFromCurrentAccount || isToCurrentAccount) {
+      if (isTransfer) {
+        if (isFromCurrentAccount || isToCurrentAccount) {
+          main.push(op);
+        } else {
+          otherRoot.push(op);
+        }
+      } else if (isFromCurrentAccount || isToCurrentAccount) {
         main.push(op);
       } else {
         otherRoot.push(op);
@@ -262,6 +265,20 @@ function categorizeOperations(
     intermediate.push(op);
   }
 
+  // Sort main operations: from user first, then to user
+  main.sort((a, b) => {
+    const aFromUser =
+      currentAccount &&
+      a.from.address.toLowerCase() === currentAccount.toLowerCase();
+    const bFromUser =
+      currentAccount &&
+      b.from.address.toLowerCase() === currentAccount.toLowerCase();
+
+    if (aFromUser && !bFromUser) return -1;
+    if (!aFromUser && bFromUser) return 1;
+    return 0;
+  });
+
   // set all main operations to depth 0
   for (const op of main) {
     op.metadata.depth = 0;