Revert "Revert "Move RBR to workspace chats instead of transaction threads"" by iwiznia · Pull Request #52478 · Expensify/App

iwiznia · 2024-11-13T13:47:56Z

Reverts #52431
The OG PR got reverted because here we added a new usage to one of the methods this PR was removing/renaming.

Explanation of Change

Shows RBR on workspace chat instead of in transaction threads

Fixed Issues

https://github.com/Expensify/Expensify/issues/433103

Tests

Have a report with violations
Check the RBR is only shown:
- In the workspace chat
- In the report preview in the workspace chat
- In the expense preview in the workspace chat for reports with only one expense
- In the expense preview of the report for reports with more than one expense
- In the expense itself
Check that a receipt with only modified date/amount violation is not shown with a RBR in the LHN, but it does show in the expense page when the report is in open state
Check that a receipt with only modified date/amount violation is shown with a RBR in in the report/expense page when the report is in submitted state

Offline tests

No

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…reads""

melvin-bot · 2024-11-13T13:48:28Z

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

iwiznia · 2024-11-13T14:22:54Z

Oh seems I need to update a test.

iwiznia · 2024-11-13T14:59:49Z

ok tests should be fixed

cead22 · 2024-11-13T15:40:21Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

This LGTM and i retested on macOS web, works as expected 👍 , skipping the checklist as we already have one above

melvin-bot · 2024-11-13T16:19:37Z

@jasperhuangg 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 · 2024-11-13T16:19:40Z

🎯 @allgandalf, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #52486.

OSBotify · 2024-11-13T16:39:00Z

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

github-actions · 2024-11-14T00:53:50Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.62-0 🚀

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

wildan-m · 2024-11-14T07:48:46Z

@iwiznia @allgandalf I think this revert cause error in expense deletion

https://expensify.slack.com/archives/C01GTK53T8Q/p1731569593270779

allgandalf · 2024-11-14T09:00:19Z

Looking...

dangrous · 2024-11-14T15:18:22Z

can you take a look at #52557 as well?

allgandalf · 2024-11-14T15:21:21Z

Looking....

github-actions · 2024-11-15T14:17:10Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.62-4 🚀

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

rojiphil · 2025-04-29T04:08:54Z

+    const allReports = Object.values(ReportConnection.getAllReports() ?? {}) as Report[];
+    const potentialReports = allReports.filter((r) => r.ownerAccountID === currentUserAccountID && (r.stateNum ?? 0) <= 1 && r.policyID === report.policyID);
+    return potentialReports.some(
+        (potentialReport) => hasViolations(potentialReport.reportID, transactionViolations) || hasWarningTypeViolations(potentialReport.reportID, transactionViolations),


We missed aligning the RBR display in LHN in line with the workspace chat itself. We did this in #57017

Revert "Revert "Move RBR to workspace chats instead of transaction th…

d41a331

…reads""

iwiznia self-assigned this Nov 13, 2024

iwiznia requested a review from a team as a code owner November 13, 2024 13:47

melvin-bot Bot requested a review from dangrous November 13, 2024 13:48

melvin-bot Bot removed the request for review from a team November 13, 2024 13:48

Remove usage of method that does not exist anymore

8a25fc2

iwiznia requested review from allgandalf, cead22 and pecanoro and removed request for dangrous November 13, 2024 13:53

Fix tests

811cbf4

cead22 approved these changes Nov 13, 2024

View reviewed changes

pecanoro approved these changes Nov 13, 2024

View reviewed changes

allgandalf approved these changes Nov 13, 2024

View reviewed changes

melvin-bot Bot requested a review from jasperhuangg November 13, 2024 16:19

melvin-bot Bot mentioned this pull request Nov 13, 2024

Payment issue for E/App PR#52478 #52486

Closed

pecanoro removed the request for review from jasperhuangg November 13, 2024 16:22

pecanoro merged commit 5f431ab into main Nov 13, 2024

pecanoro deleted the revert-52431-revert-51893-ionatan_moverbrworkspacechat branch November 13, 2024 16:23

github-actions Bot mentioned this pull request Nov 14, 2024

Deploy Checklist: New Expensify 2024-11-14 #52512

Closed

47 tasks

NJ-2020 mentioned this pull request Nov 14, 2024

[HOLD for payment 2024-11-26] [HOLD for payment 2024-11-22] Expense - App turns to blank page with console error after deleting expense #52531

Closed

8 tasks

nkdengineer mentioned this pull request Nov 14, 2024

[HOLD for payment 2024-11-26] [HOLD for payment 2024-11-22] [$50] Workspace- App crashes when submitting an expense in OD after creating a new Workspace #52542

Closed

8 tasks

IuliiaHerets mentioned this pull request Nov 14, 2024

RBR doesn't display immediately when a receipt with a modified amount is submitted #52557

Closed

8 tasks

Nodebrute mentioned this pull request Nov 14, 2024

Expense - RBR appears on the expense preview when there is no violation #52562

Closed

8 tasks

mkzie2 mentioned this pull request Nov 14, 2024

[$250] Hold - Red dot for held expense disappears when approve the report partially #52566

Closed

7 tasks

rojiphil mentioned this pull request Apr 28, 2025

[Due for payment 2025-04-16] [$250] Scan – RBR is not displayed in LHN when editing an amount to be higher than the scanned amount #57017

Closed

8 tasks

rojiphil reviewed Apr 29, 2025

View reviewed changes

cretadn22 mentioned this pull request Mar 8, 2026

[$250] LHN - GBR displayed for approver on LHN after moving IOU with violations to workspace. #73528

Closed

8 tasks

Uh oh!

Conversation

iwiznia commented Nov 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Nov 13, 2024

Uh oh!

iwiznia commented Nov 13, 2024

Uh oh!

iwiznia commented Nov 13, 2024

Uh oh!

cead22 commented Nov 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Nov 13, 2024

Uh oh!

melvin-bot Bot commented Nov 13, 2024

Uh oh!

OSBotify commented Nov 13, 2024

Uh oh!

github-actions Bot commented Nov 14, 2024

Uh oh!

wildan-m commented Nov 14, 2024

Uh oh!

allgandalf commented Nov 14, 2024

Uh oh!

dangrous commented Nov 14, 2024

Uh oh!

allgandalf commented Nov 14, 2024

Uh oh!

github-actions Bot commented Nov 15, 2024

Uh oh!

rojiphil Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

iwiznia commented Nov 13, 2024 •

edited

Loading

cead22 commented Nov 13, 2024 •

edited

Loading