From 43918f3c62a8cb069a4a23e9d65c4dc4425e5d10 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 6 Feb 2025 16:09:52 -0800
Subject: [PATCH] fix: more lint errors

---
 .../NonUSD/SignerInfo/substeps/UploadDocuments.tsx         | 1 +
 .../AttachmentModalContent/ReportAvatarModalContent.tsx    | 4 ++--
 .../AttachmentModalContent/WorkspaceAvatarModalContent.tsx | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/ReimbursementAccount/NonUSD/SignerInfo/substeps/UploadDocuments.tsx b/src/pages/ReimbursementAccount/NonUSD/SignerInfo/substeps/UploadDocuments.tsx
index dc11302cae15..131e08217d19 100644
--- a/src/pages/ReimbursementAccount/NonUSD/SignerInfo/substeps/UploadDocuments.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/SignerInfo/substeps/UploadDocuments.tsx
@@ -11,6 +11,7 @@ import useReimbursementAccountStepFormSubmit from '@hooks/useReimbursementAccoun
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setDraftValues} from '@libs/actions/FormActions';
+import {getFieldRequiredErrors} from '@libs/ValidationUtils';
 import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
 import WhyLink from '@pages/ReimbursementAccount/NonUSD/WhyLink';
 import CONST from '@src/CONST';
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContent/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContent/ReportAvatarModalContent.tsx
index ff09056a33f3..7666cf92dcda 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContent/ReportAvatarModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContent/ReportAvatarModalContent.tsx
@@ -20,7 +20,7 @@ const ReportAvatarModalContent: AttachmentModalContent = ({params, children}) =>
     const attachment = useMemo(() => {
         if (isGroupChat(report) && !isThread(report)) {
             return {
-                source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : getDefaultGroupAvatar(report?.reportID ?? ''),
+                source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : getDefaultGroupAvatar(report?.reportID),
                 headerTitle: getReportName(report),
                 isWorkspaceAvatar: false,
             };
@@ -30,7 +30,7 @@ const ReportAvatarModalContent: AttachmentModalContent = ({params, children}) =>
             source: getFullSizeAvatar(getWorkspaceIcon(report).source, 0),
             headerTitle: getPolicyName({report, policy}),
             // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
-            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
+            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID,
             isWorkspaceAvatar: true,
         };
     }, [policy, report]);
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContent/WorkspaceAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContent/WorkspaceAvatarModalContent.tsx
index 0fb5ff1582ae..322972b46e16 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContent/WorkspaceAvatarModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContent/WorkspaceAvatarModalContent.tsx
@@ -1,20 +1,21 @@
 import {useMemo} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {AttachmentModalBaseContentProps} from './BaseContent';
 import type {AttachmentModalContent} from './types';
 
 const WorkspaceAvatarModalContent: AttachmentModalContent = ({params, children}) => {
-    const policyID = params.policyID ?? '-1';
+    const policyID = params.policyID ?? CONST.DEFAULT_NUMBER_ID;
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {initialValue: true});
 
     const contentProps = useMemo(
         () =>
             ({
-                source: policy?.avatarURL ?? '' ? policy?.avatarURL ?? '' : getDefaultWorkspaceAvatar(policy?.name ?? ''),
-                headerTitle: policy?.name ?? '',
+                source: policy?.avatarURL ? policy?.avatarURL : getDefaultWorkspaceAvatar(policy?.name),
+                headerTitle: policy?.name,
                 isWorkspaceAvatar: true,
                 originalFileName: policy?.originalFileName ?? policy?.id,
                 shouldShowNotFoundPage: !Object.keys(policy ?? {}).length && !isLoadingApp,