From 7aadbcca758a089fbde0bb565e64d42c41375d97 Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 15:47:39 -0500 Subject: [PATCH 01/40] refactor: Utilized DSR AlertFieldLevel in NoDatabaseResultError --- .../Step1Form/NoDatabaseResultError.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx b/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx index e1fd67846..390366ead 100644 --- a/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx +++ b/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx @@ -1,19 +1,18 @@ import ErrorIcon from 'components/ErrorIcon'; -import { Link } from 'design-system-react'; +import { Link, AlertFieldLevel } from 'design-system-react'; +import { sblHelpLink } from 'utils/common'; function NoDatabaseResultError(): JSX.Element { return (
- -
-

- The financial institution/LEI you searched for was not found in our + The financial institution/LEI you searched for was not found in our database. If you recently registered for an LEI with GLEIF, your registration may still be in process. If you need further assistance - please submit a technical question to our help - desk. -

-
+ please submit a technical question to our help + desk.} + status="error" + />
); } From 7f27a8572ba190227d841341df494e2d43fee9df Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 15:48:26 -0500 Subject: [PATCH 02/40] refactor: created a const for the sblhelp link --- src/App.tsx | 3 ++- src/pages/Filing/FilingHome.tsx | 3 ++- src/pages/Filing/InstitutionDetails/PageIntro.tsx | 3 ++- src/pages/Filing/ViewUserProfile/index.tsx | 3 ++- src/utils/common.ts | 5 +++++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 src/utils/common.ts diff --git a/src/App.tsx b/src/App.tsx index 418f768ab..f029198ca 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -16,6 +16,7 @@ import { Suspense, lazy } from 'react'; import { BrowserRouter, Navigate, Outlet, Route, Routes, useLocation } from 'react-router-dom'; import useProfileForm from 'store/useProfileForm'; import './App.less'; +import { sblHelpLink } from 'utils/common'; const FilingApp = lazy(async () => import('pages/Filing/FilingApp')); @@ -136,7 +137,7 @@ function ProtectedRoute({ // TODO: replace this generic SBL Help link with a specific Salesforce form link, see: // https://github.com/cfpb/sbl-frontend/issues/109 window.location.replace( - 'https://sblhelp.consumerfinance.gov/', + sblHelpLink, ); return null; } diff --git a/src/pages/Filing/FilingHome.tsx b/src/pages/Filing/FilingHome.tsx index 035eecebd..520438db9 100644 --- a/src/pages/Filing/FilingHome.tsx +++ b/src/pages/Filing/FilingHome.tsx @@ -15,6 +15,7 @@ import type { ReactElement } from 'react'; import { Link as RouterLink } from "react-router-dom"; import './FilingHome.less'; import ProcessStep from './ProcessStep'; +import { sblHelpLink } from 'utils/common'; function Home(): ReactElement { const auth = useSblAuth(); @@ -105,7 +106,7 @@ function Home(): ReactElement { > Find answers to frequently asked questions , - + Submit a question , ]} diff --git a/src/pages/Filing/InstitutionDetails/PageIntro.tsx b/src/pages/Filing/InstitutionDetails/PageIntro.tsx index 172e8ae92..da5aae6ff 100644 --- a/src/pages/Filing/InstitutionDetails/PageIntro.tsx +++ b/src/pages/Filing/InstitutionDetails/PageIntro.tsx @@ -1,4 +1,5 @@ import { Link, TextIntroduction } from 'design-system-react'; +import { sblHelpLink } from 'utils/common'; export function PageIntro(): JSX.Element { return ( @@ -15,7 +16,7 @@ export function PageIntro(): JSX.Element { callToAction={ // TODO: replace this generic SBL Help link with a specific Salesforce form link, see: // https://github.com/cfpb/sbl-frontend/issues/109 - Update your financial institution profile + Update your financial institution profile } /> ); diff --git a/src/pages/Filing/ViewUserProfile/index.tsx b/src/pages/Filing/ViewUserProfile/index.tsx index ad654d078..7d1def03c 100644 --- a/src/pages/Filing/ViewUserProfile/index.tsx +++ b/src/pages/Filing/ViewUserProfile/index.tsx @@ -8,6 +8,7 @@ import useSblAuth from '../../../api/useSblAuth'; import CrumbTrail from '../../../components/CrumbTrail'; import AssociatedInstitutions from './AssociatedInstitutions'; import UserInformation from './UserInformation'; +import { sblHelpLink } from 'utils/common'; export default function ViewUserProfile(): JSX.Element { @@ -54,7 +55,7 @@ export default function ViewUserProfile(): JSX.Element { // TODO: replace this generic SBL Help link with a specific Salesforce form link, see: // https://github.com/cfpb/sbl-frontend/issues/109 callToAction={ - Update your user profile + Update your user profile } /> diff --git a/src/utils/common.ts b/src/utils/common.ts new file mode 100644 index 000000000..739f31f1f --- /dev/null +++ b/src/utils/common.ts @@ -0,0 +1,5 @@ +export const sblHelpLink = 'https://sblhelp.consumerfinance.gov/'; + +export default { + sblHelpLink +} \ No newline at end of file From 0fc8bc840b32634661b91a06cbccffe596d31450 Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 16:09:25 -0500 Subject: [PATCH 03/40] refactor: InputEntry utilizes DSR's TextInput --- src/App.tsx | 3 ++- src/pages/ProfileForm/Step1Form/InputEntry.tsx | 12 ++++-------- src/pages/ProfileForm/Step1Form/Step1Form.tsx | 7 +++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index f029198ca..4e5bbbfe8 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,6 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ +import 'design-system-react/style.css'; + import { useQuery } from '@tanstack/react-query'; import fetchInstitutions from 'api/fetchInstitutions'; import fetchIsDomainAllowed from 'api/fetchIsDomainAllowed'; @@ -8,7 +10,6 @@ import useSblAuth from 'api/useSblAuth'; import classNames from 'classnames'; import LoadingOrError from 'components/LoadingOrError'; import { Button, FooterCfGov, Link, PageHeader } from 'design-system-react'; -import 'design-system-react/style.css'; import ViewUserProfile from 'pages/Filing/ViewUserProfile'; import { Scenario } from 'pages/ProfileForm/Step2Form/Step2FormHeader.data'; import type { ReactElement } from 'react'; diff --git a/src/pages/ProfileForm/Step1Form/InputEntry.tsx b/src/pages/ProfileForm/Step1Form/InputEntry.tsx index 86967344c..75d38abc8 100644 --- a/src/pages/ProfileForm/Step1Form/InputEntry.tsx +++ b/src/pages/ProfileForm/Step1Form/InputEntry.tsx @@ -2,6 +2,7 @@ import type { ReactNode } from 'react'; import { forwardRef } from 'react'; import { Element } from 'react-scroll'; +import { TextInput } from 'design-system-react'; import InputErrorMessage from 'components/InputErrorMessage'; interface InputEntryProperties @@ -24,21 +25,16 @@ const InputEntry = forwardRef( {label} {children} - {/* TODO: Replace this item with DSR equivalent : https://github.com/cfpb/sbl-frontend/issues/97 */} - - {/* TODO: Replace this item with DSR equivalent : https://github.com/cfpb/sbl-frontend/issues/97 */} {errors[id] ? (
{errors[id].message} diff --git a/src/pages/ProfileForm/Step1Form/Step1Form.tsx b/src/pages/ProfileForm/Step1Form/Step1Form.tsx index a17039163..ab148583d 100644 --- a/src/pages/ProfileForm/Step1Form/Step1Form.tsx +++ b/src/pages/ProfileForm/Step1Form/Step1Form.tsx @@ -107,7 +107,7 @@ function Step1Form(): JSX.Element { checkedListState.forEach((object: InstitutionDetailsApiCheckedType) => { if (object.checked) { const foundObject: InstitutionDetailsApiType = afData?.find( - institutionsObj => object.lei === institutionsObj.lei, + institutionsObject => object.lei === institutionsObject.lei, ); newFinancialInstitutions.push(foundObject); } @@ -248,10 +248,10 @@ function Step1Form(): JSX.Element { {/* TODO: The below error occurs if the 'Get All Financial Instituions' fetch fails or fetches empty data */} {formErrors.fiData ? : null} - {formErrors['financialInstitutions'] ? ( + {formErrors.financialInstitutions ? (
- {formErrors['financialInstitutions'].message} + {formErrors.financialInstitutions.message}
) : null} @@ -284,7 +284,6 @@ function Step1Form(): JSX.Element {
); } diff --git a/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx b/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx index 390366ead..46a142ecd 100644 --- a/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx +++ b/src/pages/ProfileForm/Step1Form/NoDatabaseResultError.tsx @@ -1,4 +1,3 @@ -import ErrorIcon from 'components/ErrorIcon'; import { Link, AlertFieldLevel } from 'design-system-react'; import { sblHelpLink } from 'utils/common'; From 75099ba02cf59a2c9f2153433804a3c271fbf95d Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 16:30:35 -0500 Subject: [PATCH 05/40] dev: placed a way to destroy the login creds during development --- src/api/useSblAuth.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api/useSblAuth.ts b/src/api/useSblAuth.ts index c0cbbb2ac..5a782f1b2 100644 --- a/src/api/useSblAuth.ts +++ b/src/api/useSblAuth.ts @@ -18,6 +18,11 @@ const useSblAuth = (): SblAuthProperties => { auth.signoutRedirect({ post_logout_redirect_uri: window.location.origin, }); + + // Note: This is placed here because after logging in with a non-domain email the app hard-forwards the user to sblHelp with no way of stopping this + if (import.meta.env.DEV) { + window.logout = onLogout; + } return { ...auth, From f708e8fbc24e09f7daa3e5fbeac2e35bf74329c9 Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 16:47:56 -0500 Subject: [PATCH 06/40] refactor: auto-format --- src/api/submitUserProfile.tsx | 2 +- .../Filing/InstitutionDetails/institutionDetails.type.ts | 9 ++++----- src/pages/ProfileForm/ProfileFormUtils.ts | 3 ++- src/pages/ProfileForm/types.ts | 7 +++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/api/submitUserProfile.tsx b/src/api/submitUserProfile.tsx index bf30d4f95..e4c4fff30 100644 --- a/src/api/submitUserProfile.tsx +++ b/src/api/submitUserProfile.tsx @@ -20,7 +20,7 @@ export const submitUserProfile = async ( body: JSON.stringify(userProfileObject), }); - return response.json() as Promise; + return response.json() ; }; export default submitUserProfile; diff --git a/src/pages/Filing/InstitutionDetails/institutionDetails.type.ts b/src/pages/Filing/InstitutionDetails/institutionDetails.type.ts index 98c767d99..1a49a45cb 100644 --- a/src/pages/Filing/InstitutionDetails/institutionDetails.type.ts +++ b/src/pages/Filing/InstitutionDetails/institutionDetails.type.ts @@ -1,7 +1,6 @@ -import type { - InstitutionDetailsApiType, - DomainType, -} from 'pages/ProfileForm/types'; -export { InstitutionDetailsApiType, DomainType }; + + // Zod to TypeScript conversion in 'pages/ProfileForm/types.ts' + +export {type InstitutionDetailsApiType, type DomainType} from 'pages/ProfileForm/types'; \ No newline at end of file diff --git a/src/pages/ProfileForm/ProfileFormUtils.ts b/src/pages/ProfileForm/ProfileFormUtils.ts index 0213eb234..6316f1a1c 100644 --- a/src/pages/ProfileForm/ProfileFormUtils.ts +++ b/src/pages/ProfileForm/ProfileFormUtils.ts @@ -1,8 +1,9 @@ import type { ValidationSchema, FormattedUserProfileObjectType } from './types'; + export const formatUserProfileObject = ( userProfileObject: ValidationSchema, ): FormattedUserProfileObjectType => ({ first_name: userProfileObject.firstName, last_name: userProfileObject.lastName, - leis: userProfileObject.financialInstitutions.map(obj => obj.lei), + leis: userProfileObject.financialInstitutions.map(object => object.lei), }); diff --git a/src/pages/ProfileForm/types.ts b/src/pages/ProfileForm/types.ts index fd565e94e..9698ba5db 100644 --- a/src/pages/ProfileForm/types.ts +++ b/src/pages/ProfileForm/types.ts @@ -1,5 +1,6 @@ import { z } from 'zod'; + export enum FormFields { firstName = 'First name', lastName = 'Last name', @@ -23,8 +24,6 @@ export type FinancialInstitutionRS = z.infer< typeof financialInstitutionsSchema >; -import { z } from 'zod'; - export const domainSchema = z.object({ domain: z.string(), lei: z.string(), @@ -117,8 +116,8 @@ export const validationSchema = z.object({ export type ValidationSchema = z.infer; // Used in Profile Submission -export type FormattedUserProfileObjectType = { +export interface FormattedUserProfileObjectType { first_name: ValidationSchema['firstName']; last_name: ValidationSchema['lastName']; leis: string[]; -}; +} From b9b75bffa037c3b9f8d833f3a9c34cedc1b44a23 Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 17:19:40 -0500 Subject: [PATCH 07/40] chore: removed import --- src/api/submitUserProfile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/submitUserProfile.tsx b/src/api/submitUserProfile.tsx index e4c4fff30..d26d5577b 100644 --- a/src/api/submitUserProfile.tsx +++ b/src/api/submitUserProfile.tsx @@ -1,5 +1,4 @@ import type { SblAuthProperties } from 'api/useSblAuth'; -import { BASE_URL } from 'api/common'; interface UserProfileObject { first_name: string; @@ -10,6 +9,7 @@ interface UserProfileObject { export const submitUserProfile = async ( auth: SblAuthProperties, userProfileObject: UserProfileObject, +// eslint-disable-next-line @typescript-eslint/no-explicit-any ): Promise => { const response = await fetch(`/v1/admin/me/`, { headers: { From 11320625b05b9705d48c7abeb05d2a9465b29184 Mon Sep 17 00:00:00 2001 From: shindigira Date: Fri, 5 Jan 2024 17:52:19 -0500 Subject: [PATCH 08/40] refactor: Utilized TextIntroduction in Step1FormHeader and resolved TS errors in Associated --- src/api/submitUserProfile.tsx | 2 +- src/pages/Filing/FilingHome.tsx | 4 +-- .../AssociatedFinancialInstitutions.tsx | 31 ++++++++++--------- .../ProfileForm/Step1Form/Step1FormHeader.tsx | 20 +++++++----- src/store/useProfileForm.ts | 11 ++++--- src/utils/common.ts | 4 ++- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/api/submitUserProfile.tsx b/src/api/submitUserProfile.tsx index d26d5577b..3c4b16300 100644 --- a/src/api/submitUserProfile.tsx +++ b/src/api/submitUserProfile.tsx @@ -20,7 +20,7 @@ export const submitUserProfile = async ( body: JSON.stringify(userProfileObject), }); - return response.json() ; + return response.json(); }; export default submitUserProfile; diff --git a/src/pages/Filing/FilingHome.tsx b/src/pages/Filing/FilingHome.tsx index 520438db9..60ddbd2f9 100644 --- a/src/pages/Filing/FilingHome.tsx +++ b/src/pages/Filing/FilingHome.tsx @@ -15,7 +15,7 @@ import type { ReactElement } from 'react'; import { Link as RouterLink } from "react-router-dom"; import './FilingHome.less'; import ProcessStep from './ProcessStep'; -import { sblHelpLink } from 'utils/common'; +import { sblHelpLink, gleifLink } from 'utils/common'; function Home(): ReactElement { const auth = useSblAuth(); @@ -56,7 +56,7 @@ function Home(): ReactElement { > In order to begin using the filing platform you must have a Legal Entity Identifier (LEI) for your financial institution. Visit the{' '} - Global LEI Foundation (GLEIF) website for + Global LEI Foundation (GLEIF) website for more information on how to obtain an LEI. diff --git a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx index 584418d10..64bf2b3e2 100644 --- a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx +++ b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx @@ -1,14 +1,15 @@ -import { Checkbox, Link } from 'design-system-react'; +import { Checkbox, Link, Paragraph, Heading } from 'design-system-react'; import FormParagraph from 'components/FormParagraph'; +import { sblHelpLink } from 'utils/common'; -import type { FiDataChecked } from 'pages/ProfileForm/types'; +import type { InstitutionDetailsApiCheckedType } from 'pages/ProfileForm/types'; import useProfileForm from 'store/useProfileForm'; interface AssociatedFinancialInstitutionProperties { key: string; isFirst: boolean; - fiObject: FiDataChecked; + fiObject: InstitutionDetailsApiCheckedType; onCheckHandler: () => void; hasError: boolean; } @@ -30,14 +31,14 @@ function AssociatedFinancialInstitution({ id={`${fiObject.name} ${fiObject.lei}`} className={`${hasError ? 'error-checkbox' : ''}`} label={ -
-

{fiObject.name}

-

LEI: {fiObject.lei}

-

Tax ID: {fiObject.tax_id}

+
+ {fiObject.name} + LEI: {fiObject.lei} + Tax ID: {fiObject.tax_id} {fiObject.rssd_id ? ( -

+ RSS ID: {fiObject.rssd_id} -

+ ) : null}
} @@ -52,9 +53,9 @@ function AssociatedFinancialInstitution({ interface AssociatedFinancialInstitutionsProperties { errors: object; - checkedListState: FiDataChecked[]; + checkedListState: InstitutionDetailsApiCheckedType[]; setCheckedListState: ( - callbackFunction: (previous: FiDataChecked[]) => FiDataChecked[], + callbackFunction: (previous: InstitutionDetailsApiCheckedType[]) => InstitutionDetailsApiCheckedType[], ) => void; } @@ -74,10 +75,10 @@ function AssociatedFinancialInstitutions({
- {checkedListState.map((fiObject: FiDataChecked, index: number) => { + {checkedListState.map((fiObject: InstitutionDetailsApiCheckedType, index: number) => { const onCheckHandler = (): void => { - setCheckedListState((previous: FiDataChecked[]): FiDataChecked[] => - previous.map(object => { + setCheckedListState((previous: InstitutionDetailsApiCheckedType[]): InstitutionDetailsApiCheckedType[] => + previous.map((object: InstitutionDetailsApiCheckedType) => { if (object.lei !== fiObject.lei) return object; return { ...fiObject, checked: !fiObject.checked }; }), @@ -98,7 +99,7 @@ function AssociatedFinancialInstitutions({ If you are authorized to file for an institution that is not listed, please complete this form and then contact our support staff{' '} - contact our support staff to complete your user + contact our support staff to complete your user profile. )} diff --git a/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx b/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx index 26dde4cf9..b6088eac0 100644 --- a/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx +++ b/src/pages/ProfileForm/Step1Form/Step1FormHeader.tsx @@ -1,4 +1,6 @@ import { Link, TextIntroduction } from 'design-system-react'; +import { gleifLink } from 'utils/common'; + /** * @@ -6,14 +8,16 @@ import { Link, TextIntroduction } from 'design-system-react'; */ function Step1FormHeader(): JSX.Element { return ( -
- {/* TODO: Replace with TextIntroduction component */} -

Complete your user profile

-

Indicate the financial institution you are authorized to file for to complete your user profile. Once you have successfully associated your user profile with a financial institution you will have access to the filing platform and can begin the filing process.

-

- In order to begin using the filing platform you must have a Legal Entity identifier (LEI) for your financial institution. Visit the Global LEI Foundation (GLEIF) website for more information on how to obtain an LEI. -

-

+

+ + In order to begin using the filing platform you must have a Legal Entity identifier (LEI) for your financial institution. Visit the Global LEI Foundation (GLEIF) website for more information on how to obtain an LEI. + + } + />
) } diff --git a/src/store/useProfileForm.ts b/src/store/useProfileForm.ts index 90b447015..a55b00f4b 100644 --- a/src/store/useProfileForm.ts +++ b/src/store/useProfileForm.ts @@ -6,7 +6,10 @@ import { immer } from 'zustand/middleware/immer'; interface State { step: number, profileData: ValidationSchema, - selectedScenario: Scenario + selectedScenario: Scenario, + step: number, + enableMultiselect: boolean, + isSalesforce: boolean, } interface Actions { @@ -27,15 +30,15 @@ const useProfileForm = create( // Step 2 toggles selectedScenario: Scenario.Error1, // setters - setStep: (by) => + setStep: (by): void => set((state: State) => { state.step = by }), - setProfileData: (vObject) => + setProfileData: (vObject): void => set((state: State) => { state.profileData = vObject }), - setSelectedScenario: (scenario) => + setSelectedScenario: (scenario): void => set((state: State) => { state.selectedScenario = scenario }), diff --git a/src/utils/common.ts b/src/utils/common.ts index 739f31f1f..9758f23a2 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,5 +1,7 @@ export const sblHelpLink = 'https://sblhelp.consumerfinance.gov/'; +export const gleifLink = 'https://www.gleif.org/'; export default { - sblHelpLink + sblHelpLink, + gleifLink } \ No newline at end of file From 7b62970d060dc73c51d27e4cf351514d31f327a5 Mon Sep 17 00:00:00 2001 From: shindigira Date: Mon, 8 Jan 2024 12:38:41 -0500 Subject: [PATCH 09/40] fix: RSSD not RSS --- .../ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx index 64bf2b3e2..64e58c7ee 100644 --- a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx +++ b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx @@ -37,7 +37,7 @@ function AssociatedFinancialInstitution({ Tax ID: {fiObject.tax_id} {fiObject.rssd_id ? ( - RSS ID: {fiObject.rssd_id} + RSSD ID: {fiObject.rssd_id} ) : null}
From 131dbf4dcfa8e6f30a42d6a9cdfab41d5840574c Mon Sep 17 00:00:00 2001 From: shindigira Date: Mon, 8 Jan 2024 12:41:12 -0500 Subject: [PATCH 10/40] chore: changed type to null --- src/api/submitUserProfile.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api/submitUserProfile.tsx b/src/api/submitUserProfile.tsx index 3c4b16300..2475ad987 100644 --- a/src/api/submitUserProfile.tsx +++ b/src/api/submitUserProfile.tsx @@ -9,8 +9,7 @@ interface UserProfileObject { export const submitUserProfile = async ( auth: SblAuthProperties, userProfileObject: UserProfileObject, -// eslint-disable-next-line @typescript-eslint/no-explicit-any -): Promise => { +): Promise => { const response = await fetch(`/v1/admin/me/`, { headers: { Authorization: `Bearer ${auth.user?.access_token}`, @@ -20,7 +19,7 @@ export const submitUserProfile = async ( body: JSON.stringify(userProfileObject), }); - return response.json(); + return response.json() as Promise; }; export default submitUserProfile; From db5ff92b6e813eedf13445338f2f60685315b458 Mon Sep 17 00:00:00 2001 From: shindigira Date: Mon, 8 Jan 2024 14:09:57 -0500 Subject: [PATCH 11/40] chore: changed TAX ID to TIN --- .../ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx index 64e58c7ee..6a0a2b975 100644 --- a/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx +++ b/src/pages/ProfileForm/Step1Form/AssociatedFinancialInstitutions.tsx @@ -34,7 +34,7 @@ function AssociatedFinancialInstitution({
{fiObject.name} LEI: {fiObject.lei} - Tax ID: {fiObject.tax_id} + TIN: {fiObject.tax_id} {fiObject.rssd_id ? ( RSSD ID: {fiObject.rssd_id} From d8cfb37af4e755733d180ea28d73ea744f51877b Mon Sep 17 00:00:00 2001 From: shindigira Date: Mon, 8 Jan 2024 14:40:07 -0500 Subject: [PATCH 12/40] feat: email text instead of disabled input --- src/components/FieldGroup.tsx | 2 +- .../ProfileForm/Step1Form/InputEntry.tsx | 34 +++++++++++-------- src/pages/ProfileForm/Step1Form/Step1Form.tsx | 6 ++-- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/components/FieldGroup.tsx b/src/components/FieldGroup.tsx index 16b4467c4..5b09f1684 100644 --- a/src/components/FieldGroup.tsx +++ b/src/components/FieldGroup.tsx @@ -5,7 +5,7 @@ interface FieldGroupProperties { function FieldGroup({ children }: FieldGroupProperties): JSX.Element { return (
{children}
diff --git a/src/pages/ProfileForm/Step1Form/InputEntry.tsx b/src/pages/ProfileForm/Step1Form/InputEntry.tsx index 75d38abc8..b8993531c 100644 --- a/src/pages/ProfileForm/Step1Form/InputEntry.tsx +++ b/src/pages/ProfileForm/Step1Form/InputEntry.tsx @@ -2,7 +2,7 @@ import type { ReactNode } from 'react'; import { forwardRef } from 'react'; import { Element } from 'react-scroll'; -import { TextInput } from 'design-system-react'; +import { TextInput, Heading } from 'design-system-react'; import InputErrorMessage from 'components/InputErrorMessage'; interface InputEntryProperties @@ -11,30 +11,34 @@ interface InputEntryProperties label: string; errors: object; isDisabled: boolean; + isLast: boolean; + hideInput: boolean; children?: ReactNode; } const InputEntry = forwardRef( ( - { id, errors, label, isDisabled = false, children, ...properties }, + { id, errors, label, isDisabled = false, hideInput = false, isLast = false, children, ...properties }, reference, ) => ( -
+
-