Fix: Unable to upload HEIF image as money request#48861
Fix: Unable to upload HEIF image as money request#48861Beamanator merged 19 commits intoExpensify:mainfrom
Conversation
|
@parasharrajat Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
|
@nyomanjyotisa I will try to push this forward. It's been stalled for quite some time. |
|
|
|
This PR is ready for review |
| return; | ||
| } | ||
| FileUtils.verifyFileFormat({fileUri: originalFile.uri, formatSignatures: CONST.HEIC_SIGNATURES}) | ||
| .then((isHEIC) => { |
There was a problem hiding this comment.
what if the file is heif?
| if (file) { | ||
| file.uri = URL.createObjectURL(file); | ||
| setReceiptAndNavigate(file); | ||
| convertReceipt(file); |
There was a problem hiding this comment.
IMO, it should be done this way.
- Keep
setReceiptAndNavigatelogic here. - Inside
setReceiptAndNavigateyou check whether the image needs conversion then callconvertReceipt. - Then continue doing whatever is already being done in
setReceiptAndNavigate
| /** | ||
| * Converts HEIC images to JPEG format before sending to setReceiptAndNavigate | ||
| */ | ||
| const convertReceipt = (originalFile: FileObject, isPdfValidated?: boolean) => { |
There was a problem hiding this comment.
This should be in utility files. Check for existing functions(if exists) which does image conversions for us and extend those instead to support heic file conversions. If no such function exists, move this function on those files.
|
PR updated and retested @parasharrajat |
src/libs/fileDownload/FileUtils.ts
Outdated
| if (getPlatform() === CONST.PLATFORM.ANDROID || getPlatform() === CONST.PLATFORM.IOS) { | ||
| if (!file.uri) { | ||
| onError(new Error('File URI is undefined'), file); | ||
| onFinish(); | ||
| return; | ||
| } |
There was a problem hiding this comment.
Use platform files insread to divide the logic here
|
PR updated and retested @parasharrajat |
|
@parasharrajat mind coming back and testing this again? Thank you! |
|
I will start testing soon. |
|
Working on it... |
| convertHeicImage(originalFile, { | ||
| onStart: () => setIsLoaderVisible(true), | ||
| onSuccess: (convertedFile) => setReceiptAndNavigate(convertedFile, isPdfValidated, false), | ||
| onError: (_, nonConvertedFile) => setReceiptAndNavigate(nonConvertedFile, isPdfValidated, true), |
There was a problem hiding this comment.
We are using recursion which is new to this project. we can try to break down this function setReceiptAndNavigate to two function.
We keep the main function same as setReceiptAndNavigate which is currently called as the components. Second function will handle the after conversion operations. Also, try to convert this action into a promise.
There was a problem hiding this comment.
I'll update the PR soon
|
@nyomanjyotisa My ios app is getting frozen when I try to upload a file. Did you face the same? |
|
The iOS app is working well on my side iOS-Native.mp4 |
|
🚧 @MonilBhavsar has triggered a test app build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
|
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issuessection above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar, I verified the components usingAvatarhave been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */ - The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
- If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avataris modified, I verified thatAvataris working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
- If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
| /** | ||
| * Converts HEIC image to JPEG using promises | ||
| */ | ||
| const convertHeicImageToPromise = (file: FileObject): Promise<FileObject> => { |
There was a problem hiding this comment.
This converts heic to jpeg, right?
| const convertHeicImageToPromise = (file: FileObject): Promise<FileObject> => { | |
| const convertHeicImageToJpegPromise = (file: FileObject): Promise<FileObject> => { |
There was a problem hiding this comment.
let's do the same to index.ts file as well.
Beamanator
left a comment
Beamanator
left a comment
There was a problem hiding this comment.
Overall looking great! Just 1 comment about the function name
|
PR updated! However I'm not sure why the Gihub Actions check is failing |
|
I've merged the latest main, but it didn't help |
|
@nyomanjyotisa Please merge main that should solve it. cc: @Beamanator Ready for review. |
|
@nyomanjyotisa Can you merge main to fix checks? |
|
Merged with latest main |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.55-0 🚀
|
|
🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.56-2 🚀
|
|
🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.58-0 🚀
|
|
🚀 Deployed to production by https://github.com/roryabraham in version: 9.1.58-4 🚀
|
|
|
||
| // Check if the file is HEIC/HEIF and needs conversion | ||
| if ( | ||
| originalFile?.type?.startsWith('image') && |
7 participants
Details
Fixed Issues
$ #47078
PROPOSAL: #47078 (comment)
Tests
Same as QA Steps
Offline tests
Same as QA Steps
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android-Native.mp4
Android: mWeb Chrome
Android-mWeb.Chrome.mp4
iOS: Native
iOS-Native.mp4
iOS: mWeb Safari
iOS-mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS-Chrome.mp4
MacOS: Desktop
MacOS-Desktop.mp4