Skip to content

[Attendees Tracking] - More follow up issues #61484

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

Merged
merged 3 commits into from
May 9, 2025

Conversation

allroundexperts
Copy link
Contributor

@allroundexperts allroundexperts commented May 6, 2025

Explanation of Change

fixes #61426
fixes #61429
fixes #61431
fixes #61433
fixes #61491
fixes #61427
fixes #61425

Fixed Issues

$ #44725
PROPOSAL: N/A

Tests

Test 1
Precondition: Workspace has imported per diem rates.

  1. Open the app, Go to workspace chat.
  2. Click + > Create expense > Per diem.
  3. Select a destination.
  4. Complete the rest of the flow and reach confirmation page.
  5. Note that Attendees field is present on the confirmation page.
  6. Close the RHP.
  7. Open FAB > Create expense > Per diem.
  8. Repeat Step 4 and 5 from FAB.

Verify that Attendees field will be present on the confirmation page when create per diem expense flow is initiated from FAB.

Test 2

Precondition: Admin and member are in the same workspace.

  1. [Member] Go to workspace chat and submit an expense.
  2. [Member] Click Submit on the expense preview.
  3. [Admin] Go to workspace chat with member.
  4. [Admin] Open the expense report.
  5. [Admin] Click Approve and Pay elsewhere.
  6. [Member] Go to the transaction thread of the paid expense.
  7. [Member] Click Attendees field.
  8. [Member] Add another attendee and save it.

Verify that the attendee field should be disabled for member after the expense is paid.

Test 3

  1. Go to workspace chat.
  2. Create two manual expenses with the same amount and merchant.
  3. Go to transaction thread of any expense.
  4. Click Review duplicates.
  5. Select Keep this one on any expense preview.
  6. On the confirmation page, click Attendees.
  7. Edit the attendees.

Verify that the attendees field should be disabled on the confirmation page when reviewing duplicates (other fields are disabled on confirmation page).

Test 4

  1. Go to workspace chat.
  2. Click + > Create expense > Scan
  3. Upload a receipt.
  4. On confirmation page, click Show more.
  5. Click Attendees.
  6. Select one more attendee.
  7. Click Save.
  8. Click Create expense.
  9. Go to transaction thread.
  10. Wait for the scan to complete.

Verify that there will be a dot separator between Attendees and "x per person" in transaction thread.

Test 5

Precondition: Workspace has imported per diem rates.

  1. Go to workspace chat.
  2. Click + > Create expense > Per diem.
  3. Select a destination.
  4. Complete the rest of the flow and reach confirmation page.
  5. On confirmation page, click Attendees.
  6. Select one more attendee.
  7. Click Save.

Verify that attendees field will not show "0.00 per person" on confirmation page because it is not the correct amount.

Test 6

  1. Go to workspace chat.
  2. Click + > Create expense > Manual
  3. Enter amount > Next.
  4. On confirmation page, click Show more.
  5. Click Attendees.
  6. Enter a name (applee) and select the user.
  7. Enter the same name again (applee).
  8. Note that the same name appears twice.

Verify that the same name will not appear twice in the list.

Test 7

  1. Go to workspace chat.
  2. Click + > Create expense > Manual.
  3. Enter amount > Next.
  4. On confirmation page, click Show more.
  5. Click Attendees.
  6. Select one more attendee.
  7. Click Save.
  8. Note that Attendees field has "x per person" on the confirmation page.
  9. Click Create expense.
  10. Go to transaction thread.

Verify that in transaction thread, Attendees field will also show "x per person".

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

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

Same as above

  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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

Unable to build android

Android: mWeb Chrome
Screen.Recording.2025-05-06.at.7.52.33.PM.mov
iOS: Native
Screen.Recording.2025-05-06.at.7.20.36.PM.mov
iOS: mWeb Safari
Screen.Recording.2025-05-06.at.7.16.22.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-05-06.at.7.05.05.PM.mov
MacOS: Desktop
screen-recording-2025-05-06-at-71123-pm_w46cLPFn.mov

@allroundexperts allroundexperts marked this pull request as ready for review May 6, 2025 15:02
@allroundexperts allroundexperts requested a review from a team as a code owner May 6, 2025 15:02
@melvin-bot melvin-bot bot requested a review from suneox May 6, 2025 15:02
Copy link

melvin-bot bot commented May 6, 2025

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

@melvin-bot melvin-bot bot removed the request for review from a team May 6, 2025 15:02
@suneox
Copy link
Contributor

suneox commented May 6, 2025

I have another high-priority issue. If this PR isn't urgent, I can review it tomorrow.

@allroundexperts
Copy link
Contributor Author

@mananjadhav Will be reviewing this @suneox.

@mananjadhav
Copy link
Collaborator

I’ll be reviewing this in an hour.

@francoisl
Copy link
Contributor

@mananjadhav how's it going with the review here? Do you think you'll be able to get to it today? TIA!

@mananjadhav
Copy link
Collaborator

mananjadhav commented May 7, 2025

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
mweb-chrome-attendees_x7TVsTcJ.mp4
iOS: HybridApp
ios-attendees_3gkR9oZM.mp4
iOS: mWeb Safari
mweb-safari-attendees.mov
MacOS: Chrome / Safari
web-attendees-test-1-3-5_kO7lAkGy.mp4
web-attendees.-.test.4.mov
web-attendees-test-6-7_sHHkX5hV.mp4
web-attendees -  test 3
MacOS: Desktop
desktop-attendees_30lDkc45.mp4

@melvin-bot melvin-bot bot requested a review from Julesssss May 7, 2025 22:16
@mananjadhav
Copy link
Collaborator

Having issues with my Android setup, so I skipped it. The changes are not native.

@Julesssss
Copy link
Contributor

Let's request a pre-merge QA test, like last time.

Copy link
Contributor

github-actions bot commented May 7, 2025

🚧 @Julesssss has triggered a test app build. You can view the workflow run here.

Copy link
Contributor

github-actions bot commented May 8, 2025

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
Android 🤖🔄 iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/61484-hybrid/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/61484-hybrid/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/61484/NewExpensify.dmg https://61484.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

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

Could we re-enable the feature too please, so QA are able to test. Thanks

@francoisl
Copy link
Contributor

It's already re-enabled, as far as I can tell?
https://github.com/Expensify/App/pull/61484/files#diff-e0bbc1d7016fc365a636f5e1d9928913f99dc8a5e532727c6ebb9c2bbd1181bbR328-R330

I can see the attendee selector as expected locally, did you mean enable something else?

@Julesssss
Copy link
Contributor

I can see the attendee selector as expected locally, did you mean enable something else?

Nah thanks I missed that.

@francoisl
Copy link
Contributor

Still waiting for pre-merge QA tests - I bumped the team for an update.

@francoisl
Copy link
Contributor

Pre-merge QA complete, no issues found 🚀

@francoisl francoisl merged commit 0e028c3 into Expensify:main May 9, 2025
19 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented May 9, 2025

✋ 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/francoisl in version: 9.1.45-0 🚀

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

Copy link
Contributor

🚀 Deployed to staging by https://github.com/francoisl in version: 9.1.45-0 🚀

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

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