fix: gas fee bridge to polygon native (#7053)

## Explanation

Support gas fee bridge to Polygon native by getting target fiat rates
using the original request rather than the quote.

Also:

- Use original quote if bridge quote fails to be refreshed during
submission.
- Only refresh quotes if transaction status is unapproved.

## References

Related to
[#6164](MetaMask/MetaMask-planning#6164)

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've communicated my changes to consumers by [updating changelogs
for packages I've
changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs),
highlighting breaking changes as necessary
- [x] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Fixes bridge fiat rate resolution using request params, falls back to
original quote if refresh fails during submit, and skips quote
updates/refresh for non-unapproved transactions.
> 
> - **Bridge strategy**:
> - **Quotes**: Use request `source/target` chain/token for fiat rates
in `normalizeQuote`; add distinct errors for missing source/target
rates; enhance balance-limit logging.
> - **Submit**: For subsequent quotes, wrap `refreshQuote` in try/catch
and submit with original quote on failure.
> - **Quotes utils**:
> - `updateQuotes` returns `boolean` and early-returns `false` unless
transaction `status` is `unapproved`; `refreshQuotes` logs "Refreshed"
only when updates occur.
> - **Tests**: Update expectations for new error messages, refresh
fallback, and `updateQuotes` return value/behavior.
> - **Changelog**: Document Polygon native bridge fix and the above
behaviors.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
4329c23. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: matthewwalsh0

packages/transaction-pay-controller/CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Calculate totals even if no quotes received ([#7042](https://github.com/MetaMask/core/pull/7042))
 
+### Fixed
+
+- Fix bridging to native Polygon ([#7053](https://github.com/MetaMask/core/pull/7053))
+  - Use original quote if bridge quote fails to refresh during submit.
+  - Only refresh quotes if transaction status is unapproved.
+
 ## [3.0.0]
 
 ### Changed

packages/transaction-pay-controller/src/TransactionPayController.test.ts

@@ -46,7 +46,7 @@ describe('TransactionPayController', () => {
 
     messenger = getMessengerMock({ skipRegister: true }).messenger;
 
-    updateQuotesMock.mockResolvedValue();
+    updateQuotesMock.mockResolvedValue(true);
   });
 
   describe('updatePaymentToken', () => {

packages/transaction-pay-controller/src/strategy/bridge/bridge-quotes.test.ts

@@ -797,15 +797,32 @@ describe('Bridge Quotes Utils', () => {
       });
     });
 
-    it('throws if missing fiat rate', async () => {
+    it('throws if missing fiat source rate', async () => {
       getTokenFiatRateMock.mockReturnValue(undefined);
 
       await expect(
         getBridgeQuotes({
           ...request,
           requests: [QUOTE_REQUEST_1_MOCK],
         }),
-      ).rejects.toThrow(`Fiat rate not found for source or target token`);
+      ).rejects.toThrow(
+        `Failed to fetch bridge quotes: Error: Fiat rate not found for source token - Chain ID: 0x1, Address: 0xabc`,
+      );
+    });
+
+    it('throws if missing fiat target rate', async () => {
+      getTokenFiatRateMock
+        .mockReturnValueOnce({ usdRate: '3', fiatRate: '2' })
+        .mockReturnValueOnce(undefined);
+
+      await expect(
+        getBridgeQuotes({
+          ...request,
+          requests: [QUOTE_REQUEST_1_MOCK],
+        }),
+      ).rejects.toThrow(
+        `Failed to fetch bridge quotes: Error: Fiat rate not found for target token - Chain ID: 0x2, Address: 0xdef`,
+      );
     });
 
     it('uses defaults if no feature flags', async () => {

packages/transaction-pay-controller/src/strategy/bridge/bridge-quotes.ts

@@ -270,7 +270,13 @@ async function getSufficientSingleBridgeQuote(
         sourceBalanceRaw,
       )
     ) {
-      log('Reached balance limit', targetTokenAddress);
+      log('Reached balance limit', {
+        targetTokenAddress,
+        sourceBalanceRaw,
+        currentSourceAmount,
+        attempt: i + 1,
+      });
+
       break;
     }
 
@@ -467,20 +473,28 @@ function normalizeQuote(
   messenger: TransactionPayControllerMessenger,
   transaction: TransactionMeta,
 ): TransactionPayQuote<TransactionPayBridgeQuote> {
-  const targetFiatRate = getTokenFiatRate(
+  const sourceFiatRate = getTokenFiatRate(
     messenger,
-    quote.quote.destAsset.address as Hex,
-    toHex(quote.quote.destChainId),
+    request.sourceTokenAddress,
+    request.sourceChainId,
   );
 
-  const sourceFiatRate = getTokenFiatRate(
+  if (sourceFiatRate === undefined) {
+    throw new Error(
+      `Fiat rate not found for source token - Chain ID: ${request.sourceChainId}, Address: ${request.sourceTokenAddress}`,
+    );
+  }
+
+  const targetFiatRate = getTokenFiatRate(
     messenger,
-    request.sourceTokenAddress,
-    toHex(quote.quote.srcChainId),
+    request.targetTokenAddress,
+    request.targetChainId,
   );
 
-  if (sourceFiatRate === undefined || targetFiatRate === undefined) {
-    throw new Error('Fiat rate not found for source or target token');
+  if (targetFiatRate === undefined) {
+    throw new Error(
+      `Fiat rate not found for target token - Chain ID: ${request.targetChainId}, Address: ${request.targetTokenAddress}`,
+    );
   }
 
   const targetAmountMinimumFiat = calculateFiatValue(

packages/transaction-pay-controller/src/strategy/bridge/bridge-submit.test.ts

@@ -242,7 +242,7 @@ describe('Bridge Submit Utils', () => {
       expect(updateTransactionMock).not.toHaveBeenCalled();
     });
 
-    it('refreshes quotes after the first one', async () => {
+    it('refreshes quotes after the first', async () => {
       await submitBridgeQuotes(request);
 
       expect(refreshQuoteMock).toHaveBeenCalledTimes(1);
@@ -253,6 +253,14 @@ describe('Bridge Submit Utils', () => {
       );
     });
 
+    it('does not throw if refresh fails', async () => {
+      refreshQuoteMock.mockRejectedValueOnce(new Error('Refresh failed'));
+
+      await submitBridgeQuotes(request);
+
+      expect(submitTransactionMock).toHaveBeenCalledTimes(2);
+    });
+
     it('resolves immediately if bridge status already completed', async () => {
       getBridgeStatusControllerStateMock.mockReturnValue({
         txHistory: {

packages/transaction-pay-controller/src/strategy/bridge/bridge-submit.ts

@@ -64,10 +64,15 @@ export async function submitBridgeQuotes(
   for (const quote of quotes) {
     log('Submitting bridge', index, quote);
 
-    const finalQuote =
-      index > 0
-        ? await refreshQuote(quote, messenger as never, transaction)
-        : quote.original;
+    let finalQuote = quote.original;
+
+    if (index > 0) {
+      try {
+        finalQuote = await refreshQuote(quote, messenger, transaction);
+      } catch (error) {
+        log('Failed to refresh subsequent quote before submit', error);
+      }
+    }
 
     await submitBridgeTransaction(request, finalQuote);
 

packages/transaction-pay-controller/src/utils/quotes.test.ts

@@ -1,4 +1,7 @@
-import type { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionStatus,
+  type TransactionMeta,
+} from '@metamask/transaction-controller';
 import type { BatchTransaction } from '@metamask/transaction-controller';
 import type { Hex, Json } from '@metamask/utils';
 import { cloneDeep } from 'lodash';
@@ -48,6 +51,7 @@ const TRANSACTION_DATA_MOCK: TransactionData = {
 
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
+  status: TransactionStatus.unapproved,
   txParams: { from: '0xabc' as Hex },
 } as TransactionMeta;
 
@@ -94,9 +98,10 @@ describe('Quotes Utils', () => {
    * Run the updateQuotes function.
    *
    * @param params - Partial params to override the defaults.
+   * @returns Return value from updateQuotes.
    */
   async function run(params?: Partial<UpdateQuotesRequest>) {
-    await updateQuotes({
+    return await updateQuotes({
       messenger,
       transactionData: cloneDeep(TRANSACTION_DATA_MOCK),
       transactionId: TRANSACTION_ID_MOCK,
@@ -300,6 +305,18 @@ describe('Quotes Utils', () => {
         },
       });
     });
+
+    it('does nothing if transaction is not unapproved', async () => {
+      getTransactionMock.mockReturnValue({
+        ...TRANSACTION_META_MOCK,
+        status: TransactionStatus.confirmed,
+      });
+
+      const result = await run();
+
+      expect(updateTransactionDataMock).not.toHaveBeenCalled();
+      expect(result).toBe(false);
+    });
   });
 
   describe('refreshQuotes', () => {

packages/transaction-pay-controller/src/utils/quotes.ts

@@ -1,4 +1,7 @@
-import type { BatchTransaction } from '@metamask/transaction-controller';
+import {
+  TransactionStatus,
+  type BatchTransaction,
+} from '@metamask/transaction-controller';
 import type { TransactionMeta } from '@metamask/transaction-controller';
 import type { Hex, Json } from '@metamask/utils';
 import { createModuleLogger } from '@metamask/utils';
@@ -34,19 +37,26 @@ export type UpdateQuotesRequest = {
  * Update the quotes for a specific transaction.
  *
  * @param request - Request parameters.
+ * @returns Boolean indicating if the quotes were updated.
  */
-export async function updateQuotes(request: UpdateQuotesRequest) {
+export async function updateQuotes(
+  request: UpdateQuotesRequest,
+): Promise<boolean> {
   const { messenger, transactionData, transactionId, updateTransactionData } =
     request;
 
   const transaction = getTransaction(transactionId, messenger);
 
-  log('Updating quotes', { transactionId });
-
   if (!transaction || !transactionData) {
     throw new Error('Transaction not found');
   }
 
+  if (transaction?.status !== TransactionStatus.unapproved) {
+    return false;
+  }
+
+  log('Updating quotes', { transactionId });
+
   const { paymentToken, sourceAmounts, tokens } = transactionData;
 
   const requests = buildQuoteRequests({
@@ -95,6 +105,8 @@ export async function updateQuotes(request: UpdateQuotesRequest) {
       data.isLoading = false;
     });
   }
+
+  return true;
 }
 
 /**
@@ -181,20 +193,16 @@ export async function refreshQuotes(
       continue;
     }
 
-    log('Refreshing expired quotes', {
-      transactionId,
-      strategy: strategyName,
-      refreshInterval,
-    });
-
-    await updateQuotes({
+    const isUpdated = await updateQuotes({
       messenger,
       transactionData,
       transactionId,
       updateTransactionData,
     });
 
-    log('Refreshed quotes', { transactionId, strategy: strategyName });
+    if (isUpdated) {
+      log('Refreshed quotes', { transactionId, strategy: strategyName });
+    }
   }
 }