Skip to content

Commit

Permalink
Merge pull request #1662 from hackforla/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
sydneywalcoff authored Jan 6, 2025
2 parents 1afbf6e + 46a9f7a commit 9099e86
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 57 deletions.
21 changes: 1 addition & 20 deletions products/statement-generator/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -237,26 +237,7 @@
"paragraph2.4b": "Please note: The information provided here is only a brief overview. We encourage you to speak with a lawyer or legal aid organization to learn about the pathway to expungement for your individual case.",
"title2.5": "What if I have a question about Expunge Assist or the declaration letter generator that has not been answered?",
"paragraph2.5a": "<p>If you have questions specific to Expunge Assist or Hack for LA such as about our site, the declaration letter generator, or operations and partner organizations, please reach out at <a href='mailto:[email protected]' rel='noreferrer'>[email protected]</a>, and we will try our best to answer them.</p>",
"paragraph2.5b": "If you have a question about the laws or are seeking legal advice for your individual case, then you should contact a lawyer or local legal aid organization.",
"section3": "Updates to California law",
"title3.1": "How does Proposition 47 help me?",
"paragraph3.1a": "Proposition 47 changed the law in California so that certain felony convictions can be reduced to a misdemeanor. These include simple drug possession and some thefts offenses of not more than $950.",
"paragraph3.1b": "The deadline to apply was November 22, 2022. However, you may still apply if you can show the court that you had a good reason to miss the deadline.",
"paragraph3.1c": "If the court finds that you had a good reason and that your conviction is eligible, it will reduce your conviction to a misdemeanor. In certain cases, your conviction can be dismissed.",
"paragraph3.1d": "<p>Check <a href='https://selfhelp.courts.ca.gov/clean-your-record/felony-prop47' target='_blank' rel='noreferrer'>California Courts Record cleaning: Felony convictions and Proposition 47</a> if you are eligible.</p>",
"title3.2": "Do I need to submit a declaration letter under Proposition 47?",
"paragraph3.2a": "Depending on your situation, for example, if you did not satisfy the terms of your probation, or if you had a jail or prison sentence, you may include or attach a declaration letter or supporting documents that your petition is in the interest of justice.",
"paragraph3.2b": "In this case, a declaration letter, though not required, can help strengthen your case and convince the court.",
"paragraph3.2c": "<p>Check <a href='https://selfhelp.courts.ca.gov/clean-your-record/felony-prop47' target='_blank' rel='noreferrer'>California Courts Record cleaning: Felony convictions and Proposition 47</a> if you may attach a declaration letter for your case.</p>",
"title3.3": "How does Proposition 64 help me?",
"paragraph3.3a": "California changed the law for marijuana offenses in 2016, and Proposition 64 changed many marijuana convictions to misdemeanors. These include the sale of marijuana and the possession of marijuana for sale or cultivation.",
"paragraph3.3b": "If you have a conviction from before November 9, 2016, it may be eligible for automatic redesignation to a misdemeanor or even dismissal and sealing. In most cases you do not need to file a petition. If your marijuana conviction has not been cleaned up, you can apply/petition with the court but do not need to submit a declaration letter.",
"paragraph3.3c": "Check <a href='https://selfhelp.courts.ca.gov/clean-your-record/marijuana-conviction-relief-prop-64' target='_blank' rel='noreferrer'>California Courts Marijuana conviction relief (Proposition 64)</a> for more information, eligible offenses, and steps for petition if your conviction has not been cleaned up.",
"title3.4": "How is Proposition 47 different from Proposition 64?",
"paragraph3.4a": "<p>Proposition 47 reduces certain eligible drug or theft felonies to misdemeanors. The deadline for applying for reduction was November 22, 2022, but if the court finds that you have a good reason to miss the deadline, you may still be eligible. Depending on your case, <b>you may want to include a declaration letter in your petition.</b></p>",
"paragraph3.4b": "<p>Proposition 64 automatically cleans up marijuana-related convictions, either with redesignation to a misdemeanor, or dismissal and sealing. Most eligible cases are reduced or dismissed automatically by the courts. If your conviction has not been cleaned up, you may apply but <b>do not need to submit a declaration letter.</b> There is no time limit for applying for redesignation or dismissal of a conviction.</p>",
"title3.5": "How does Senate Bill 731 help me?",
"paragraph3.5a": "<p>Senate Bill 731 is a law, effective July 1, 2023, that extends automatic conviction expungement from only convictions with probation sentences, where probation was not violated, to other felony convictions if 4 years have passed and you have not been convicted of a new felony offense. If you are eligible for automatic expungement under this law, you <b>do not need to petition or write a declaration letter.</b></p>"
"paragraph2.5b": "If you have a question about the laws or are seeking legal advice for your individual case, then you should contact a lawyer or local legal aid organization."
},
"about_us_page": {
"page_header": "About Us",
Expand Down
27 changes: 27 additions & 0 deletions products/statement-generator/src/__tests__/progressbar.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import '@testing-library/jest-dom';
import ProgressBar from 'components/ProgressBar';

describe('Progress Bar', () => {
// tests that progress bar renders correctly
test('renders the progress bar component', () => {
render(<ProgressBar percentage={16.67} />);
const progressBarElement = screen.getByRole('progressbar');
expect(progressBarElement).toBeInTheDocument();
});

// tests that progress bar renders the percentage that it's passed
test('progress bar displays the correct percentage', () => {
render(<ProgressBar percentage={50} />);
const progressBarElement = screen.getByRole('progressbar');
expect(progressBarElement).toHaveAttribute('aria-valuenow', '50');
});

// tests that progress bar renders the percentage its passed when completed
test('progress bar displays the correct max percentage', () => {
render(<ProgressBar percentage={100} />);
const progressBarElement = screen.getByRole('progressbar');
expect(progressBarElement).toHaveAttribute('aria-valuenow', '100');
});
});
37 changes: 0 additions & 37 deletions products/statement-generator/src/pages/FAQ.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,43 +187,6 @@ function FAQ() {
content={['faq_page.paragraph2.5a', 'faq_page.paragraph2.5b']}
/>
</section>

<section>
<h2 className={classes.sectionTitle}>{t('faq_page.section3')}</h2>
<FAQAccordion
title="faq_page.title3.1"
content={[
'faq_page.paragraph3.1a',
'faq_page.paragraph3.1b',
'faq_page.paragraph3.1c',
'faq_page.paragraph3.1d',
]}
/>
<FAQAccordion
title="faq_page.title3.2"
content={[
'faq_page.paragraph3.2a',
'faq_page.paragraph3.2b',
'faq_page.paragraph3.2c',
]}
/>
<FAQAccordion
title="faq_page.title3.3"
content={[
'faq_page.paragraph3.3a',
'faq_page.paragraph3.3b',
'faq_page.paragraph3.3c',
]}
/>
<FAQAccordion
title="faq_page.title3.4"
content={['faq_page.paragraph3.4a', 'faq_page.paragraph3.4b']}
/>
<FAQAccordion
title="faq_page.title3.5"
content={['faq_page.paragraph3.5a']}
/>
</section>
</ContentContainer>
</>
);
Expand Down

0 comments on commit 9099e86

Please sign in to comment.