LaconicNetwork/vega-frontend-monorepo
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: 1842 set expiry to date time format (#1866)

Browse Source 
* fix: #1842 set expiry to date time format

* fix: #1842 consistent expiry date time
This commit is contained in:
m.ray 2022-10-28 09:49:38 +01:00 committed by GitHub
parent 0be668ae86
commit b273e2740d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/market-info/src/components/market-expires/market-expires.spec.tsx
View File

@ -1,5 +1,6 @@
import React from 'react';
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import React from 'react';
import { MarketExpires } from './market-expires'; import { MarketExpires } from './market-expires';
describe('MarketExpires', () => { describe('MarketExpires', () => {
@ -13,7 +14,7 @@ describe('MarketExpires', () => {
'settlement:20220525T1200', 'settlement:20220525T1200',
]; ];
render(<MarketExpires tags={tags} />); render(<MarketExpires tags={tags} />);
expect(screen.getByText('May 25')).toBeInTheDocument(); expect(screen.getByText('25/05/2022, 12:00:00')).toBeInTheDocument();
}); });
it('settlement-date:date', () => { it('settlement-date:date', () => {
@ -23,7 +24,7 @@ describe('MarketExpires', () => {
'settlement-date:2022-04-25T1200', 'settlement-date:2022-04-25T1200',
]; ];
render(<MarketExpires tags={tags} />); render(<MarketExpires tags={tags} />);
expect(screen.getByText('Apr 25')).toBeInTheDocument(); expect(screen.getByText('25/04/2022, 12:00:00')).toBeInTheDocument();
}); });
it('last one proper tag should matter', () => { it('last one proper tag should matter', () => {
@ -33,7 +34,7 @@ describe('MarketExpires', () => {
'settlement-expiry-date:2022-03-25T12:00:00', 'settlement-expiry-date:2022-03-25T12:00:00',
]; ];
render(<MarketExpires tags={tags} />); render(<MarketExpires tags={tags} />);
expect(screen.getByText('Mar 25')).toBeInTheDocument(); expect(screen.getByText('25/03/2022, 12:00:00')).toBeInTheDocument();
}); });
it('when no proper tag nor date should be null', () => { it('when no proper tag nor date should be null', () => {

15
libs/market-info/src/components/market-expires/market-expires.tsx
View File

@ -1,8 +1,7 @@
import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list'; import { getDateTimeFormat, t } from '@vegaprotocol/react-helpers';
import { getDateFormat, t } from '@vegaprotocol/react-helpers'; import { isValid, parseISO } from 'date-fns';
import { format, isValid, parseISO } from 'date-fns';
export const EXPIRE_DATE_FORMAT = 'MMM dd'; import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
export const getMarketExpiryDate = ( export const getMarketExpiryDate = (
tags?: ReadonlyArray<string> | null tags?: ReadonlyArray<string> | null
@ -31,7 +30,7 @@ export const getMarketExpiryDateFormatted = (
): string | null => { ): string | null => {
if (tags) { if (tags) {
const dateFound = getMarketExpiryDate(tags); const dateFound = getMarketExpiryDate(tags);
return dateFound ? format(dateFound, EXPIRE_DATE_FORMAT) : null; return dateFound ? getDateTimeFormat().format(dateFound) : null;
} }
return null; return null;
}; };
@ -45,14 +44,14 @@ export const getExpiryDate = (market: SingleMarketFieldsFragment): string => {
let content = null; let content = null;
if (!closeDate) { if (!closeDate) {
content = closedMarketDate content = closedMarketDate
? `Expired on ${getDateFormat().format(closedMarketDate)}` ? `Expired on ${getDateTimeFormat().format(closedMarketDate)}`
: t('Not time-based'); : t('Not time-based');
} else { } else {
const isExpired = Date.now() - closeDate.valueOf() > 0; const isExpired = Date.now() - closeDate.valueOf() > 0;
const expiryDate = getDateFormat().format(closeDate); const expiryDate = getDateTimeFormat().format(closeDate);
if (isExpired) { if (isExpired) {
content = closedMarketDate content = closedMarketDate
? `Expired on ${getDateFormat().format(closedMarketDate)}` ? `Expired on ${getDateTimeFormat().format(closedMarketDate)}`
: t('Expired'); : t('Expired');
} else { } else {
content = expiryDate; content = expiryDate;