Receipts are displayed in the full size of canvas when not needed #42174

samilabud · 2024-05-14T21:17:46Z

Details

We are using the MultigestureCanvas to display the image/receipt, this component always try to fit the image to the content, this works perfectly for image that are bigger than the canvas size but when the image is lower than the canvas we can notice this issue.
We should verify if we need to use the scale to fit the canvas size before we try to fit the image in getCanvasFitScale, and if the image not need to be resized we should use the same image size

Fixed Issues

$ #40788
PROPOSAL: #40788 (comment)

Tests

Go to home url / open the app
Tap on Workspace chat
Tap plus icon -- submit expense
Submit an expense with below receipt attached
Open the expense and tap on the receipt

Verify that no errors appear in the JS console

Offline tests

Go to home url / open the app
Tap on Workspace chat
Tap plus icon -- submit expense
Submit an expense with below receipt attached
Open the expense and tap on the receipt

QA Steps

Go to home url / open the app
Tap on Workspace chat
Tap plus icon -- submit expense
Submit an expense with below receipt attached
Open the expense and tap on the receipt
Check if the image is displayed correctly, zoom-in out work correctly, pagination (when multiple images).

Test image:

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.-.Receipt.inconsistent.test.mov

Android: mWeb Chrome

Android.Chrome.-.Receipt.inconsistent.test.mp4

iOS: Native

IPhone.-.Receipt.inconsistent.test.mp4

iOS: mWeb Safari

IPhone.Safari.-.Receipt.inconsistent.test.mp4

MacOS: Chrome / Safari

MAC.Chrome.-.Receipt.inconsistent.test.mp4

MacOS: Desktop

MAC.Desktop.-.Receipt.inconsistent.test.mov

melvin-bot · 2024-05-14T21:17:50Z

@eVoloshchak 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]

eVoloshchak · 2024-05-16T13:18:45Z

src/components/MultiGestureCanvas/utils.ts

 const getCanvasFitScale: GetCanvasFitScale = ({canvasSize, contentSize}) => {
+    const shouldResize = shouldResizeToFit(canvasSize, contentSize);
+
    const scaleX = canvasSize.width / contentSize.width;
    const scaleY = canvasSize.height / contentSize.height;



I think we can get rid of shouldResizeToFit altogether

const trueScaleX = canvasSize.width / contentSize.width; const trueScaleY = canvasSize.height / contentSize.height; const scaleX = trueScaleX > 1 ? 1 : trueScaleX; const scaleY = trueScaleY > 1 ? 1 : trueScaleY;

@samilabud, could you please test if this works?

Even simpler, we can use an already existing NumberUtils.clamp instead of the ternary

Oh that makes a lot of sense thank you!, it seems to be working:

receipt.resize.clamp.test.mp4

eVoloshchak · 2024-05-16T14:00:51Z

src/components/MultiGestureCanvas/utils.ts


+    const scaleX = clamp(trueScaleX, 0, 1);


Suggested change

const scaleX = clamp(trueScaleX, 0, 1);

const scaleX = clamp(canvasSize.width / contentSize.width, 0, 1);

eVoloshchak · 2024-05-16T14:01:06Z

src/components/MultiGestureCanvas/utils.ts


+    const scaleX = clamp(trueScaleX, 0, 1);
+    const scaleY = clamp(trueScaleY, 0, 1);


Suggested change

const scaleY = clamp(trueScaleY, 0, 1);

const scaleY = clamp(canvasSize.height / contentSize.height, 0, 1);

eVoloshchak · 2024-05-16T15:03:07Z

Looks like the back end is having some problems, for me it's completely down, will resume testing when possible

eVoloshchak

Go to home url / open the app

Tap on Workspace chat

Tap plus icon -- submit expense

Submit an expense with below receipt attached

Open the expense and tap on the receipt

@samilabud, the testing steps can be improved. It's better to overexplain, so the QA team can test this properly

the test image isn't attached
include the last step to actually check if the image is displayed correctly, zoom-in out work correctly, etc

samilabud · 2024-05-17T12:57:21Z

the test image isn't attached

include the last step to actually check if the image is displayed correctly, zoom-in out work correctly, etc

Done, please double check 🙏🏼

eVoloshchak · 2024-05-17T13:37:15Z

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 Issues section 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 Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- 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 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. toggleReport and not onIconClick).
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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
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 using Avatar have 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 this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- 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 Avatar is modified, I verified that Avatar is 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

screen-20240517-153701.1.mp4

Android: mWeb Chrome

Screen.Recording.2024-05-17.at.16.28.31.mov

iOS: Native

Screen.Recording.2024-05-17.at.16.16.28.mov

iOS: mWeb Safari

Screen.Recording.2024-05-17.at.16.18.18.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-17.at.16.14.26.mov

MacOS: Desktop

Screen.Recording.2024-05-17.at.16.15.00.mov

eVoloshchak

LGTM!

arosiclair · 2024-05-17T15:26:07Z

@samilabud you should be able to merge main to fix those typecheck errors.

arosiclair · 2024-05-17T16:20:58Z

Thanks. I'll merge when the merge freeze is over.

OSBotify · 2024-05-31T21:22:25Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

bondydaa · 2024-06-05T14:03:54Z

looks like this might have caused this deploy blocker, can you please take a look #43050?

OSBotify · 2024-06-06T12:34:19Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

samilabud added 3 commits May 7, 2024 09:30

Fixed image attachment fit to scale even when not needed

99e0265

Merge branch 'main' into receipt_image_resize_fix_alternative_40788

e699cb7

Merge branch 'main' into receipt_image_resize_fix_alternative_40788

6134d1f

samilabud requested a review from a team as a code owner May 14, 2024 21:17

melvin-bot bot removed the request for review from a team May 14, 2024 21:17

melvin-bot bot requested a review from eVoloshchak May 14, 2024 21:17

eVoloshchak reviewed May 16, 2024

View reviewed changes

samilabud added 2 commits May 16, 2024 09:30

Merge branch 'main' into receipt_image_resize_fix_40788

2e10e73

Removing function resizeToFit and using clamp to calculate the new scale

0bfd04e

eVoloshchak suggested changes May 16, 2024

View reviewed changes

samilabud added 2 commits May 16, 2024 10:03

Removing declaration of unnecessary variables

b313612

Merge branch 'main' into receipt_image_resize_fix_40788

e8d20ed

eVoloshchak reviewed May 17, 2024

View reviewed changes

eVoloshchak approved these changes May 17, 2024

View reviewed changes

melvin-bot bot requested a review from arosiclair May 17, 2024 14:30

arosiclair approved these changes May 17, 2024

View reviewed changes

Merge branch 'main' into receipt_image_resize_fix_40788

c19a2f3

arosiclair merged commit 0cb2dc0 into Expensify:main May 31, 2024
14 checks passed

github-actions bot mentioned this pull request Jun 4, 2024

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

bernhardoj mentioned this pull request Jun 5, 2024

Android & iOS - Profile - Default avatar is small when viewed in full screen #43050

Closed

6 tasks

melvin-bot bot mentioned this pull request Jun 6, 2024

[HOLD for payment 2024-06-13] [$250] Android - Receipt - Receipt view is inconsistent in mweb&Android #40788

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Receipts are displayed in the full size of canvas when not needed #42174

Receipts are displayed in the full size of canvas when not needed #42174

samilabud commented May 14, 2024 •

edited

Loading

melvin-bot bot commented May 14, 2024

eVoloshchak May 16, 2024

eVoloshchak May 16, 2024

samilabud May 16, 2024

eVoloshchak May 16, 2024

samilabud May 16, 2024

eVoloshchak May 16, 2024

eVoloshchak commented May 16, 2024

eVoloshchak left a comment

samilabud commented May 17, 2024

eVoloshchak commented May 17, 2024 •

edited

Loading

eVoloshchak left a comment

arosiclair commented May 17, 2024

arosiclair commented May 17, 2024 •

edited

Loading

OSBotify commented May 31, 2024

bondydaa commented Jun 5, 2024

OSBotify commented Jun 6, 2024

	const scaleX = clamp(trueScaleX, 0, 1);
	const scaleX = clamp(canvasSize.width / contentSize.width, 0, 1);


		const scaleX = clamp(trueScaleX, 0, 1);
		const scaleY = clamp(trueScaleY, 0, 1);

	const scaleY = clamp(trueScaleY, 0, 1);
	const scaleY = clamp(canvasSize.height / contentSize.height, 0, 1);

Receipts are displayed in the full size of canvas when not needed #42174

Receipts are displayed in the full size of canvas when not needed #42174

Conversation

samilabud commented May 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 14, 2024

eVoloshchak May 16, 2024

Choose a reason for hiding this comment

eVoloshchak May 16, 2024

Choose a reason for hiding this comment

samilabud May 16, 2024

Choose a reason for hiding this comment

eVoloshchak May 16, 2024

Choose a reason for hiding this comment

samilabud May 16, 2024

Choose a reason for hiding this comment

eVoloshchak May 16, 2024

Choose a reason for hiding this comment

eVoloshchak commented May 16, 2024

eVoloshchak left a comment

Choose a reason for hiding this comment

samilabud commented May 17, 2024

eVoloshchak commented May 17, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

arosiclair commented May 17, 2024

arosiclair commented May 17, 2024 • edited Loading

OSBotify commented May 31, 2024

bondydaa commented Jun 5, 2024

OSBotify commented Jun 6, 2024

samilabud commented May 14, 2024 •

edited

Loading

eVoloshchak commented May 17, 2024 •

edited

Loading

arosiclair commented May 17, 2024 •

edited

Loading