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

Fix - Add BA thread is missing Add button, incomplete thread header and "Hidden" user #38884

Merged

Conversation

FitseTLT
Copy link
Contributor

@FitseTLT FitseTLT commented Mar 23, 2024

Details

Fixed Issues

$ #38126
PROPOSAL: #38126 (comment)

Tests

Precondition:

  • Admin and employee are in the Collect workspace.
  • Admin has a business bank account added to the workspace.
  • Employee does not have a bank account.
  1. [Employee] Go to staging.new.expensify.com.
  2. [Employee] Go to workspace chat and create a manual request and submit.
  3. [Admin] Approve the request.
  4. [Employee] Go to expense report.
  5. [Employee] Right click on "started settling up," message > Reply in thread.
  6. Verify that the thread header contains the whole parent message
  7. Verify that the parent message in the thread contains the whole message with the correct user display name instead of Hidden
  8. Verify that the add bank account button exists on this parent message of the thread and click on it and check it works properly.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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(themeColors.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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
nat.mp4
Android: mWeb Chrome
a.w.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
i.w.mp4
MacOS: Chrome / Safari
w.mp4
MacOS: Desktop
d.mp4

@FitseTLT FitseTLT requested a review from a team as a code owner March 23, 2024 19:17
@melvin-bot melvin-bot bot removed the request for review from a team March 23, 2024 19:17
Copy link

melvin-bot bot commented Mar 23, 2024

@akinwale 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 requested a review from akinwale March 23, 2024 19:17
@FitseTLT
Copy link
Contributor Author

bump @akinwale

@akinwale
Copy link
Contributor

Thanks for the bump. I'll review this later today or tomorrow at the latest.

@akinwale
Copy link
Contributor

Reviewing today.

@akinwale
Copy link
Contributor

@FitseTLT I am unable to complete the business bank account process as I'm stuck on step 5 and I am unable to use the Pay with Expensify button. How did you get past this?

@FitseTLT
Copy link
Contributor Author

@FitseTLT I am unable to complete the business bank account process as I'm stuck on step 5 and I am unable to use the Pay with Expensify button. How did you get past this?

You need to make use staging server on.

@akinwale
Copy link
Contributor

@FitseTLT I am unable to complete the business bank account process as I'm stuck on step 5 and I am unable to use the Pay with Expensify button. How did you get past this?

You need to make use staging server on.

Yes, I already did this and completed the steps up to the last step. Then I'm asked to chat to finish setup.

@FitseTLT
Copy link
Contributor Author

FitseTLT commented Apr 1, 2024

Here is how I finished the flow @akinwale

2024-04-01.13-59-25.mp4

@akinwale
Copy link
Contributor

akinwale commented Apr 1, 2024

Here is how I finished the flow @akinwale

Ah, I see. That's the wallet flow which is different from the VBA flow. I'll get this set up and then I should be able to finish the review. Thanks.

@FitseTLT
Copy link
Contributor Author

FitseTLT commented Apr 4, 2024

bump @akinwale

@akinwale
Copy link
Contributor

akinwale commented Apr 4, 2024

@FitseTLT I'm still stuck trying to test settling a payment as the workspace admin. Even after adding a bank account, I get stuck in a loop as shown in this video. Any ideas?

bba-loop.mp4

@FitseTLT
Copy link
Contributor Author

FitseTLT commented Apr 4, 2024

@akinwale What we need to test is totally different to what you are showing me.
First you set reimbursement bank account as admin in old dot
image

while the employee bank account is not set then when you approve any iou report the Add bank account message will appear and it is what you should proceed with the test on by replying in thread on the message ... bla bla

@akinwale
Copy link
Contributor

akinwale commented Apr 4, 2024

Ah, I see. I was working under the assumption that the workspace admin should have a bank account which would be used to settle the employee IOU (based on the listed test preconditions). Thanks for the clarification. I will have another look in a couple of hours.

@FitseTLT
Copy link
Contributor Author

FitseTLT commented Apr 4, 2024

Nope U only add bank account on the collect policy (reimbursement -> Direct). YOur workspace should have USD default currency and then on OD U can follow this instruction. Now, when u approve an employee's report who hasn't set their bank account that started settling up, payment is held until ... message comes 👍

@akinwale
Copy link
Contributor

akinwale commented Apr 5, 2024

Reviewing today.

@akinwale
Copy link
Contributor

akinwale commented Apr 8, 2024

Ok, finally got it to work. Will finish reviewing shortly. The Add bank account message shows up after the request is approved, not after payment, which is where I got mostly confused as I kept trying to "Pay with Expensify" which is where I got stuck. I also did not have the Reimbursement setting set correctly on OD.

@FitseTLT Please update the test steps as follows:

Precondition:
Admin has bank account account.
Admin has a business bank account added to the workspace.

Also need to add this to the preconditions.

  • Policy Reimbursement is set to Direct on Old Dot.

Test step:
[Admin] Pay the request with Expensify.
[Admin] Approve the request.

@akinwale
Copy link
Contributor

akinwale commented Apr 8, 2024

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

Copy link
Contributor

@akinwale akinwale left a comment

Choose a reason for hiding this comment

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

Looks good.

@FitseTLT Please fix the test steps and then I can approve.

@FitseTLT
Copy link
Contributor Author

FitseTLT commented Apr 8, 2024

Ok, finally got it to work. Will finish reviewing shortly. The Add bank account message shows up after the request is approved, not after payment, which is where I got mostly confused as I kept trying to "Pay with Expensify" which is where I got stuck. I also did not have the Reimbursement setting set correctly on OD.

@FitseTLT Please update the test steps as follows:

Precondition: Admin has bank account account. Admin has a business bank account added to the workspace.

Also need to add this to the preconditions.

  • Policy Reimbursement is set to Direct on Old Dot.

Test step: [Admin] Pay the request with Expensify. [Admin] Approve the request.

Wooh. Very very sorry @akinwale I have really played a substantial role in your confusion, it really surprised me when I saw it was like that. I have updated according to your request but only this part

  • Policy Reimbursement is set to Direct on Old Dot.

, I think, would add more confusion because it is already included in this step Precondition: ~Admin has bank account account.~ Admin has a business bank account added to the workspace. Thnx

Copy link
Contributor

@akinwale akinwale 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 chiragsalian April 8, 2024 11:25
Copy link
Contributor

@chiragsalian chiragsalian left a comment

Choose a reason for hiding this comment

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

Code LGTM, there just an unnecessary line break to remove and then I'll approve and merge this.

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
@FitseTLT
Copy link
Contributor Author

Let's merge this @chiragsalian

@chiragsalian chiragsalian merged commit 159628b into Expensify:main Apr 15, 2024
15 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/chiragsalian in version: 1.4.63-0 🚀

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

@gijoe0295 gijoe0295 mentioned this pull request Apr 21, 2024
50 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

return '';
}
if (ReportActionsUtils.isApprovedOrSubmittedReportAction(reportAction)) {
return ReportActionsUtils.getReportActionMessageText(reportAction);
Copy link
Contributor

Choose a reason for hiding this comment

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

This was getting the non-localized message from the backend, causing #41202 which we fixed in #41884

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.

None yet

5 participants