Skip to content
Merged
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
20 changes: 16 additions & 4 deletions components/bill/BillDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,22 @@ export const BillDetails = ({ bill }: BillProps) => {

const isPendingUpgrade = useAuth().claims?.role === "pendingUpgrade"
const flags = useFlags()

const { user } = useAuth()

let isBallotMeasure = false
const curComm = bill?.currentCommittee?.id

if (curComm == "SJ42") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: We should probably make this a constant like currentGeneralCourt, but I'm going to do this as part of a follow-up PR, so we can ignore it for this PR.

isBallotMeasure = true
}

return (
<>
{isPendingUpgrade && <PendingUpgradeBanner />}
{!isCurrentCourt(bill.court) && (
<Banner>{t("bill.old_session", { billCourt: bill.court })}</Banner>
)}
{isBallotMeasure && <Banner>{t("bill.ballot_initiative")}</Banner>}

<Container className="mt-3 mb-3">
<Row>
Expand Down Expand Up @@ -74,14 +81,19 @@ export const BillDetails = ({ bill }: BillProps) => {
</Col>
</Row>
)}
<Row className="mt-2">
<Row className="my-2">
<Col>
<Summary bill={bill} />
</Col>
</Row>
<Row>
<Row className="mt-4">
<Col md={8}>
<Sponsors bill={bill} className="mt-4 pb-1" />
{isBallotMeasure ? (
<></>
) : (
<Sponsors bill={bill} className="pb-1" />
)}

<BillTestimonies bill={bill} className="mt-4" />
{flags.lobbyingTable && (
<LobbyingTable bill={bill} className="mt-4 pb-1" />
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"bill": {
"and_others_one": "and {{count}} other",
"and_others_other": "and {{count}} others",
"ballot_initiative": "This bill corresponds to a ballot initiative. The bill is currently before the Legislature, which may choose to enact it directly instead of sending it to voters.",
"bill_tracker": "Bill Tracker",
"bill_cosponsors": "{{billId}} Cosponsors",
"branch": "Branch",
Expand Down
Loading