resolved merge conflict

cfpb · May 31, 2024 · ae2f216 · ae2f216
2 parents 78537e5 + 4a0a57e
commit ae2f216
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 68 deletions.
diff --git a/src/pages/AuthenticatedLanding/FileSbl.tsx b/src/pages/AuthenticatedLanding/FileSbl.tsx
@@ -14,8 +14,8 @@ export function FileSbl(): JSX.Element {
         discrimination.
       </Paragraph>
       <List isLinks className='mt-[15px]'>
-        <ListLink href='/filing'>
-          File your small business lending data
+        <ListLink href='/filing' className='a-btn'>
+          File your data
         </ListLink>
       </List>
     </SubsectionWrapper>

diff --git a/src/pages/Filing/FilingHome.tsx b/src/pages/Filing/FilingHome.tsx
@@ -13,7 +13,7 @@ import {
   WellContent,
 } from 'design-system-react';
 import type { ReactElement } from 'react';
-import { gleifLink, loginGovHomepage } from 'utils/common';
+import { gleifGetAnLEI, loginGovHomepage } from 'utils/common';
 import './FilingHome.less';
 import ProcessStep from './ProcessStep';
 
@@ -58,7 +58,7 @@ function Home(): ReactElement {
               In order to begin using the platform you must have a Legal Entity
               Identifier (LEI) for your financial institution. If your
               organization does not have an LEI, visit the{' '}
-              <Link href={gleifLink}>Global LEI Foundation (GLEIF)</Link>{' '}
+              <Link href={gleifGetAnLEI}>Global LEI Foundation (GLEIF)</Link>{' '}
               website.
             </ProcessStep>
 
@@ -157,8 +157,9 @@ function Home(): ReactElement {
             <Divider className='my-[2.813rem]' />
             <Heading type='5'>Privacy Act</Heading>
             <Paragraph>
-              The information in this system is being collected to facilitate
-              the supervision of companies under CFPB{'\u2019'}s authority.
+              The Consumer Financial Protection Bureau (CFPB) is collecting data
+              to test the functionality of the small business lending data
+              submission platform.
             </Paragraph>
             <List className='mt-[1rem] list-none pl-0' isLinks>
               <ListLink href='/privacy-act-notice'>

diff --git a/src/pages/Filing/PaperworkNotice.tsx b/src/pages/Filing/PaperworkNotice.tsx
@@ -23,13 +23,13 @@ function PaperworkNotice(): ReactElement {
                 per respondent. The obligation to respond to this collection of
                 information is mandatory per the Equal Credit Opportunity Act
                 (ECOA), 15 U.S.C. 1691 et seq., implemented by Regulation B, 12
-                CFR Part. Comments regarding this collection of information,
-                including the estimated response time, suggestions for improving
-                the usefulness of the information, or suggestions for reducing
-                the burden to respond to this collection should be submitted to
-                Bureau at the Consumer Financial Protection Bureau (Attention:
-                PRA Office), 1700 G Street NW, Washington, DC 20552, or by email
-                to{' '}
+                CFR Part 1002. Comments regarding this collection of
+                information, including the estimated response time, suggestions
+                for improving the usefulness of the information, or suggestions
+                for reducing the burden to respond to this collection should be
+                submitted to the Consumer Financial Protection Bureau
+                (Attention: PRA Office), 1700 G Street NW, Washington, DC 20552,
+                or by email to{' '}
                 <Link href='mailto:[email protected]'>
                   [email protected]
                 </Link>

diff --git a/src/pages/Filing/PrivacyNotice.tsx b/src/pages/Filing/PrivacyNotice.tsx
@@ -1,12 +1,6 @@
 import CrumbTrail from 'components/CrumbTrail';
 import { Link } from 'components/Link';
-import {
-  Layout,
-  List,
-  ListItem,
-  Paragraph,
-  TextIntroduction,
-} from 'design-system-react';
+import { Layout, TextIntroduction } from 'design-system-react';
 import type { ReactElement } from 'react';
 import './Notices.less';
 
@@ -20,47 +14,8 @@ function PrivacyNotice(): ReactElement {
           </CrumbTrail>
           <TextIntroduction
             heading='Privacy Act notice'
-            subheading={`The information in this system is being collected to facilitate the supervision of companies under the CFPB\u2019s authority.`}
-            description={
-              <>
-                <Paragraph>
-                  The information will be used by and disclosed to employees,
-                  contractors, agents, and others authorized by the Consumer
-                  Financial Protection Bureau to:
-                </Paragraph>
-                {/* TODO: all these bespoke spacing values should probably be replaced with DSR
-                  spacing tokens by modifying the Tailwind theme, see:
-                  https://github.com/cfpb/sbl-frontend/issues/103
-                  */}
-                <List className='mb-[1.875rem] list-disc'>
-                  <ListItem>
-                    <Paragraph>
-                      Enforce statutory and regulatory purposes required under
-                      Section 1071 of the Dodd-Frank Act;
-                    </Paragraph>
-                  </ListItem>
-                  <ListItem>
-                    <Paragraph>
-                      Support another federal or state agency or regulatory
-                      authority; and,
-                    </Paragraph>
-                  </ListItem>
-                  <ListItem>
-                    <Paragraph>
-                      To a member of Congress; to the Department of Justice, a
-                      court, an adjudicative body or administrative tribunal, or
-                      a party in litigation.
-                    </Paragraph>
-                  </ListItem>
-                </List>
-                <Paragraph>
-                  The collection of this information is authorized by Pub. L.
-                  No. 111-203, Title X, Section 1011, 1012, 1021, 1024, and
-                  1025, codified at 12 U.S.C. §§ 5491, 5492, 5511, 5514, and
-                  5515.
-                </Paragraph>
-              </>
-            }
+            subheading='The Consumer Financial Protection Bureau (CFPB) is collecting data to test the functionality of the small business lending data submission platform.'
+            description='The testing will help ensure that the system can support the submission of data needed to enforce fair lending laws pursuant to Public Law No. 111-203, Title X, Section 1071, codified at 12 C.F.R. 1002. Participation is voluntary. If you choose to participate, the CFPB will collect your first and last name to test the "Complete your user profile" page. The CFPB will not use the data for any other purpose besides testing. Please do not submit any live data in the system.'
           />
         </Layout.Content>
       </Layout.Wrapper>

diff --git a/src/pages/Filing/UpdateFinancialProfile/UfpForm.tsx b/src/pages/Filing/UpdateFinancialProfile/UfpForm.tsx
@@ -24,7 +24,6 @@ import type { InstitutionDetailsApiType } from 'types/formTypes';
 import { Five } from 'utils/constants';
 import { updateFinancialProfileKeyLogic } from 'utils/getFormErrorKeyLogic';
 import getIsRoutingEnabled from 'utils/getIsRoutingEnabled';
-import AdditionalDetails from './AdditionalDetails';
 import FinancialInstitutionDetailsForm from './FinancialInstitutionDetailsForm';
 import UpdateAffiliateInformation from './UpdateAffiliateInformation';
 import UpdateIdentifyingInformation from './UpdateIdentifyingInformation';
@@ -147,8 +146,6 @@ export default function UFPForm({
           {...{ register, formErrors, watch }}
           heading='Update your parent entity information'
         />
-        <AdditionalDetails {...{ register }} />
-
         <FormButtonGroup>
           <Button
             id='nav-submit'

diff --git a/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx b/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx
@@ -1,7 +1,7 @@
 import FormHeaderWrapper from 'components/FormHeaderWrapper';
 import { Link } from 'components/Link';
 import { Paragraph, TextIntroduction } from 'design-system-react';
-import { gleifLink } from 'utils/common';
+import { gleifGetAnLEI } from 'utils/common';
 
 interface Step1FormHeaderProperties {
   isStep1: boolean;
@@ -26,7 +26,7 @@ function Step1FormHeader({ isStep1 }: Step1FormHeaderProperties): JSX.Element {
               In order to begin using the platform you must have a Legal Entity
               Identifier (LEI) for your financial institution. If your
               organization does not have an LEI, visit the{' '}
-              <Link href={gleifLink} target='_blank'>
+              <Link href={gleifGetAnLEI} target='_blank'>
                 Global LEI Foundation (GLEIF)
               </Link>{' '}
               website. If you need assistance with this form,{' '}

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -2,7 +2,7 @@ export const sblHelpLink = 'https://sblhelp.consumerfinance.gov/';
 // TODO: replace this generic SBL Help link with a specific Salesforce form links
 // depending on the page and the form it should route to, see:
 // https://github.com/cfpb/sbl-frontend/issues/109
-export const gleifLink =
+export const gleifGetAnLEI =
   'https://www.gleif.org/en/about-lei/get-an-lei-find-lei-issuing-organizations';
 export const loginGovAccountPage = 'https://secure.login.gov/account/';
 export const loginGovHomepage = 'https://login.gov/';
@@ -18,7 +18,7 @@ export const sblHelpMail =
 export const formDelimiter = '-';
 
 export default {
-  gleifLink,
+  gleifGetAnLEI,
   loginGovAccountPage,
   loginGovHomepage,
   sblHelpLink,