Skip to content

Commit a6095fd

Browse files
committed
format latest testimony
1 parent ba6d181 commit a6095fd

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

components/ViewBills/ViewBills.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from "react"
33
import { Button, Container, Row, Spinner, Table } from "react-bootstrap"
44
import * as links from "../../components/links.tsx"
55
import { useBills, useMember } from "../db"
6-
import { formatBillId, formatHearingDate } from "../formatting"
6+
import { formatBillId, formatTimestamp } from "../formatting"
77
import { BillSearch } from "../search"
88
import { PaginationButtons } from "../table"
99

@@ -69,12 +69,9 @@ const BillRow = props => {
6969
<td>{SponsorComponent}</td>
7070
<td>{fullBill.city}</td>
7171
<td>{numCoSponsors}</td>
72-
<td>{formatHearingDate(fullBill.nextHearingAt)}</td>
72+
<td>{formatTimestamp(fullBill.nextHearingAt)}</td>
7373
<td>{fullBill.testimonyCount}</td>
74-
<td>
75-
{fullBill.latestTestimonyAt &&
76-
fullBill.latestTestimonyAt.toDate().toLocaleDateString()}
77-
</td>
74+
<td>{formatTimestamp(fullBill.latestTestimonyAt)}</td>
7875
<td>{committeeCell}</td>
7976
</tr>
8077
)

components/ViewBillsOnHomePage/ViewBillsOnHomePage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
22
import { Button, Container, Table } from "react-bootstrap"
33
import { useUpcomingBills } from "../db"
4-
import { formatBillId, formatHearingDate } from "../formatting"
4+
import { formatBillId, formatTimestamp } from "../formatting"
55
import { Wrap } from "../links"
66

77
const BillRow = props => {
@@ -15,7 +15,7 @@ const BillRow = props => {
1515
<Button variant="primary">{formatBillId(bill.BillNumber)}</Button>
1616
</Wrap>
1717
</td>
18-
<td>{formatHearingDate(fullBill.nextHearingAt)}</td>
18+
<td>{formatTimestamp(fullBill.nextHearingAt)}</td>
1919
</tr>
2020
)
2121
}

components/formatting.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const formatBillId = (id: string) => {
1313
}
1414

1515
const MISSING_TIMESTAMP = Timestamp.fromMillis(0)
16-
export const formatHearingDate = (t?: Timestamp) => {
16+
export const formatTimestamp = (t?: Timestamp) => {
1717
if (!t || t.toMillis() == MISSING_TIMESTAMP.toMillis()) {
1818
return undefined
1919
}

0 commit comments

Comments
 (0)