Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Type of FI] Update page content #543

Merged
merged 22 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
92d980f
task: [CommonLinks] Add RegB link: § 1002.109(b)(9)
meissadia May 20, 2024
877b1cc
feat: [CrumbTrail] Allow additional classNames
meissadia May 20, 2024
44eea10
task: [InputEntry] Restrict helper text width to 670px
meissadia May 20, 2024
3c3351b
task: [Type of FI] Add crumb trail; Update section intro content
meissadia May 20, 2024
af161c7
task: [Type of FI] Update field-level error messages and helper text
meissadia May 20, 2024
e5ba5a6
task: [Type of FI] Update layout and error message
meissadia May 20, 2024
eb5fa7b
code cleanup
meissadia May 20, 2024
7d71ba1
fix: [Types of FI] Error header message adjustment
meissadia May 20, 2024
f91ff34
Merge branch 'main' into 532-type-of-fi__update-content
meissadia May 21, 2024
ec17c54
fix: [Types of FI] Content update
meissadia May 21, 2024
7fe25a1
Merge branch 'main' into 532-type-of-fi__update-content
meissadia May 21, 2024
a2309b9
fix: [Types of FI] Dynamic error alert heading content
meissadia May 21, 2024
02f6a05
fix(type-of-fi): fix heading, filing home nav
billhimmelsbach May 22, 2024
8c9923d
fix: [Types of FI] Spacing between "Other" and helper text
meissadia May 22, 2024
0e491fa
fix: [Types of FI] Spacing between "Other" and helper text (part 2)
meissadia May 22, 2024
87ce889
Merge branch 'main' into 532-type-of-fi__update-content
meissadia May 25, 2024
96ba2d9
Merge branch 'main' into 532-type-of-fi__update-content
meissadia May 25, 2024
d832fcc
Merge branch 'main' into 532-type-of-fi__update-content
meissadia May 28, 2024
e46a09a
task: Cleanup duplicate code
meissadia May 28, 2024
03c84cf
task: Cleanup duplicate code
meissadia May 28, 2024
f37cf77
fix: [Update institution profile] Update second header
meissadia May 28, 2024
4f06723
task: Code cleanup
meissadia May 28, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ function TypesFinancialInstitutionSection({
{...register('sbl_institution_types_other', {
value: typeOtherData?.details,
})}
helperText='You must enter a type of financial institution in the text field when
meissadia marked this conversation as resolved.
Show resolved Hide resolved
“Other” is selected. Separate multiple entries with a comma and a space.'
helperText='You must enter a type of financial institution in the text field when “Other” is selected. Separate multiple entries with a comma and a space.'
errorMessage={formErrors.sbl_institution_types_other?.message}
showError
isLast
Expand Down
8 changes: 4 additions & 4 deletions src/pages/TypesFinancialInstitutions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import FormHeaderWrapper from 'components/FormHeaderWrapper';
import FormMain from 'components/FormMain';
import FormWrapper from 'components/FormWrapper';
import { LoadingContent } from 'components/Loading';
import { Alert, Paragraph, TextIntroduction } from 'design-system-react';
import { Alert, Link, Paragraph, TextIntroduction } from 'design-system-react';
meissadia marked this conversation as resolved.
Show resolved Hide resolved
import FilingNavButtons from 'pages/Filing/FilingApp/FilingNavButtons';
import TypesFinancialInstitutionSection from 'pages/Filing/UpdateFinancialProfile/TypesFinancialInstitutionSection';
import type { UpdateTypeOfInstitutionType } from 'pages/Filing/UpdateFinancialProfile/types';
import { UpdateTypeOfInstitutionSchema } from 'pages/Filing/UpdateFinancialProfile/types';
import { scrollToElement } from 'pages/ProfileForm/ProfileFormUtils';
import { useForm } from 'react-hook-form';
import { Link, useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router-dom';
import { normalKeyLogic } from 'utils/getFormErrorKeyLogic';
import useInstitutionDetails from 'utils/useInstitutionDetails';
import { formatTypesForApi } from './TypesFinancialInstitutions.helpers';
Expand Down Expand Up @@ -111,8 +111,8 @@ function TypesFinancialInstitutions(): JSX.Element {
</CrumbTrail>
</div>
<TextIntroduction
heading='Provide your type of financial institution'
subheading='Select all applicable types of financial institutions from the list below. If the enumerated types do not appropriately describe your institution, or if you wish to add additional types, select "Other" and add your financial institution type in the text field.'
heading='Provide type of financial institution'
subheading='Select all applicable types of financial institutions from the list below. If the enumerated types do not appropriately describe your financial institution, or if you wish to add additional types, select "Other" and add your financial institution type in the text field.'
description={
<Paragraph>
You must select at least one type of financial institution to
Expand Down
12 changes: 12 additions & 0 deletions src/types/formTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ import {
import { Five, One } from 'utils/constants';
import { z } from 'zod';

export enum FormFieldsHeaderError {
firstName = 'Enter your first name',
lastName = 'Enter your last name',
email = 'Invalid email address',
financialInstitutions = 'Select the institution for which you are authorized to file',
tin = 'Enter your Federal Taxpayer Identification Number (TIN)',
name = "Enter your financial institution's name",
lei = "Enter your financial institution's Legal Entity Identifier (LEI)",
sbl_institution_types = 'Select your type of financial institution',
sbl_institution_types_other = 'Enter a type of financial institution for "Other"',
}
meissadia marked this conversation as resolved.
Show resolved Hide resolved

// Used in react-select format (potentially can be removed)
const financialInstitutionsSchema = z.object({
label: z.string(),
Expand Down