Skip to content

Integrate BE for Manager McTest feature#57171

Merged
grgia merged 48 commits intoExpensify:mainfrom
callstack-internal:integrate-be-manager-mctest
Mar 17, 2025
Merged

Integrate BE for Manager McTest feature#57171
grgia merged 48 commits intoExpensify:mainfrom
callstack-internal:integrate-be-manager-mctest

Conversation

@kubabutkiewicz
Copy link
Contributor

@kubabutkiewicz kubabutkiewicz commented Feb 20, 2025

Explanation of Change

Fixed Issues

$ #55069
$ #55070
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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
android.mp4
Android: mWeb Chrome
iOS: Native
ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

Comment on lines +781 to +782
height={32}
width={32}
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't we have constants for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure I didn't add this 😅 I just moved this component

@kubabutkiewicz kubabutkiewicz marked this pull request as ready for review February 25, 2025 12:16
@kubabutkiewicz kubabutkiewicz requested review from a team as code owners February 25, 2025 12:16
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team February 25, 2025 12:16
@melvin-bot
Copy link

melvin-bot bot commented Feb 25, 2025

@DylanDylann 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

The styles here look a bit off:
CleanShot 2025-02-25 at 09 23 46@2x

Just want to make sure you're using these values for the outer padding and spacing?
CleanShot 2025-02-25 at 09 24 19@2x

@shawnborton
Copy link
Contributor

And I believe we have a margin of 28px around the whole thing, so it would be 28px away from the left and right edges of the RHP.

};

return shouldShowTestReceiptTooltip ? (
<EducationalTooltip
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 you remove EducationalTooltip here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is moved to IOURequestStepScan screens, but lets wait until this #57480

@DylanDylann
Copy link
Contributor

@kubabutkiewicz Could you help to merge the latest main because we merged #57480? Many thanks

@DylanDylann
Copy link
Contributor

Start on reviewing again

@grgia
Copy link
Contributor

grgia commented Mar 13, 2025

We can ignore ios ^ its a cache issue

@grgia
Copy link
Contributor

grgia commented Mar 13, 2025

I can't get past this

Mar-13-2025.16-19-01.mp4

@grgia
Copy link
Contributor

grgia commented Mar 13, 2025

We are held on final QA -> #57554 (comment)

@DylanDylann
Copy link
Contributor

@kubabutkiewicz The date looks wrong

Screen.Recording.2025-03-14.at.10.49.21.mov

@DylanDylann
Copy link
Contributor

DylanDylann commented Mar 14, 2025

@kubabutkiewicz @grgia After receiving the BE response, the request currency changed to local currency. Should we need to adjust the currency on the optimistic data?

Offline

Screenshot 2025-03-14 at 10 53 26

Online

Screenshot 2025-03-14 at 10 51 29

@grgia
Copy link
Contributor

grgia commented Mar 14, 2025

@DylanDylann if its only the report total, we can match the typical IOU flows for scan receipt currencies

@grgia
Copy link
Contributor

grgia commented Mar 14, 2025

@kubabutkiewicz could we fix the date?

@kubabutkiewicz
Copy link
Contributor Author

@grgia @DylanDylann About date, I think this is what is happening for every scan receipt, so for optimistic date for scans its using current date, do we want to change it for scans to manager mc test? I posting screens for using my own receipt
image
image

@grgia
Copy link
Contributor

grgia commented Mar 14, 2025

@kubabutkiewicz let's leave as is in that case!

@grgia
Copy link
Contributor

grgia commented Mar 14, 2025

conflicts?

@grgia
Copy link
Contributor

grgia commented Mar 14, 2025

We CPd the scan fix btw

@kubabutkiewicz
Copy link
Contributor Author

@grgia conflicts resolved

@DylanDylann
Copy link
Contributor

@grgia I think this PR is fine to merge

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

LEGGO!

@grgia grgia merged commit e45a68d into Expensify:main Mar 17, 2025
16 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.

@izarutskaya
Copy link

@kubabutkiewicz Any QA steps for this?

@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.1.14-0 🚀

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

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.14-5 🚀

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


const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
!getIsUserSubmittedExpenseOrScannedReceipt() && Permissions.canUseManagerMcTest(betas) && isTabActive,
Copy link
Contributor

Choose a reason for hiding this comment

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

You have not checked for screens where we don't want to show this tooltip, which caused #58959

total: isTestReceipt ? CONST.TEST_RECEIPT.AMOUNT : iou.report?.total,
currency: isTestReceipt ? CONST.TEST_RECEIPT.CURRENCY : iou.report?.currency,
lastActionType: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
Copy link
Contributor

Choose a reason for hiding this comment

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

We forgot to add the stateNum property, which caused the expense preview to not show the paid tag. More details can be found in the issue and the proposal.

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.