Skip to content
Closed
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
cfb4a87
refactor: use attachmentmodal on other screens
chrispader Jul 1, 2025
e80ba59
refactor: migrate remaining screens
chrispader Jul 1, 2025
3112c84
Merge branch 'main' into backup-modal-migration
chrispader Jul 2, 2025
a01537a
refactor: implement multi file support
chrispader Jul 2, 2025
865623e
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Jul 2, 2025
ef5c10f
fix: invalid import
chrispader Jul 3, 2025
2d26ab8
refactor: improve report attachment modals
chrispader Jul 3, 2025
c57cc1c
refactor: re-structure confirm modals in AttachmentModal
chrispader Jul 3, 2025
350f713
more refactors
chrispader Jul 3, 2025
8a441d8
update types
chrispader Jul 3, 2025
6feaeeb
fix: source never set
chrispader Jul 3, 2025
ff252cd
minor issues
chrispader Jul 3, 2025
b437422
rename attachment screens
chrispader Jul 3, 2025
036b8a2
fix: allow dismissing add attachment modal
chrispader Jul 3, 2025
d3e095e
chore: dummy change for triggering pipeline again
chrispader Jul 3, 2025
f67528c
chore: remove dummy change
chrispader Jul 3, 2025
faede4a
fix: remove file validation logic from ReportAttachmentModalContent
chrispader Jul 30, 2025
d1b6f10
feat: add normalizeFileObject fix
chrispader Jul 30, 2025
f1a80b2
fix: pasting from clipboard on iOS
chrispader Jul 30, 2025
669b407
refactor: extract transaction receipt logic from AttachmentModal
chrispader Jul 30, 2025
37a19b1
fix: invalid inverse condition
chrispader Jul 30, 2025
ad9ab1f
feat: implement add attachment carousel
chrispader Jul 30, 2025
d7be512
feat: allow pasting multiple files
chrispader Jul 30, 2025
5bf9984
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Jul 30, 2025
8f23c7e
fix: TS errors
chrispader Jul 30, 2025
3dd21cc
fix: dependency array
chrispader Jul 30, 2025
6afd09b
fix: eslint errors
chrispader Jul 30, 2025
30786c5
fix: more TS errors
chrispader Jul 30, 2025
a2a4985
fix: spell
chrispader Jul 30, 2025
8fe5ccd
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Jul 30, 2025
b72227b
fix: remove extra attachment modal
chrispader Jul 30, 2025
ce2407d
fix: FileObject import
chrispader Jul 30, 2025
db8805e
refactor: remove useFileErrorModal
chrispader Jul 30, 2025
db1047d
fix: more TS errors
chrispader Jul 30, 2025
274407b
fix: TS
chrispader Jul 30, 2025
2ed4cd2
fix: TS
chrispader Jul 30, 2025
03955b5
fix: TS
chrispader Jul 30, 2025
d3d2746
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 5, 2025
4255b66
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 13, 2025
ef0867a
refactor: add typings for AttachmentModal navigation routes
chrispader Aug 13, 2025
b6c5d1d
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 14, 2025
e9e3469
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 14, 2025
89868b2
fix: download not working
chrispader Aug 14, 2025
ba1a637
fix: no edit menu for TransactionReceipt
chrispader Aug 14, 2025
01e9302
fix: revert Composer clipboard handling changes
chrispader Aug 14, 2025
3ddc6e0
fix: if multiple files contains pdf, use centered_unswipable modal
chrispader Aug 14, 2025
c46a7f5
fix: TS errors
chrispader Aug 14, 2025
ac176f1
fix: remove unnecessary cast
chrispader Aug 14, 2025
724085a
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 26, 2025
93ced7e
fix: restructure screen props
chrispader Aug 26, 2025
599af51
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Aug 28, 2025
b9792b2
fix: MoneyRequestReceiptPreview in AuthScreens
chrispader Aug 28, 2025
b27bf2c
fix: MoneyRequest.RequestPreview route not added
chrispader Aug 28, 2025
1e1c9bd
fix: accountID must be number
chrispader Aug 28, 2025
5654e5b
fix: simplify AttachmentModalContent route param types
chrispader Aug 28, 2025
417c587
further improve types
chrispader Aug 28, 2025
d4742f6
fix: TS errors
chrispader Aug 28, 2025
229dc8d
dummy commit
chrispader Aug 28, 2025
c5c73ce
Revert "dummy commit"
chrispader Aug 28, 2025
d45972c
Merge branch 'main' into @chrispader/add-attachment-modal-refactor
chrispader Aug 29, 2025
988848d
feat: update `threeDotsMenuItems` implementation and add changes from…
chrispader Oct 2, 2025
35e802d
refactor: add merge changes from other PR
chrispader Oct 7, 2025
7272592
Merge branch 'main' into @chrispader/migrate-remaining-attachment-mod…
chrispader Oct 12, 2025
d2c53b9
revert: Mobile-Expensify changes
chrispader Oct 12, 2025
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
15 changes: 10 additions & 5 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1923,18 +1923,23 @@ const CONST = {
VIDEO: /\.(mov|mp4)$/,
},

FILE_VALIDATION_ERRORS: {
SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS: {
NO_FILE_PROVIDED: 'noFileProvided',
FILE_INVALID: 'fileInvalid',
WRONG_FILE_TYPE: 'wrongFileType',
WRONG_FILE_TYPE_MULTIPLE: 'wrongFileTypeMultiple',
FILE_TOO_LARGE: 'fileTooLarge',
FILE_TOO_LARGE_MULTIPLE: 'fileTooLargeMultiple',
FILE_TOO_SMALL: 'fileTooSmall',
FILE_CORRUPTED: 'fileCorrupted',
FOLDER_NOT_ALLOWED: 'folderNotAllowed',
MAX_FILE_LIMIT_EXCEEDED: 'fileLimitExceeded',
PROTECTED_FILE: 'protectedFile',
},

MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS: {
WRONG_FILE_TYPE: 'multipleAttachmentsWrongFileType',
FILE_TOO_LARGE: 'multipleAttachmentsFileTooLarge',
FOLDER_NOT_ALLOWED: 'multipleAttachmentsFolderNotAllowed',
MAX_FILE_LIMIT_EXCEEDED: 'multipleAttachmentsMaxFileLimitExceeded',
},

IOS_CAMERA_ROLL_ACCESS_ERROR: 'Access to photo library was denied',
ADD_PAYMENT_MENU_POSITION_Y: 226,
ADD_PAYMENT_MENU_POSITION_X: 356,
Expand Down
8 changes: 8 additions & 0 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,14 @@ const ROUTES = {
return getUrlWithBackToParam(`${baseRoute}${queryString}` as const, backTo);
},
},
REPORT_ADD_ATTACHMENT: {
route: 'r/:reportID/attachment/add',
getRoute: (reportID: string, params?: AttachmentRouteParams) => {
// eslint-disable-next-line @typescript-eslint/naming-convention
const {reportID: _reportIDParam, ...restParams} = params ?? {};
return getAttachmentModalScreenRoute(`r/${reportID}/attachment/add`, restParams);
},
},
REPORT_AVATAR: {
route: 'r/:reportID/avatar',
getRoute: (reportID: string, policyID?: string) => {
Expand Down
3 changes: 2 additions & 1 deletion src/SCREENS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import type DeepValueOf from './types/utils/DeepValueOf';
const PROTECTED_SCREENS = {
HOME: 'Home',
CONCIERGE: 'Concierge',
ATTACHMENTS: 'Attachments',
REPORT_ATTACHMENTS: 'ReportAttachments',
REPORT_ADD_ATTACHMENT: 'ReportAddAttachment',
TRACK_EXPENSE: 'TrackExpense',
SUBMIT_EXPENSE: 'SubmitExpense',
} as const;
Expand Down
304 changes: 0 additions & 304 deletions src/components/AttachmentComposerModal.tsx

This file was deleted.

Loading
Loading