fix(activity): resolve intent swap display data via original tx id

Author: oscarwroche

ui/ducks/bridge-status/selectors.ts

@@ -70,6 +70,24 @@ export const selectBridgeHistoryItemForTxMetaId = createSelector(
   },
 );
 
+// eslint-disable-next-line jsdoc/require-param
+/**
+ * Returns a bridge history item for a given original tx meta id.
+ * Used by intent flows where txHistory key is orderUid and txMeta id is stored separately.
+ */
+export const selectBridgeHistoryForOriginalTxMetaId = createSelector(
+  [selectBridgeHistory, (_, originalTxMetaId?: string) => originalTxMetaId],
+  (bridgeHistory, originalTxMetaId) => {
+    if (!originalTxMetaId) {
+      return undefined;
+    }
+    return Object.values(bridgeHistory).find(
+      (bridgeHistoryItem) =>
+        bridgeHistoryItem.originalTransactionId === originalTxMetaId,
+    );
+  },
+);
+
 // eslint-disable-next-line jsdoc/require-param
 /**
  * Returns a bridge history item for a given approval tx id

ui/hooks/useTransactionDisplayData.js

@@ -34,7 +34,10 @@ import { formatAmount } from '../pages/confirmations/components/simulation-detai
 import { getIntlLocale } from '../ducks/locale/locale';
 import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../shared/constants/bridge';
 import { calcTokenAmount } from '../../shared/lib/transactions-controller-utils';
-import { selectBridgeHistoryItemForTxMetaId } from '../ducks/bridge-status/selectors';
+import {
+  selectBridgeHistoryForOriginalTxMetaId,
+  selectBridgeHistoryItemForTxMetaId,
+} from '../ducks/bridge-status/selectors';
 
 import { PAY_TRANSACTION_TYPES } from '../pages/confirmations/constants/pay';
 import { useI18nContext } from './useI18nContext';
@@ -109,9 +112,14 @@ export function useTransactionDisplayData(transactionGroup) {
 
   // Bridge data
   const srcTxMetaId = transactionGroup.initialTransaction.id;
-  const bridgeHistoryItem = useSelector((state) =>
+  const bridgeHistoryItemByTxMetaId = useSelector((state) =>
     selectBridgeHistoryItemForTxMetaId(state, srcTxMetaId),
   );
+  const bridgeHistoryItemByOriginalTxMetaId = useSelector((state) =>
+    selectBridgeHistoryForOriginalTxMetaId(state, srcTxMetaId),
+  );
+  const bridgeHistoryItem =
+    bridgeHistoryItemByTxMetaId ?? bridgeHistoryItemByOriginalTxMetaId;
   const { destNetwork } = useBridgeChainInfo({
     bridgeHistoryItem,
     srcTxMeta: transactionGroup.initialTransaction,

ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts

@@ -5,6 +5,7 @@ import type { TransactionGroup } from '../../../hooks/bridge/useBridgeTxHistoryD
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
 import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
 import {
+  selectBridgeHistoryForOriginalTxMetaId,
   selectBridgeHistoryForApprovalTxId,
   selectBridgeHistoryItemForTxMetaId,
 } from '../../../ducks/bridge-status/selectors';
@@ -21,12 +22,17 @@ export function useBridgeTokenDisplayData(transactionGroup: TransactionGroup) {
   const bridgeHistoryItemForInitialTxId = useSelector((state) =>
     selectBridgeHistoryItemForTxMetaId(state, initialTransaction.id),
   );
+  const bridgeHistoryItemForOriginalTxId = useSelector((state) =>
+    selectBridgeHistoryForOriginalTxMetaId(state, initialTransaction.id),
+  );
   const bridgeHistoryItemWithApprovalTxId = useSelector((state) =>
     selectBridgeHistoryForApprovalTxId(state, initialTransaction.id),
   );
 
   const bridgeHistoryItem: BridgeHistoryItem | undefined =
-    bridgeHistoryItemForInitialTxId ?? bridgeHistoryItemWithApprovalTxId;
+    bridgeHistoryItemForInitialTxId ??
+    bridgeHistoryItemForOriginalTxId ??
+    bridgeHistoryItemWithApprovalTxId;
 
   // Display currency can be fiat or a token
   const displayCurrencyAmount = useTokenFiatAmount(