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

Feat: Implement to use a 👍icon next to approved report preview #50387

Merged
merged 13 commits into from
Nov 19, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Oct 8, 2024

Details

Fixed Issues

$ #49847
PROPOSAL: #49847 (comment)

Tests

  1. [Employee] Submit a expense as a employee
  2. [Approver] Approve the request
  3. [Approver] Verify the animation after approving the request.
  4. Pay the approved expense and verify 👍 animates out and ✅ animates in
  • Verify that no errors appear in the JS console

Offline tests

  1. [Employee] Submit a expense as a employee
  2. [Approver] Approve the request
  3. [Approver] Verify the animation after approving the request.
  4. Pay the approved expense and verify 👍 animates out and ✅ animates in

QA Steps

  1. [Employee] Submit a expense as a employee
  2. [Approver] Approve the request
  3. [Approver] Verify the animation after approving the request.
  4. Pay the approved expense and verify 👍 animates out and ✅ animates in
  • Verify that no errors appear in the JS console

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 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
  • 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
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

@Krishna2323 Krishna2323 requested a review from a team as a code owner October 8, 2024 10:04
@melvin-bot melvin-bot bot requested review from situchan and removed request for a team October 8, 2024 10:04
Copy link

melvin-bot bot commented Oct 8, 2024

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

@Krishna2323 Krishna2323 changed the title Krishna2323/issue/49847 Feat: Implement to use a 👍icon next to approved report preview Oct 8, 2024
Copy link
Contributor

@situchan situchan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add platform screenshots

@@ -145,12 +145,18 @@ function ReportPreview({
transform: [{scale: checkMarkScale.value}],
}));

const isApproved = ReportUtils.isReportApproved(iouReport, action);
const thumbsUpScale = useSharedValue(isApproved ? 1 : 0.25);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.25 - where does this value come from? what issue with 0?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bump ^

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we use 0, it will look less subtle than this . #49847 (comment)

@Krishna2323
Copy link
Contributor Author

@situchan, can you please check this comment?

@Krishna2323
Copy link
Contributor Author

@Expensify/design, please check if the animation of the thumbs-up icon looks correct or not.

Monosnap.screencast.2024-10-02.05-53-34.mp4

@Krishna2323
Copy link
Contributor Author

@Expensify/design, friendly bump ^

@situchan
Copy link
Contributor

@Expensify/design ^

@dubielzyk-expensify
Copy link
Contributor

That looks good to me. Keen to hear the others thoughts. I do see a slight jump when the Red Dot disappears though which I think we should probably fix 🤔

@shawnborton
Copy link
Contributor

Agree about the RBR not going away immediately. It is weird to see the thumbs up icon before the RBR goes away.

We also might want to consider making that top eyebrow line use a height of 20px so we don't get a small jump from 20px down to 16px height once the RBR goes away.

@situchan
Copy link
Contributor

@Krishna2323 what is status?

@Krishna2323
Copy link
Contributor Author

Will work on these issues today.

@Krishna2323
Copy link
Contributor Author

@situchan, I have increased the line-height of the text beside RBR so it won't jump when the RBR is removed. As for the RBR not being removed immediately, I believe that's a separate issue from what we are trying to solve, and I don't have time to investigate it in-depth. I have very limited time these days as I’ve been dealing with health issues for the past 2-3 months. Sorry :(

@situchan
Copy link
Contributor

Agree "RBR not being removed immediately" is out of scope.

I have increased the line-height of the text beside RBR so it won't jump when the RBR is removed.

👍

@situchan
Copy link
Contributor

@Krishna2323 please also add test: pay after approve. Just to see how 👍 animates out and ✅ animates in

@shawnborton
Copy link
Contributor

Let us know when there are updated videos/screenshots to review as well!

@Krishna2323
Copy link
Contributor Author

also add test: pay after approve. Just to see how 👍 animates out and ✅ animates in

@situchan, done.

@Krishna2323
Copy link
Contributor Author

@situchan bump.

@situchan
Copy link
Contributor

#50387 (comment)
@Krishna2323 please post videos as well so design team can review them

@Krishna2323
Copy link
Contributor Author

Let us know when there are updated videos/screenshots to review as well!

@shawnborton, do you also need the animation from 👍 to ✅ for all platforms? Below is the video on web and on other platforms I have only recorded the animation of the appearance of 👍.

Monosnap.screencast.2024-10-02.05-53-34.mp4
Android: Native
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

@dannymcclain
Copy link
Contributor

I think it's looking really good. Will let Shawn and @dubielzyk-expensify weigh in too!

@dubielzyk-expensify
Copy link
Contributor

Yep that looks good to me too 👏

@shawnborton
Copy link
Contributor

Generally looks good to me, but I think I was expecting the same button animation to happen where the button transforms into some kind of "Approved" text... I know a Payment button needs to show up next, so I think we could just fade that Payment button in after a second or so of showing the Approved text. Thoughts on trying something like that out?

@Krishna2323
Copy link
Contributor Author

@DylanDylann you can start reviewing 😃

@DylanDylann
Copy link
Contributor

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.Recording.2024-11-09.at.15.19.30.mov
Android: mWeb Chrome
Screen.Recording.2024-11-09.at.15.17.44.mov
iOS: Native
Screen.Recording.2024-11-09.at.15.18.34.mov
iOS: mWeb Safari
Screen.Recording.2024-11-09.at.15.15.36.mov
MacOS: Chrome / Safari
Screen.Recording.2024-11-09.at.15.08.09.mov
MacOS: Desktop
Screen.Recording.2024-11-09.at.15.14.09.mov

Copy link
Contributor

@DylanDylann DylanDylann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@melvin-bot melvin-bot bot requested a review from youssef-lr November 9, 2024 08:21
@DylanDylann
Copy link
Contributor

@Krishna2323 Could you please resolve conflict?

@Krishna2323
Copy link
Contributor Author

conflicts resolved

@DylanDylann
Copy link
Contributor

@Krishna2323 Bump again

@DylanDylann
Copy link
Contributor

@youssef-lr Could you help to review this PR?

@Krishna2323
Copy link
Contributor Author

conflicts resolved

Copy link
Contributor

const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(iouReport, policy), [iouReport, policy]);
const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(iouReport, policy), [iouReport, policy]) || isApprovedAnimationRunning;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this || isApprovedAnimationRunning;?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't add || isApprovedAnimationRunning, the button will be hidden as soon as we approve the expense, and IOU.canApproveIOU(iouReport, policy) becomes false, interrupting the animation.

Copy link
Contributor

@youssef-lr youssef-lr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@youssef-lr youssef-lr merged commit a73f681 into Expensify:main Nov 19, 2024
19 checks passed
@OSBotify
Copy link
Contributor

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

Copy link
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.0.65-0 🚀

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

@mjasikowski
Copy link
Contributor

@Krishna2323 this has been reverted due to causing #52873.
I could only reproduce the behavior from the linked issue on a real Android device, but not an emulator.
I reproduced by tapping approve when the keyboard was visible (or clicking approve and then quickly tapping multiple times on the message composer to bring the keyboard up). Afterwards the dropdown arrow stopped working until I left and navigated back to the response chat.

Tried debbuging this ad hoc and removed the following line:

isDisabled={isPaidAnimationRunning || isApprovedAnimationRunning || isDisabled}

but that did not help - it seems this isn't the root cause.

Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.65-5 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 failure ❌
🍎🔄 iOS HybridApp 🍎🔄 failure ❌

@Krishna2323
Copy link
Contributor Author

@mjasikowski @DylanDylann, I tried reproducing the regression bug on a physical device, but I wasn't able to reproduce it.

WhatsApp.Video.2024-12-02.at.16.25.37.mp4

@Krishna2323
Copy link
Contributor Author

@DylanDylann, could you please test the new PR on a physical Android device to double-check that this issue is no longer reproducible?

@mjasikowski
Copy link
Contributor

@Krishna2323 I'll try to reproduce this today

@mjasikowski
Copy link
Contributor

@Krishna2323 I can still reproduce the issue on the original PR branch (Pixel 4a), will try with the new PR in a moment:

Screen.Recording.2024-12-04.at.15.52.36.mov

@mjasikowski
Copy link
Contributor

Can't reproduce in your new PR: #53373

@Krishna2323
Copy link
Contributor Author

@mjasikowski thanks for checking 🙏🏻

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

Successfully merging this pull request may close these issues.

9 participants