Skip to content

Commit 95dad60

Browse files
committed
chore: reuse date utility
1 parent e8cd4ed commit 95dad60

3 files changed

Lines changed: 6 additions & 25 deletions

File tree

app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const baseItem: WhatsHappeningItem = {
4545
id: 'trend-0',
4646
title: 'Bitcoin ETF inflows hit record high',
4747
description: 'Spot Bitcoin ETFs recorded over $1.2B in net inflows.',
48-
date: new Date(Date.now() - 4 * 24 * 60 * 60 * 1000).toISOString(),
48+
date: new Date(new Date().getTime() - 4 * 24 * 60 * 60 * 1000).toISOString(),
4949
category: 'macro',
5050
impact: 'positive',
5151
relatedAssets: [mockRelatedAsset],
@@ -129,9 +129,9 @@ describe('WhatsHappeningCard', () => {
129129
expect(screen.queryByText('BTC')).toBeNull();
130130
});
131131

132-
it('renders compact relative time when date is valid', () => {
132+
it('renders relative time when date is valid', () => {
133133
renderWithProvider(<WhatsHappeningCard item={baseItem} cardIndex={0} />);
134-
expect(screen.getByText('4d')).toBeOnTheScreen();
134+
expect(screen.getByText('4d ago')).toBeOnTheScreen();
135135
});
136136

137137
it('does not render date when date string is invalid', () => {

app/components/Views/Homepage/Sections/WhatsHappening/components/WhatsHappeningCard.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
BoxJustifyContent,
1313
} from '@metamask/design-system-react-native';
1414
import type { WhatsHappeningItem } from '../types';
15-
import { formatShortRelative } from '../util/formatDate';
1615
import {
1716
getImpactLabel,
1817
getImpactBackgroundClass,
@@ -22,6 +21,7 @@ import PerpsTokenLogo from '../../../../../UI/Perps/components/PerpsTokenLogo';
2221
import { MetaMetricsEvents } from '../../../../../../core/Analytics';
2322
import { useAnalytics } from '../../../../../hooks/useAnalytics/useAnalytics';
2423
import { useViewportTracking } from '../../../../../UI/MarketInsights/hooks/useViewportTracking';
24+
import { formatRelativeTime } from '../../../../../UI/MarketInsights/utils/marketInsightsFormatting';
2525
import { getWhatsHappeningEventProps } from '../eventProperties';
2626

2727
interface WhatsHappeningCardProps {
@@ -39,7 +39,8 @@ const WhatsHappeningCard: React.FC<WhatsHappeningCardProps> = ({
3939
}) => {
4040
const tw = useTailwind();
4141
const formattedDate = useMemo(
42-
() => formatShortRelative(item.date),
42+
() =>
43+
item.date ? formatRelativeTime(item.date, { nowLabel: 'now' }) : null,
4344
[item.date],
4445
);
4546
const { trackEvent, createEventBuilder } = useAnalytics();

app/components/Views/Homepage/Sections/WhatsHappening/util/formatDate.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)