diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap index 50c6ecfc..119e91d2 100644 --- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap +++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap @@ -530,14 +530,14 @@ exports[`rendering of the Categories checks if component renders 1`] = ` AND - more than 10% of people ages 25 or older have a + more than 10% of people ages 25 years or older whose high school education is less than a - high school education + high school diploma - (i.e. graduated with a high school diploma) +

diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap index 8d1aef64..7e0ff527 100644 --- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap +++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap @@ -51,6 +51,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl > Screeningtool-Support@omb.eop.gov + .

diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index a0e973ac..6f1ed6a5 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -93,7 +93,7 @@ export const CONTENT = { Sign-up for updates from CEQ + CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. Sign-up for updates from CEQ. `} description={'Navigate to the About page. This is the paragraph 4'} values={{ @@ -269,7 +269,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = { />, LIST_ITEM_4: form . Otherwise, email: Screeningtool-Support@omb.eop.gov`} + defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form . Otherwise, email: Screeningtool-Support@omb.eop.gov.`} description={`Navigate to the about page. You will see How you can help list item 3`} values={{ link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false), diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx index 7e4d3f81..459fda13 100644 --- a/client/src/data/copy/faqs.tsx +++ b/client/src/data/copy/faqs.tsx @@ -217,12 +217,12 @@ export const QUESTIONS = [ defaultMessage={ 'Q: Can the public provide feedback on this tool?'} description={ 'Navigate to the FAQs page, this will be Q15'} />, - // , + , , Q5_P2: annual notice it publishes in the Federal Register:`} + defaultMessage={ `Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the annual notice it publishes in the Federal Register.`} description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2'} values={{ link1: linkFn(FED_RECOGNIZED_INDIAN_ENTITIES, false, true), @@ -381,7 +381,7 @@ export const FAQ_ANSWERS = { />, Q5_P2_1: Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation , and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.`} + defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.`} description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2_1'} values={{ link1: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_ACTION_PLAN_4_26_21, false, true), @@ -606,8 +606,13 @@ export const FAQ_ANSWERS = { />, Q16: feedback from Federal agencies, Tribal Nations, State and local governments, Members of Congress, environmental justice stakeholders, and the public. The 90 day public comment period closed on May 25, 2022. CEQ and the USDS hosted several public training sessions on the beta version of the CEJST. All of this feedback on the beta version of the CEJST helped to inform the release of version 1.0 of the CEJST.`} description={ 'Navigate to the FAQs page, this will be an answer, Q16'} + values={{ + link1: linkFn('https://www.federalregister.gov/documents/2022/02/23/2022-03920/climate-and-economic-justice-screening-tool-beta-version', false, true), + link2: linkFn('https://www.whitehouse.gov/ceq/news-updates/2022/04/21/ceq-extends-public-comment-period-on-beta-version-of-the-climate-and-economic-justice-screening-tool/', false, true), + link3: linkFn('https://www.youtube.com/watch?v=QwHWcXbhw28', false, true), + }} />, Q17_P1: , HS_DEG_GTE_10: AND more than 10% of people ages 25 or older have a high school education (i.e. graduated with a high school diploma) + defaultMessage={`AND more than 10% of people ages 25 years or older whose high school education is less than a high school diploma `} description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school diploma rate'} values={{ diff --git a/client/src/intl/en.json b/client/src/intl/en.json index 7c675510..06e8ed98 100644 --- a/client/src/intl/en.json +++ b/client/src/intl/en.json @@ -36,7 +36,7 @@ "description": "Navigate to the about page. You will see How you can help list item 3" }, "about.page.how.you.can.help.list.item.4": { - "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form . Otherwise, email: Screeningtool-Support@omb.eop.gov", + "defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this form . Otherwise, email: Screeningtool-Support@omb.eop.gov.", "description": "Navigate to the about page. You will see How you can help list item 3" }, "about.page.how.you.can.help.para.1": { @@ -76,7 +76,7 @@ "description": "Navigate to the About page. This is the paragraph 3" }, "about.page.paragraph.4": { - "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. Sign-up for updates from CEQ", + "defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. Sign-up for updates from CEQ.", "description": "Navigate to the About page. This is the paragraph 4" }, "about.page.paragraph.5": { @@ -1519,6 +1519,10 @@ "defaultMessage": "Q: Can the public provide feedback on this tool?", "description": "Navigate to the FAQs page, this will be Q15" }, + "faqs.page.Q16": { + "defaultMessage": "Q: Why was the CEJST initially released in a beta version?", + "description": "Navigate to the FAQs page, this will be Q16" + }, "faqs.page.Q17": { "defaultMessage": "Q: When did the official version of the tool come out?", "description": "Navigate to the FAQs page, this will be Q17" @@ -1656,7 +1660,7 @@ "description": "Navigate to the FAQs page, this will be an answer, Q15_P1_4" }, "faqs.page.answers.Q16": { - "defaultMessage": "Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.", + "defaultMessage": "CEQ launched a beta – or draft – version of the CEJST on February 18, 2022 with support from the U.S. Digital Service (USDS), and in collaboration with other Federal agencies and departments. The CEJST was released in a beta version in order to seek feedback from Federal agencies, Tribal Nations, State and local governments, Members of Congress, environmental justice stakeholders, and the public. The 90 day public comment period closed on May 25, 2022. CEQ and the USDS hosted several public training sessions on the beta version of the CEJST. All of this feedback on the beta version of the CEJST helped to inform the release of version 1.0 of the CEJST.", "description": "Navigate to the FAQs page, this will be an answer, Q16" }, "faqs.page.answers.Q17_P1": { @@ -1760,11 +1764,11 @@ "description": "Navigate to the FAQs page, this will be an answer, Q5_P1" }, "faqs.page.answers.Q5_P2": { - "defaultMessage": "Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the annual notice it publishes in the Federal Register:", + "defaultMessage": "Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the annual notice it publishes in the Federal Register.", "description": "Navigate to the FAQs page, this will be an answer, Q5_P2" }, "faqs.page.answers.Q5_P2_1": { - "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation , and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.", + "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.", "description": "Navigate to the FAQs page, this will be an answer, Q5_P2_1" }, "faqs.page.answers.Q6_P1": { @@ -1932,7 +1936,7 @@ "description": "responsible party text" }, "methodology.page.category.and.clause.hs.ed.higher.ed": { - "defaultMessage": "AND more than 10% of people ages 25 or older have a high school education (i.e. graduated with a high school diploma)", + "defaultMessage": "AND more than 10% of people ages 25 years or older whose high school education is less than a high school diploma", "description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school diploma rate" }, "methodology.page.category.and.clause.low.inc": { diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx index 8ccbbf1f..172b52e0 100644 --- a/client/src/pages/about.tsx +++ b/client/src/pages/about.tsx @@ -18,8 +18,8 @@ import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; import accountBalanceIcon // @ts-ignore from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg'; -import groupsIcon from // @ts-ignore - '/node_modules/uswds/dist/img/usa-icons/groups.svg'; +import fileDownloadIcon from // @ts-ignore + '/node_modules/uswds/dist/img/usa-icons/file_download.svg'; import commentIcon from // @ts-ignore '/node_modules/uswds/dist/img/usa-icons/comment.svg'; @@ -128,7 +128,7 @@ const AboutPage = ({location}: IAboutPageProps) => { { <>

{FAQS_COPY.FAQ_ANSWERS.Q5_P1}

{FAQS_COPY.FAQ_ANSWERS.Q5_P2}

- +

+ {FAQS_COPY.FAQ_ANSWERS.Q5_P2_1} +

), ( @@ -188,11 +188,11 @@ const FAQPage = ({location}: IFAQPageProps) => { ), - // ( - // <> - //

{FAQS_COPY.FAQ_ANSWERS.Q16}

- // - // ), + ( + <> +

{FAQS_COPY.FAQ_ANSWERS.Q16}

+ + ), ( <>

{FAQS_COPY.FAQ_ANSWERS.Q17_P1}

diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap index 3d90261e..8d4f03b9 100644 --- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap @@ -513,7 +513,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Sign-up - for updates from CEQ + for updates from CEQ.

@@ -886,6 +886,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Screeningtool-Support@omb.eop.gov + .

diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index 65e970ff..7e0ce7d0 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -661,43 +661,41 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > annual notice - it publishes in the Federal Register: + it publishes in the Federal Register. +

+

+ This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s + + Action Plan + + for Consultation and Coordination with Tribal Nations, President Biden’s + + Memorandum + + on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and + + Executive Order 13175 + + on Consultation and Coordination With Indian Tribal Governments.

-

- Q: When did the official version of the tool come out? + Q: Why was the CEJST initially released in a beta version?

+

+ +

+