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

Follow ups to Broken Connection with direct feeds #57242

Conversation

VickyStash
Copy link
Contributor

@VickyStash VickyStash commented Feb 21, 2025

Explanation of Change

Fixes for broken connection violations display

Fixed Issues

$ #57162
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console

Pre-steps

  1. Prepare 2 app accounts.
  2. You need to ask @joekaufmanexpensify to help you set up these 2 account:
  • Account 1 should be added as an admin to the workspace with company cards set up. The card should be assigned to user 1.
  • Account 2 should be added as a member to the same workspace. The card should be assigned to user 2.
  • The connection should be broken after all.

Receipts to test with: you can find in slack.

Test steps:

  1. Login as Account 1 (Admin). Create several scan expenses using the receipts mentioned above. See that after the scanning there are broken connection errors and you see it in the app.
  2. Login as Account 2 (Member). Create several scan expenses using the receipts mentioned above. See that after scanning expenses have broken connection errors. Submit one of the expenses, make sure the full message and Mark as cash button are displayed.
  3. From Account 1 (Admin): make sure you see broken connection violation errors for expenses created by Account 2. Approve one of the expenses of Account 2.
  4. From Account 2 (Member): see that approved expense with broken connection violation error still shows the error message, but without mentioning mark as cash part. Mark as cash button should be hidden.

Offline tests

Same, as in the Tests section.

QA Steps

  • Verify that no errors appear in the JS console

Same, as in the Tests section.

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

Admin view:
android_admin

Member - processing view:
android_member3

Member - approved view:
android_member2

Member - open view:
android_memeber1

Android: mWeb Chrome

Admin view:
android_web_admin

Member - processing view:
android_web_member3

Member - approved view:
android_web_member2

Member - open view:
android_web_member1

iOS: Native

Member - processing view:
ios_member3

Member - approved view:
ios_member2

Member - open view:
ios_member1

Admin view:
ios_admin1

iOS: mWeb Safari

Member - open view:
ios_web_member1

Member - approved view:
ios_web_member2

Member - processing view:
ios_web_member3

Admin view:
ios_web_admin

MacOS: Chrome / Safari

Member - processing view:
member_web3

Member - approved view:
web_member2

Member - open view:
web_member1

Admin view:
web_admin1

MacOS: Desktop

Member - processing view:
desktop_member3

Member - approved view:
desktop_memeber2

Member - open view:
desktop_member1

Admin view:
desktop_admin1

@VickyStash VickyStash changed the title [WIP] Follow ups to Broken Connection with direct feeds Follow ups to Broken Connection with direct feeds Feb 24, 2025
@VickyStash VickyStash marked this pull request as ready for review February 24, 2025 11:02
@VickyStash VickyStash requested a review from a team as a code owner February 24, 2025 11:02
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team February 24, 2025 11:02
Copy link

melvin-bot bot commented Feb 24, 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]

@mountiny
Copy link
Contributor

@DylanDylann can you please complete the review here?

@DylanDylann
Copy link
Contributor

@joekaufmanexpensify Could you help to set up my accounts to test this PR?
My admin acc: dylandylan9112+23000@gmail.com
My member acc: dylandylan9112+23100@gmail.com

Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

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

Copy link
Contributor

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

Android 🤖 iOS 🍎
❌ FAILED ❌ https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/57242/index.html
The QR code can't be generated, because the Android build failed iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/57242/NewExpensify.dmg https://57242.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@joekaufmanexpensify
Copy link
Contributor

Login as Account 1 (Admin). Create several scan expenses using the receipts mentioned above. See that after the scanning there are broken connection errors and you see it in the app.

Confirmed! The violation is not live updating, but when you click into the expense, it is there for the admin viewing their own expenses.

2025-02-25_10-25-14.mp4

@joekaufmanexpensify
Copy link
Contributor

joekaufmanexpensify commented Feb 25, 2025

Login as Account 2 (Member). Create several scan expenses using the receipts mentioned above. See that after scanning expenses have broken connection errors. Submit one of the expenses, make sure the full message and Mark as cash button are displayed.

Confirmed! Violation on open and processing expenses with mark as cash for both.

2025-02-25_10-33-39.mp4

From Account 2 (Member): see that approved expense with broken connection violation error still shows the error message, but without mentioning mark as cash part. Mark as cash button should be hidden.

Violation and no mark as cash on approved.

2025-02-25_10-34-21.mp4

@joekaufmanexpensify
Copy link
Contributor

From Account 1 (Admin): make sure you see broken connection violation errors for expenses created by Account 2. Approve one of the expenses of Account 2.

Confirmed. Admin can see violation on employee's expense on an open report.

2025-02-25_10-37-46.mp4

@VickyStash
Copy link
Contributor Author

Thank you @joekaufmanexpensify!
@DylanDylann, could you please review the code?

@DylanDylann
Copy link
Contributor

Sure, I am on it

@DylanDylann
Copy link
Contributor

DylanDylann commented Feb 26, 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 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 1. In the employee view Screenshot 2025-02-26 at 21 50 07
  1. In the employee view after approval
Screenshot 2025-02-26 at 21 19 32
Android: mWeb Chrome
  1. In the employee view
Screenshot 2025-02-26 at 21 42 59
  1. In the employee view after approval
Screen.Recording.2025-02-26.at.21.22.25.mov
iOS: Native
  1. In the employee view
Screenshot 2025-02-26 at 21 44 00
  1. In the employee view after approval
Screen.Recording.2025-02-26.at.21.19.43.mov
iOS: mWeb Safari 1. In the employee view Screenshot 2025-02-26 at 21 37 35
  1. In the employee view after approval
Screen.Recording.2025-02-26.at.21.21.13.mov
MacOS: Chrome / Safari
  1. In the employee view
Screenshot 2025-02-26 at 17 38 22
  1. In the employee view after approval
Screen.Recording.2025-02-26.at.17.54.30.mov
  1. In the admin view
Screenshot 2025-02-26 at 21 28 48
MacOS: Desktop
  1. In the employee view
Screenshot 2025-02-26 at 21 35 24
  1. In the employee view after approval
Screen.Recording.2025-02-26.at.21.21.40.mov
  1. In the admin view
Screenshot 2025-02-26 at 21 28 48

if (!isPolicyAdmin(policy) || isCurrentUserSubmitter(report?.reportID)) {
return true;
}
return isOpenExpenseReport(report) || (isProcessingReport(report) && isInstantSubmitEnabled(policy));
Copy link
Contributor

Choose a reason for hiding this comment

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

@VickyStash Could you help to explain why do we need to add isInstantSubmitEnabled condition?

Copy link
Contributor

Choose a reason for hiding this comment

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

As I understand, policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT means that we toggle off "Delay submission"

Screenshot 2025-02-26 at 17 52 24

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DylanDylann Let me double check it to be sure!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DylanDylann That's mentioned in the doc:

  • Admins can see this violation on open reports (which makes it clear why the submit button is either hidden, or submitting splits some expenses to a new report) and processing reports with instant submit (which clarifies why the approve/pay button is hidden, or why taking that action splits some expenses to a new report.)
  • Admins can’t see this violation on processing reports (with delayed submission), approved reports, or paid reports (same as OldDot.)

@melvin-bot melvin-bot bot requested a review from mountiny February 26, 2025 14:50
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks! One questions but please add it as a follow up

@@ -830,7 +840,24 @@ function shouldShowBrokenConnectionViolation(
}

const brokenConnectionViolations = violations.filter((violation) => isBrokenConnectionViolation(violation));
return brokenConnectionViolations.length > 0 && (!isPolicyAdmin(policy) || isOpenExpenseReport(report) || (isProcessingReport(report) && isInstantSubmitEnabled(policy)));

if (brokenConnectionViolations.length > 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@VickyStash Could you please write unit test covering the shouldShowBrokenConnectionViolation logic?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mountiny I've prepared a follow-up PR: #57542

@mountiny mountiny merged commit 971b380 into Expensify:main Feb 27, 2025
24 of 27 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/mountiny in version: 9.1.7-1 🚀

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

@kavimuru
Copy link

@joekaufmanexpensify Looks like our applause QA team could not test this PR. Could this be verified internally?

@joekaufmanexpensify
Copy link
Contributor

@kavimuru Yeah, this one should be internal QA. I will QA it now and then mark it on the checklist when done.

@joekaufmanexpensify
Copy link
Contributor

QA'ed on staging and all looks good!

@mountiny
Copy link
Contributor

mountiny commented Mar 2, 2025

Thanks!

Copy link
Contributor

github-actions bot commented Mar 3, 2025

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.7-2 🚀

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

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.

6 participants