Merge branch 'main' into release/687.0.0

Author: mikesposito

packages/transaction-pay-controller/CHANGELOG.md

@@ -21,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **BREAKING:** Bump `@metamask/bridge-controller` from `^61.0.0` to `^62.0.0` ([#7190](https://github.com/MetaMask/core/pull/7190))
 - **BREAKING:** Bump `@metamask/assets-controllers` from `^89.0.0` to `^90.0.0` ([#7190](https://github.com/MetaMask/core/pull/7190))
 
+### Fixed
+
+- Ensure source network fee for Relay quotes includes all items and steps ([#7191](https://github.com/MetaMask/core/pull/7191))
+
 ## [8.0.0]
 
 ### Changed

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

@@ -397,12 +397,28 @@ describe('Relay Quotes Utils', () => {
 
     it('includes source network fee using gas total from multiple transactions', async () => {
       const quoteMock = cloneDeep(QUOTE_MOCK);
+
       quoteMock.steps[0].items.push({
         data: {
           gas: '480000',
         },
       } as never);
 
+      quoteMock.steps.push({
+        items: [
+          {
+            data: {
+              gas: '1000',
+            },
+          },
+          {
+            data: {
+              gas: '2000',
+            },
+          },
+        ],
+      } as never);
+
       successfulFetchMock.mockResolvedValue({
         json: async () => quoteMock,
       } as never);
@@ -414,7 +430,7 @@ describe('Relay Quotes Utils', () => {
       });
 
       expect(calculateGasCostMock).toHaveBeenCalledWith(
-        expect.objectContaining({ gas: 501000 }),
+        expect.objectContaining({ gas: 504000 }),
       );
     });
 

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

@@ -382,7 +382,7 @@ function calculateSourceNetworkCost(
   quote: RelayQuote,
   messenger: TransactionPayControllerMessenger,
 ): TransactionPayQuote<RelayQuote>['fees']['sourceNetwork'] {
-  const allParams = quote.steps[0].items.map((i) => i.data);
+  const allParams = quote.steps.flatMap((s) => s.items).map((i) => i.data);
   const { chainId } = allParams[0];
   const totalGasLimit = calculateSourceNetworkGasLimit(allParams);