fix: applied suggestions

Author: vinistevam

packages/transaction-controller/src/TransactionController.ts

@@ -4245,26 +4245,27 @@ export class TransactionController extends BaseController<
     transactionBatchId: Hex;
     gasFeeEstimates?: GasFeeEstimates;
   }) {
-    const batch = this.state.transactionBatches.find(
-      (txBatch) => txBatch.id === transactionBatchId,
-    );
-    if (!batch) {
-      return;
-    }
-
-    batch.gasFeeEstimates = gasFeeEstimates;
-
-    this.#updateTransactionBatch(batch);
+    this.#updateTransactionBatch(transactionBatchId, (batch) => {
+      batch.gasFeeEstimates = gasFeeEstimates;
+      return batch;
+    });
   }
 
-  #updateTransactionBatch(batch: TransactionBatchMeta) {
+  #updateTransactionBatch(
+    batchId: string,
+    callback: (batch: TransactionBatchMeta) => TransactionBatchMeta | void,
+  ): void {
     this.update((state) => {
-      const index = state.transactionBatches.findIndex(
-        (b) => b.id === batch.id,
-      );
-      if (index >= 0) {
-        state.transactionBatches[index] = batch;
+      const index = state.transactionBatches.findIndex((b) => b.id === batchId);
+
+      if (index === -1) {
+        throw new Error(`Cannot update batch, ID not found - ${batchId}`);
       }
+
+      const batch = state.transactionBatches[index];
+      const updated = callback(batch);
+
+      state.transactionBatches[index] = updated ?? batch;
     });
   }
 

packages/transaction-controller/src/helpers/GasFeePoller.ts

@@ -202,7 +202,7 @@ export class GasFeePoller {
     }
 
     log(
-      'Found unapproved batch transactions',
+      'Found unapproved transaction batches',
       unapprovedTransactionBatches.length,
     );
 

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

@@ -580,22 +580,28 @@ async function processTransactionWithHook(
     };
   }
 
-  const txMeta = { ...txBatchMeta, txParams: { ...params, from } };
+  const transactionMetaForGasEstimates = {
+    ...txBatchMeta,
+    txParams: { ...params, from },
+  };
 
   if (txBatchMeta) {
     updateTransactionGasEstimates({
-      txMeta: txMeta as TransactionMeta,
+      txMeta: transactionMetaForGasEstimates as TransactionMeta,
       userFeeLevel: GasFeeEstimateLevel.Medium,
     });
   }
 
-  const { transactionMeta } = await addTransaction(txMeta.txParams, {
-    batchId,
-    disableGasBuffer: true,
-    networkClientId,
-    publishHook,
-    requireApproval: false,
-  });
+  const { transactionMeta } = await addTransaction(
+    transactionMetaForGasEstimates.txParams,
+    {
+      batchId,
+      disableGasBuffer: true,
+      networkClientId,
+      publishHook,
+      requireApproval: false,
+    },
+  );
 
   const { id, txParams } = transactionMeta;
   const data = txParams.data as Hex | undefined;