Skip to content
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.

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

Enabling Receipt drag and drop inside the confirmation step #53849

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

abzokhattab
Copy link
Contributor

@abzokhattab abzokhattab commented Dec 10, 2024

Explanation of Change

Fixed Issues

$ #53089
PROPOSAL: #53089 (comment)

Tests

  1. Create a manual expense.
  2. On the expense confirmation page, drag and drop a receipt in either image or PDF format.
  3. Verify that the receipt is seamlessly attached to the expense confirmation page.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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.

Screenshots/Videos

Android: Native

Not applicable

Android: mWeb Chrome

Not applicable

iOS: Native

Not applicable

iOS: mWeb Safari

Not applicable

MacOS: Chrome / Safari
Screen.Recording.2024-12-10.at.14.37.47.mov
Screen.Recording.2024-12-10.at.14.38.14.mov
MacOS: Desktop
Screen.Recording.2024-12-10.at.14.34.53.mov
Screen.Recording.2024-12-10.at.14.36.36.mov

@abzokhattab abzokhattab marked this pull request as ready for review December 10, 2024 14:06
@abzokhattab abzokhattab requested a review from a team as a code owner December 10, 2024 14:06
@melvin-bot melvin-bot bot requested review from Ollyws and removed request for a team December 10, 2024 14:06
Copy link

melvin-bot bot commented Dec 10, 2024

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

@shawnborton
Copy link
Contributor

This is looking pretty good.

One thing I noticed is it seems like the receipt thumbnail height changes when it's an empty state vs when it actually has an image in there. Can we fix that so it remains at the same height in both cases? cc @Expensify/design for viz

@dannymcclain
Copy link
Contributor

Agree with Shawn.

@abzokhattab
Copy link
Contributor Author

Good catch @shawnborton i updated the styles in this commit now the height doesnt change for both pdfs and images:

Screen.Recording.2024-12-12.at.02.29.14.mov

@dannymcclain
Copy link
Contributor

@shawnborton @dubielzyk-expensify do you think we should be using our light button text color here instead of the dark?

CleanShot 2024-12-12 at 08 27 50@2x

Here's what the "import spreadsheet" version looks like:
CleanShot 2024-12-12 at 08 29 04@2x

And actually—can we make sure the green overlay is the same between these two? I can't tell if they're different, but let's make sure we're matching the CSV import one since we just built that recently. Yeah?

@dannymcclain
Copy link
Contributor

FORGET EVERYTHING I SAID! It's just a light mode vs. dark mode thing 🤦‍♂️

Light mode CSV import:
CleanShot 2024-12-12 at 08 30 58@2x

@shawnborton
Copy link
Contributor

I can get down with that, let's make sure everything is aligned. I think the "Let it go" UI shown above is the same thing found in the Scan receipt on desktop flow, so let's update that too. But yeah, I like using lighter text as well as the green you pointed out for import spreadsheet.

@shawnborton
Copy link
Contributor

Hahah well then! Nevermind!!

@Ollyws
Copy link
Contributor

Ollyws commented Dec 18, 2024

@abzokhattab We have merge conflicts if you could take a look, thanks!

@abzokhattab
Copy link
Contributor Author

@Ollyws Done

@Ollyws
Copy link
Contributor

Ollyws commented Dec 23, 2024

@abzokhattab Could you take a look at those ESLint and TS check errors too? Thanks.

@abzokhattab
Copy link
Contributor Author

abzokhattab commented Dec 23, 2024

i see that the majority of the eslint violations were not generated by the changes of this pr.

ex: https://github.com/Expensify/App/pull/53849/files#diff-eec4675b6213eb7b4c8826a7b0a536ee7455e6a5580476ef0f9c8964e5deea81

should we still fix them?

@Ollyws
Copy link
Contributor

Ollyws commented Dec 24, 2024

They're from the new ESLint rule https://expensify.slack.com/archives/C01GTK53T8Q/p1734427537784129 I think it's suggested that we fix these in our PRs, unles it's a huge file with alot of changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants