Use request address for fiat rate

Author: matthewwalsh0

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

@@ -59,17 +59,22 @@ export async function getBridgeQuotes(
 
   const { requests, messenger, transaction } = request;
 
-  const finalRequests = getFinalRequests(requests, messenger);
+  try {
+    const finalRequests = getFinalRequests(requests, messenger);
 
-  const quotes = await Promise.all(
-    finalRequests.map((r, index) =>
-      getSufficientSingleBridgeQuote(r, index, request),
-    ),
-  );
+    const quotes = await Promise.all(
+      finalRequests.map((r, index) =>
+        getSufficientSingleBridgeQuote(r, index, request),
+      ),
+    );
 
-  return quotes.map((quote, index) =>
-    normalizeQuote(quote, finalRequests[index], messenger, transaction),
-  );
+    return quotes.map((quote, index) =>
+      normalizeQuote(quote, finalRequests[index], messenger, transaction),
+    );
+  } catch (error) {
+    log('Error fetching quotes', { error });
+    throw new Error(`Failed to fetch bridge quotes: ${String(error)}`);
+  }
 }
 
 /**
@@ -470,7 +475,7 @@ function normalizeQuote(
 
   const sourceFiatRate = getTokenFiatRate(
     messenger,
-    quote.quote.srcAsset.address as Hex,
+    request.sourceTokenAddress,
     toHex(quote.quote.srcChainId),
   );
 

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

@@ -37,21 +37,26 @@ export async function getRelayQuotes(
 
   log('Fetching quotes', requests);
 
-  const result = requests
-    // Ignore gas fee token requests
-    .filter((r) => r.targetAmountMinimum !== '0')
-    .map((r) => normalizeRequest(r));
-
-  const normalizedRequests = result.map((r) => r.request);
-  const isSkipTransaction = result.some((r) => r.isSkipTransaction);
-
-  log('Normalized requests', { normalizedRequests, isSkipTransaction });
-
-  return await Promise.all(
-    normalizedRequests.map((r) =>
-      getSingleQuote(r, isSkipTransaction, request),
-    ),
-  );
+  try {
+    const result = requests
+      // Ignore gas fee token requests
+      .filter((r) => r.targetAmountMinimum !== '0')
+      .map((r) => normalizeRequest(r));
+
+    const normalizedRequests = result.map((r) => r.request);
+    const isSkipTransaction = result.some((r) => r.isSkipTransaction);
+
+    log('Normalized requests', { normalizedRequests, isSkipTransaction });
+
+    return await Promise.all(
+      normalizedRequests.map((r) =>
+        getSingleQuote(r, isSkipTransaction, request),
+      ),
+    );
+  } catch (error) {
+    log('Error fetching quotes', { error });
+    throw new Error(`Failed to fetch Relay quotes: ${String(error)}`);
+  }
 }
 
 /**

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

@@ -12,6 +12,7 @@ import type {
   TransactionData,
   TransactionPayControllerMessenger,
   TransactionPayQuote,
+  TransactionPayRequiredToken,
   TransactionPayTotals,
   TransactionPaymentToken,
   UpdateTransactionDataCallback,
@@ -52,22 +53,22 @@ export async function updateQuotes(request: UpdateQuotesRequest) {
     return;
   }
 
-  const requests: QuoteRequest[] = (sourceAmounts ?? []).map(
-    (sourceAmount, i) => {
-      const token = tokens[i];
-
-      return {
-        from: transaction.txParams.from as Hex,
-        sourceBalanceRaw: paymentToken.balanceRaw,
-        sourceTokenAmount: sourceAmount.sourceAmountRaw,
-        sourceChainId: paymentToken.chainId,
-        sourceTokenAddress: paymentToken.address,
-        targetAmountMinimum: token.allowUnderMinimum ? '0' : token.amountRaw,
-        targetChainId: token.chainId,
-        targetTokenAddress: token.address,
-      };
-    },
-  );
+  const requests: QuoteRequest[] = (sourceAmounts ?? []).map((sourceAmount) => {
+    const token = tokens.find(
+      (t) => t.address === sourceAmount.targetTokenAddress,
+    ) as TransactionPayRequiredToken;
+
+    return {
+      from: transaction.txParams.from as Hex,
+      sourceBalanceRaw: paymentToken.balanceRaw,
+      sourceTokenAmount: sourceAmount.sourceAmountRaw,
+      sourceChainId: paymentToken.chainId,
+      sourceTokenAddress: paymentToken.address,
+      targetAmountMinimum: token.allowUnderMinimum ? '0' : token.amountRaw,
+      targetChainId: token.chainId,
+      targetTokenAddress: token.address,
+    };
+  });
 
   if (!requests?.length) {
     log('No quote requests', { transactionId });