Skip to content

Fix unsafe type assertions in AgreementsFullStep #98842

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.

Sign up for GitHub

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

Draft
KJ21-ENG wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −14
Draft

Fix unsafe type assertions in AgreementsFullStep #98842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions src/components/SubStepForms/AgreementsFullStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UploadFile from '@components/UploadFile';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';

import {getFieldRequiredErrors, isRequiredFulfilled} from '@libs/ValidationUtils';
import {getFieldRequiredErrors} from '@libs/ValidationUtils';

import requiresDocusignStep from '@pages/ReimbursementAccount/NonUSD/utils/requiresDocusignStep';

Expand Down Expand Up @@ -52,10 +52,10 @@ type AgreementsFullStepProps<TFormID extends keyof OnyxFormValuesMapping> = {

/** Input IDs for field in the form */
inputIDs: {
provideTruthfulInformation: FormOnyxKeys<TFormID>;
agreeToTermsAndConditions: FormOnyxKeys<TFormID>;
consentToPrivacyNotice: FormOnyxKeys<TFormID>;
authorizedToBindClientToAgreement: FormOnyxKeys<TFormID>;
provideTruthfulInformation: Extract<FormOnyxKeys<TFormID>, string>;
agreeToTermsAndConditions: Extract<FormOnyxKeys<TFormID>, string>;
consentToPrivacyNotice: Extract<FormOnyxKeys<TFormID>, string>;
authorizedToBindClientToAgreement: Extract<FormOnyxKeys<TFormID>, string>;
};

/** Indicates that action is being processed */
Expand Down Expand Up @@ -104,7 +104,12 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({

const isDocusignStepRequired = requiresDocusignStep(currency);
const stepFields = useMemo(() => {
const fields = [inputIDs.authorizedToBindClientToAgreement, inputIDs.provideTruthfulInformation, inputIDs.agreeToTermsAndConditions, inputIDs.consentToPrivacyNotice];
const fields: Array<FormOnyxKeys<TFormID>> = [
inputIDs.authorizedToBindClientToAgreement,
inputIDs.provideTruthfulInformation,
inputIDs.agreeToTermsAndConditions,
inputIDs.consentToPrivacyNotice,
];
if (bankStatementInputID) {
fields.push(bankStatementInputID);
}
Expand Down Expand Up @@ -150,19 +155,19 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({
(values: FormOnyxValues<TFormID>): FormInputErrors<TFormID> => {
const errors = getFieldRequiredErrors(values, stepFields, translate);

if (!isRequiredFulfilled(values[inputIDs.authorizedToBindClientToAgreement] as string)) {
if (Object.hasOwn(errors, inputIDs.authorizedToBindClientToAgreement)) {
errors[inputIDs.authorizedToBindClientToAgreement] = translate('agreementsStep.error.authorized');
}

if (!isRequiredFulfilled(values[inputIDs.provideTruthfulInformation] as string)) {
if (Object.hasOwn(errors, inputIDs.provideTruthfulInformation)) {
errors[inputIDs.provideTruthfulInformation] = translate('agreementsStep.error.certify');
}

if (!isRequiredFulfilled(values[inputIDs.agreeToTermsAndConditions] as string)) {
if (Object.hasOwn(errors, inputIDs.agreeToTermsAndConditions)) {
errors[inputIDs.agreeToTermsAndConditions] = translate('common.error.acceptTerms');
}

if (!isRequiredFulfilled(values[inputIDs.consentToPrivacyNotice] as string)) {
if (Object.hasOwn(errors, inputIDs.consentToPrivacyNotice)) {
errors[inputIDs.consentToPrivacyNotice] = translate('agreementsStep.error.consent');
}

Expand Down Expand Up @@ -194,7 +199,7 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({
<InputWrapper
InputComponent={CheckboxWithLabel}
accessibilityLabel={translate('agreementsStep.iAmAuthorized')}
inputID={inputIDs.authorizedToBindClientToAgreement as string}
inputID={inputIDs.authorizedToBindClientToAgreement}
style={styles.mt6}
LabelComponent={IsAuthorizedToUseBankAccountLabel}
defaultValue={defaultValues[inputIDs.authorizedToBindClientToAgreement]}
Expand All @@ -203,7 +208,7 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({
<InputWrapper
InputComponent={CheckboxWithLabel}
accessibilityLabel={translate('agreementsStep.iCertify')}
inputID={inputIDs.provideTruthfulInformation as string}
inputID={inputIDs.provideTruthfulInformation}
style={styles.mt6}
LabelComponent={CertifyTrueAndAccurateLabel}
defaultValue={defaultValues[inputIDs.provideTruthfulInformation]}
Expand All @@ -212,7 +217,7 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({
<InputWrapper
InputComponent={CheckboxWithLabel}
accessibilityLabel={translate('agreementsStep.iAcceptTheTermsAndConditionsAccessibility')}
inputID={inputIDs.agreeToTermsAndConditions as string}
inputID={inputIDs.agreeToTermsAndConditions}
style={styles.mt6}
LabelComponent={TermsAndConditionsLabel}
defaultValue={defaultValues[inputIDs.agreeToTermsAndConditions]}
Expand All @@ -221,7 +226,7 @@ function AgreementsFullStep<TFormID extends keyof OnyxFormValuesMapping>({
<InputWrapper
InputComponent={CheckboxWithLabel}
accessibilityLabel={translate('agreementsStep.iConsentToThePrivacyNoticeAccessibility')}
inputID={inputIDs.consentToPrivacyNotice as string}
inputID={inputIDs.consentToPrivacyNotice}
style={styles.mt6}
LabelComponent={ConsentToPrivacyNoticeLabel}
defaultValue={defaultValues[inputIDs.consentToPrivacyNotice]}
Expand Down
Loading