Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -428,30 +428,98 @@ describe('TransactionDetailsSummary', () => {
useIsMoneyAccountContext.mockReturnValue(false);
});

it('shows "Steps (X completed)" heading when money context is true', () => {
it('shows "Steps (X completed)" heading for multi-step transactions', () => {
useIsMoneyAccountContext.mockReturnValue(true);

useTransactionDetailsMock.mockReturnValue({
transactionMeta: {
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.moneyAccountDeposit,
type: TransactionType.moneyAccountWithdraw,
status: TransactionStatus.confirmed,
requiredTransactionIds: [REQUIRED_TRANSACTION_ID_MOCK],
} as unknown as TransactionMeta,
});

const { getByText } = render({
transactions: [
{
id: REQUIRED_TRANSACTION_ID_MOCK,
chainId: '0x1',
type: TransactionType.relayDeposit,
status: TransactionStatus.confirmed,
},
{
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.moneyAccountDeposit,
type: TransactionType.moneyAccountWithdraw,
status: TransactionStatus.confirmed,
},
],
});

expect(getByText('Steps (2 completed)')).toBeDefined();
});

it('hides heading for single-step transactions', () => {
useIsMoneyAccountContext.mockReturnValue(true);

useTransactionDetailsMock.mockReturnValue({
transactionMeta: {
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.moneyAccountWithdraw,
status: TransactionStatus.confirmed,
} as unknown as TransactionMeta,
});

const { queryByText } = render({
transactions: [
{
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.moneyAccountWithdraw,
status: TransactionStatus.confirmed,
},
],
});

expect(getByText('Steps (1 completed)')).toBeDefined();
expect(queryByText(/Steps \(/u)).toBeNull();
expect(queryByText('Summary')).toBeNull();
});

it('shows heading and deposit line for mUSD conversion with musdRelayDeposit child', () => {
useIsMoneyAccountContext.mockReturnValue(true);

useTransactionDetailsMock.mockReturnValue({
transactionMeta: {
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.musdConversion,
status: TransactionStatus.confirmed,
requiredTransactionIds: [REQUIRED_TRANSACTION_ID_MOCK],
} as unknown as TransactionMeta,
});

const { getByText } = render({
transactions: [
{
id: REQUIRED_TRANSACTION_ID_MOCK,
chainId: '0x1',
type: TransactionType.musdRelayDeposit,
status: TransactionStatus.confirmed,
},
{
id: transactionIdMock,
chainId: '0x1',
type: TransactionType.musdConversion,
status: TransactionStatus.confirmed,
},
],
});

expect(getByText('Steps (2 completed)')).toBeDefined();
expect(getByText('DepositSummaryLine')).toBeDefined();
});

it('includes fiatOrderId in completedCount when parent is confirmed', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,22 @@ export function TransactionDetailsSummary() {

const completedCount = txCompletedCount + (hasExtraCompletedStep ? 1 : 0);

const heading = isMoneyContext
? strings('transaction_details.label.steps_completed', {
count: completedCount,
})
: strings('transaction_details.label.summary');
const hasMultipleSteps =
transactions.length > 1 || Boolean(fiatOrderId) || Boolean(showSourceHash);

let heading: string | undefined;

if (!isMoneyContext) {
heading = strings('transaction_details.label.summary');
} else if (hasMultipleSteps) {
heading = strings('transaction_details.label.steps_completed', {
count: completedCount,
});
}

return (
<Box gap={12}>
<Text color={TextColor.Alternative}>{heading}</Text>
{heading ? <Text color={TextColor.Alternative}>{heading}</Text> : null}
<ProgressList showConnectors={false}>
{fiatOrderId ? (
<FiatOrderSummaryLine parentTransaction={transactionMeta} />
Expand Down Expand Up @@ -164,6 +171,6 @@ function isSkippedTransaction(
): boolean {
return (
hasTransactionType(parentTransaction, [TransactionType.musdConversion]) &&
!hasTransactionType(transaction, [TransactionType.relayDeposit])
!hasTransactionType(transaction, RELAY_DEPOSIT_TYPES)
);
}
Loading