fix: update batch tx unit test

Author: micaelae

packages/transaction-controller/src/types.ts

@@ -1722,9 +1722,6 @@ export type PublishBatchHookTransaction = {
 
   /** Signed transaction data to publish. */
   signedTx: Hex;
-
-  /** Type of the nested transaction. */
-  type?: TransactionType;
 };
 
 /**

packages/transaction-controller/src/utils/batch.test.ts

@@ -370,6 +370,55 @@ describe('Batch Utils', () => {
       expect(result.batchId).toMatch(/^0x[0-9a-f]{32}$/u);
     });
 
+    it('preserves nested transaction types when disable7702 is true', async () => {
+      const publishBatchHook: jest.MockedFn<PublishBatchHook> = jest.fn();
+      mockRequestApproval(MESSENGER_MOCK, {
+        state: 'approved',
+      });
+
+      addTransactionMock
+        .mockResolvedValueOnce({
+          transactionMeta: {
+            ...TRANSACTION_META_MOCK,
+            id: TRANSACTION_ID_MOCK,
+          },
+          result: Promise.resolve(''),
+        })
+        .mockResolvedValueOnce({
+          transactionMeta: {
+            ...TRANSACTION_META_MOCK,
+            id: TRANSACTION_ID_2_MOCK,
+          },
+          result: Promise.resolve(''),
+        });
+      addTransactionBatch({
+        ...request,
+        publishBatchHook,
+        request: {
+          ...request.request,
+          transactions: [
+            {
+              ...request.request.transactions[0],
+              type: TransactionType.swap,
+            },
+            {
+              ...request.request.transactions[1],
+              type: TransactionType.bridge,
+            },
+          ],
+          disable7702: true,
+        },
+      }).catch(() => {
+        // Intentionally empty
+      });
+
+      await flushPromises();
+
+      expect(addTransactionMock).toHaveBeenCalledTimes(2);
+      expect(addTransactionMock.mock.calls[0][1].type).toBe('swap');
+      expect(addTransactionMock.mock.calls[1][1].type).toBe('bridge');
+    });
+
     it('preserves nested transaction types when disable7702 is false', async () => {
       const publishBatchHook: jest.MockedFn<PublishBatchHook> = jest.fn();
 
@@ -883,89 +932,50 @@ describe('Batch Utils', () => {
           PUBLISH_BATCH_HOOK_PARAMS,
         );
       });
-
-      it('calls publish batch hook with requested transaction type', async () => {
-        const publishBatchHook: jest.MockedFn<PublishBatchHook> = jest.fn();
-
-        addTransactionMock
-          .mockResolvedValueOnce({
-            transactionMeta: {
-              ...TRANSACTION_META_MOCK,
-              id: TRANSACTION_ID_MOCK,
-            },
-            result: Promise.resolve(''),
-          })
-          .mockResolvedValueOnce({
-            transactionMeta: {
-              ...TRANSACTION_META_MOCK,
-              id: TRANSACTION_ID_2_MOCK,
-            },
-            result: Promise.resolve(''),
-          });
-
-        publishBatchHook.mockResolvedValue({
-          results: [
-            {
-              transactionHash: TRANSACTION_HASH_MOCK,
-            },
-            {
-              transactionHash: TRANSACTION_HASH_2_MOCK,
-            },
-          ],
-        });
-
-        addTransactionBatch({
-          ...request,
-          publishBatchHook,
-          request: {
-            ...request.request,
-            transactions: [
-              {
-                ...request.request.transactions[0],
-                type: TransactionType.swap,
-              },
-              {
-                ...request.request.transactions[1],
-                type: TransactionType.bridge,
-              },
-            ],
-            disable7702: true,
-          },
-        }).catch(() => {
-          // Intentionally empty
-        });
-
-        expect(request.request.transactions).toHaveLength(2);
-        await flushPromises();
-
-        const publishHooks = addTransactionMock.mock.calls.map(
-          ([, options]) => options.publishHook,
-        );
-
-        publishHooks[0]?.(
-          TRANSACTION_META_MOCK,
-          TRANSACTION_SIGNATURE_MOCK,
-        ).catch(() => {
-          // Intentionally empty
-        });
-
-        publishHooks[1]?.(
-          TRANSACTION_META_MOCK,
-          TRANSACTION_SIGNATURE_2_MOCK,
-        ).catch(() => {
-          // Intentionally empty
-        });
-
-        await flushPromises();
-
-        expect(publishBatchHook).toHaveBeenCalledTimes(1);
-        expect(publishBatchHook.mock.calls[0][0].transactions[0].type).toBe(
-          TransactionType.swap,
-        );
-        expect(publishBatchHook.mock.calls[0][0].transactions[1].type).toBe(
-          TransactionType.bridge,
-        );
-      });
+      //   const publishBatchHook: jest.MockedFn<PublishBatchHook> = jest.fn();
+
+      //   addTransactionMock
+      //     .mockResolvedValueOnce({
+      //       transactionMeta: {
+      //         ...TRANSACTION_META_MOCK,
+      //         id: TRANSACTION_ID_MOCK,
+      //       },
+      //       result: Promise.resolve(''),
+      //     })
+      //     .mockResolvedValueOnce({
+      //       transactionMeta: {
+      //         ...TRANSACTION_META_MOCK,
+      //         id: TRANSACTION_ID_2_MOCK,
+      //       },
+      //       result: Promise.resolve(''),
+      //     });
+      //   addTransactionBatch({
+      //     ...request,
+      //     publishBatchHook,
+      //     request: {
+      //       ...request.request,
+      //       transactions: [
+      //         {
+      //           ...request.request.transactions[0],
+      //           type: TransactionType.swap,
+      //         },
+      //         {
+      //           ...request.request.transactions[1],
+      //           type: TransactionType.bridge,
+      //         },
+      //       ],
+      //       disable7702: true,
+      //     },
+      //   }).catch(() => {
+      //     // Intentionally empty
+      //   });
+
+      //   await flushPromises();
+
+      //   expect(addTransactionMock).toHaveBeenCalledTimes(2);
+      //   expect(addTransactionMock.mock.calls[0][1].type).toBe('swap');
+      //   expect(addTransactionMock.mock.calls[1][1].type).toBe('bridge');
+      // });
 
       it('resolves individual publish hooks with transaction hashes from publish batch hook', async () => {
         const publishBatchHook: jest.MockedFn<PublishBatchHook> = jest.fn();