fix: dedicated convert mUSD details cp-13.41.0 #44586
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { useSelector } from 'react-redux'; | ||
| import { selectLocalTransactionsByHash } from '../../selectors/activity'; | ||
|
|
||
| /** | ||
| * Used for enriching activity items with local-only data. | ||
| * This is where `metamaskPay` and other per-transaction metadata live. | ||
| * | ||
| * @param hash - The activity item hash | ||
| */ | ||
| export function useTransactionMeta(hash: string | undefined) { | ||
| const localTransactionsByHash = useSelector(selectLocalTransactionsByHash); | ||
| return localTransactionsByHash.get((hash ?? '').toLowerCase()) | ||
| ?.initialTransaction; | ||
| } | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| import React, { useMemo } from 'react'; | ||
| import { toEvmCaipChainId } from '@metamask/multichain-network-controller'; | ||
| import type { | ||
| ActivityListItem, | ||
| TokenAmount, | ||
| } from '../../../../shared/lib/activity/types'; | ||
| import { useI18nContext } from '../../../hooks/useI18nContext'; | ||
| import { useFormatters } from '../../../hooks/useFormatters'; | ||
| import { useTransactionMeta } from '../../../hooks/activity/useTransactionMeta'; | ||
| import { useTransactionQuery } from '../../../hooks/activity/useTransactionQuery'; | ||
| import { Footer, PAY_FIAT_CURRENCY, Row, Section } from '../components/shared'; | ||
| import { ConvertAgainButton } from '../components/convert-again-button'; | ||
| import { MetadataSection, TokensSection } from '../components/sections'; | ||
| // eslint-disable-next-line import-x/no-restricted-paths | ||
| import { TransactionDetailsProvider } from '../../confirmations/components/activity/transaction-details-context'; | ||
| // eslint-disable-next-line import-x/no-restricted-paths | ||
| import { TransactionDetailsSummary } from '../../confirmations/components/activity/transaction-details-summary'; | ||
|
|
||
| function useSentToken( | ||
| baseToken: TokenAmount | undefined, | ||
| transactionMeta: ReturnType<typeof useTransactionMeta>, | ||
| ): TokenAmount | undefined { | ||
| const { sourceHash, tokenAddress, chainId } = | ||
| transactionMeta?.metamaskPay ?? {}; | ||
| const sourceChainId = chainId ? toEvmCaipChainId(chainId) : undefined; | ||
| const userAddress = transactionMeta?.txParams?.from?.toLowerCase(); | ||
|
|
||
| const { data: sourceTransaction } = useTransactionQuery({ | ||
| chainId: sourceChainId, | ||
| txHash: sourceHash, | ||
| enabled: Boolean(sourceHash && sourceChainId), | ||
| }); | ||
|
|
||
| return useMemo(() => { | ||
| if (!baseToken) { | ||
| return baseToken; | ||
| } | ||
| const transfers = sourceTransaction?.valueTransfers ?? []; | ||
| const payToken = tokenAddress?.toLowerCase(); | ||
| const sentTransfer = | ||
| transfers.find( | ||
| (transfer) => | ||
| transfer.contractAddress.toLowerCase() === payToken && | ||
| transfer.from.toLowerCase() === userAddress, | ||
| ) ?? | ||
| transfers.find( | ||
| (transfer) => transfer.contractAddress.toLowerCase() === payToken, | ||
|
cursor[bot] marked this conversation as resolved.
Outdated
|
||
| ); | ||
| return sentTransfer?.amount | ||
| ? { ...baseToken, amount: sentTransfer.amount } | ||
| : baseToken; | ||
| }, [baseToken, sourceTransaction, tokenAddress, userAddress]); | ||
| } | ||
|
|
||
| type Props = { | ||
| item: Extract< | ||
| ActivityListItem, | ||
| { | ||
| type: | ||
|
Contributor
Author
There was a problem hiding this comment. convert is currently shared in this union type |
||
| | 'swap' | ||
| | 'bridge' | ||
| | 'convert' | ||
| | 'lendingDeposit' | ||
| | 'lendingWithdrawal' | ||
| | 'wrap' | ||
| | 'unwrap'; | ||
| } | ||
| >; | ||
| }; | ||
|
|
||
| export function ConvertDetails({ item }: Props) { | ||
|
Check warning on line 71 in ui/pages/details/templates/convert-details.tsx
|
||
| const t = useI18nContext(); | ||
| const { formatCurrencyWithMinThreshold } = useFormatters(); | ||
| const transactionMeta = useTransactionMeta(item.hash); | ||
| const { networkFeeFiat, totalFiat } = transactionMeta?.metamaskPay ?? {}; | ||
| const sentToken = useSentToken(item.data.sourceToken, transactionMeta); | ||
|
|
||
| const formatFiat = (value?: string) => | ||
| value | ||
| ? formatCurrencyWithMinThreshold(Number(value), PAY_FIAT_CURRENCY) | ||
| : null; | ||
|
|
||
| if (!transactionMeta) { | ||
| return null; | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| return ( | ||
| <div className="flex grow flex-col"> | ||
| <div className="divide-y divide-border-muted"> | ||
| <TokensSection | ||
| tokens={[ | ||
| { label: t('youSent'), token: sentToken }, | ||
| { label: t('youReceived'), token: item.data.destinationToken }, | ||
| ]} | ||
| /> | ||
|
|
||
| <MetadataSection item={item} /> | ||
|
|
||
| <Section> | ||
| <Row | ||
| label={t('networkFee')} | ||
| testId="transaction-base-fee" | ||
| value={formatFiat(networkFeeFiat)} | ||
| /> | ||
| <Row | ||
| label={t('total')} | ||
| testId="transaction-breakdown-value-amount" | ||
| value={formatFiat(totalFiat)} | ||
| /> | ||
| </Section> | ||
|
|
||
| <Section> | ||
| <TransactionDetailsProvider transactionMeta={transactionMeta}> | ||
| <TransactionDetailsSummary /> | ||
| </TransactionDetailsProvider> | ||
| </Section> | ||
| </div> | ||
|
|
||
| <Footer> | ||
| <ConvertAgainButton sourceToken={item.data.sourceToken} /> | ||
| </Footer> | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extracted from other locally-enriched detail pages