chore(runway): cherry-pick fix: Fallback to regular transaction submit for legacy transactions (#16172)

- fix: Fallback to regular transaction submit for legacy transactions
(#15881)

Author: runway-github[bot]

app/util/smart-transactions/smart-publish-hook.test.ts

@@ -9,6 +9,7 @@ import {
   TransactionController,
   TransactionMeta,
   WalletDevice,
+  TransactionEnvelopeType,
 } from '@metamask/transaction-controller';
 import SmartTransactionsController from '@metamask/smart-transactions-controller';
 import {
@@ -235,6 +236,23 @@ describe('submitSmartTransactionHook', () => {
     });
   });
 
+  it('falls back to regular transaction submit if it is a legacy transaction', async () => {
+    withRequest(async ({ request }) => {
+      // Modify transaction to be a legacy transaction with explicit type
+      request.transactionMeta.txParams = {
+        ...request.transactionMeta.txParams,
+        type: TransactionEnvelopeType.legacy,
+        gasPrice: '0x77359400',
+      };
+      // Remove EIP-1559 specific fields if they exist
+      delete request.transactionMeta.txParams.maxFeePerGas;
+      delete request.transactionMeta.txParams.maxPriorityFeePerGas;
+
+      const result = await submitSmartTransactionHook(request);
+      expect(result).toEqual({ transactionHash: undefined });
+    });
+  });
+
   it('returns a txHash asap if the feature flag requires it', async () => {
     withRequest(async ({ request }) => {
       request.featureFlags.smartTransactions.mobileReturnTxHashAsap = true;

app/util/smart-transactions/smart-publish-hook.ts

@@ -2,7 +2,7 @@ import {
   TransactionParams,
   TransactionController,
   TransactionMeta,
-  type PublishBatchHookTransaction
+  type PublishBatchHookTransaction,
 } from '@metamask/transaction-controller';
 import SmartTransactionsController, {
   SmartTransactionsControllerSmartTransactionEvent,
@@ -27,6 +27,7 @@ import { RAMPS_SEND } from '../../components/UI/Ramp/constants';
 import { Messenger } from '@metamask/base-controller';
 import { addSwapsTransaction } from '../swaps/swaps-transactions';
 import { Hex } from '@metamask/utils';
+import { isLegacyTransaction } from '../transactions';
 
 export type AllowedActions = never;
 
@@ -176,7 +177,8 @@ class SmartTransactionHook {
     const useRegularTransactionSubmit = { transactionHash: undefined };
     if (
       !this.#shouldUseSmartTransaction ||
-      this.#transactionMeta.origin === RAMPS_SEND
+      this.#transactionMeta.origin === RAMPS_SEND ||
+      isLegacyTransaction(this.#transactionMeta)
     ) {
       return useRegularTransactionSubmit;
     }

app/util/transactions/index.js

@@ -12,6 +12,7 @@ import {
 import {
   isEIP1559Transaction,
   TransactionType,
+  TransactionEnvelopeType,
 } from '@metamask/transaction-controller';
 import { swapsUtils } from '@metamask/swaps-controller';
 import Engine from '../../core/Engine';
@@ -170,6 +171,17 @@ const actionKeys = {
   ),
 };
 
+/**
+ * Checks if a transaction is a legacy transaction by examining its type.
+ * Legacy transactions are identified by the TransactionEnvelopeType.legacy type.
+ *
+ * @param {object} transactionMeta - The transaction metadata to check
+ * @returns {boolean} true if the transaction is a legacy transaction, false otherwise
+ */
+export function isLegacyTransaction(transactionMeta) {
+  return transactionMeta?.txParams?.type === TransactionEnvelopeType.legacy;
+}
+
 /**
  * Generates transfer data for specified method
  *

app/util/transactions/index.test.ts

@@ -39,10 +39,11 @@ import {
   TOKEN_METHOD_APPROVE,
   getTransactionReviewActionKey,
   getTransactionById,
+  isLegacyTransaction
 } from '.';
 import Engine from '../../core/Engine';
 import { strings } from '../../../locales/i18n';
-import { TransactionType } from '@metamask/transaction-controller';
+import { TransactionType, TransactionEnvelopeType, TransactionMeta } from '@metamask/transaction-controller';
 import { Provider } from '@metamask/network-controller';
 import BigNumber from 'bignumber.js';
 
@@ -1256,3 +1257,54 @@ describe('Transactions utils :: getTransactionById', () => {
     expect(result).toBeUndefined();
   });
 });
+
+describe('Transactions utils :: isLegacyTransaction', () => {
+  it('returns true for a transaction with legacy type', () => {
+    const transactionMeta = {
+      txParams: {
+        type: TransactionEnvelopeType.legacy,
+        from: '0x123',
+        to: '0x456',
+        gasPrice: '0x77359400',
+      },
+    };
+
+    expect(isLegacyTransaction(transactionMeta)).toBe(true);
+  });
+
+  it('returns false for an EIP-1559 transaction', () => {
+    const transactionMeta = {
+      txParams: {
+        type: TransactionEnvelopeType.feeMarket,
+        from: '0x123',
+        to: '0x456',
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x1',
+      },
+    };
+
+    expect(isLegacyTransaction(transactionMeta)).toBe(false);
+  });
+
+  it('returns false for a transaction without type field', () => {
+    const transactionMeta = {
+      txParams: {
+        from: '0x123',
+        to: '0x456',
+        gasPrice: '0x77359400',
+      },
+    };
+
+    expect(isLegacyTransaction(transactionMeta)).toBe(false);
+  });
+
+  it('returns false for undefined transactionMeta', () => {
+    // @ts-expect-error Testing undefined input
+    expect(isLegacyTransaction(undefined)).toBe(false);
+  });
+
+  it('returns false for transactionMeta without txParams', () => {
+    const transactionMeta = {};
+    expect(isLegacyTransaction(transactionMeta as Partial<TransactionMeta>)).toBe(false);
+  });
+});