Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

tienifr · 2024-02-06T16:55:16Z

Details

This PR fixes the issue that app crashes when changing the role of user from auditor to employee.

Fixed Issues

$ #34879
PROPOSAL: #34879 (comment)

Tests

Pre-condition: User submitted an expense as an employee to a collect workspace and invited another user as an auditor.

In ND, log in as the auditor, go to an expense report submitted by the employee
In OD, log in as the admin, change the role of the auditor to employee
In ND, verify that app does not crash
In OD, as the admin, change the role of the employee to auditor
In ND, go to that workspace's policy expense chat
In OD, as the admin, change the role of the auditor to employee
Verify user is navigated to Concierge chat

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Pre-condition: User submitted an expense as an employee to a collect workspace and invited another user as an auditor.

In ND, log in as the auditor, go to an expense report submitted by the employee
In OD, log in as the admin, change the role of the auditor to employee
In ND, verify that app does not crash
In OD, as the admin, change the role of the employee to auditor
In ND, go to that workspace's policy expense chat
In OD, as the admin, change the role of the auditor to employee
Verify user is navigated to Concierge chat

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-08.at.15.13.35-compressed.mov

Android: mWeb Chrome

Screen.Recording.2024-02-08.at.15.13.35-compressed.mov

iOS: Native

Screen.Recording.2024-02-08.at.15.15.50-compressed.mov

iOS: mWeb Safari

Screen.Recording.2024-02-08.at.15.16.54-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-07.at.12.23.03-compressed.mov

Screen.Recording.2024-02-24.at.14.43.01-compressed.mov

MacOS: Desktop

Screen.Recording.2024-02-07.at.12.23.03-compressed.mov

Screen.Recording.2024-02-24.at.14.43.01-compressed.mov

melvin-bot · 2024-02-07T05:36:13Z

@aimane-chnaif 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]

aimane-chnaif · 2024-02-11T17:03:18Z

src/pages/home/ReportScreen.js

@@ -643,7 +643,7 @@ export default compose(
                key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : 0}`,
                selector: (parentReportActions, props) => {
                    const parentReportActionID = lodashGet(props, 'report.parentReportActionID');
-                    if (!parentReportActionID) {
+                    if (!parentReportActionID || !parentReportActions) {


Please pull main. This change seems redundant thanks to https://github.com/Expensify/App/pull/34106/files#diff-dd4bfa50713397aca8cb40145317936ab0affe19abc2a9c24d6c8849ed75dc9bR649

aimane-chnaif · 2024-02-11T17:46:11Z

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 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

all.mov

Android: mWeb Chrome

all.mov

iOS: Native

all.mov

iOS: mWeb Safari

all.mov

MacOS: Chrome / Safari

all.mov

MacOS: Desktop

all.mov

aimane-chnaif · 2024-02-11T17:49:00Z

src/pages/home/ReportScreen.js

@@ -418,7 +418,7 @@ function ReportScreen({
                !onyxReportID &&
                prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN &&
                (report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED || (!report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM))) ||
-            ((ReportUtils.isMoneyRequest(prevReport) || ReportUtils.isMoneyRequestReport(prevReport)) && _.isEmpty(report))
+            ((ReportUtils.isMoneyRequest(prevReport) || ReportUtils.isMoneyRequestReport(prevReport) || ReportUtils.isPolicyExpenseChat(prevReport)) && _.isEmpty(report))


This change itself doesn't fix the infinite loading issue. One more change is needed after #30168.

Screen.Recording.2024-02-11.at.6.27.02.PM.mov

…or to employee

tienifr · 2024-02-26T10:59:16Z

@aimane-chnaif I just merged main and resolved all your feedbacks.

aimane-chnaif · 2024-02-26T11:43:27Z

src/pages/home/ReportScreen.js

+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isDeletedReport(report) {


Will this still be true when report is real empty?
I suggest this return true when report is null, undefined, {} as well.
And function name can just be isEmpty

Will this still be true when report is real empty?

Yes it will still be true with null, undefined and {}.

And function name can just be isEmpty

Updated!

tienifr · 2024-02-29T09:22:53Z

Waiting feedback from @aimane-chnaif.

aimane-chnaif · 2024-02-29T09:28:59Z

Code looks good. Please merge main

tienifr · 2024-02-29T09:55:59Z

I've merged main.

aimane-chnaif · 2024-02-29T12:54:54Z

While testing, I found weird bug.

reportProp becomes empty object while switching Audit > Admin so auto navigates to Concierge chat.
This should not happen because user has access to this chat in both cases.

Screen.Recording.2024-02-29.at.1.43.44.PM.mov

@tienifr can you investigate why reportProp becomes empty while switching user role?

tienifr · 2024-03-01T10:13:45Z

can you investigate why reportProp becomes empty while switching user role?

The Pusher reset the report by first set command to null. I'm not sure why they do this. If this is a BE bug, I think we should fix it in the BE. Asking here.

aimane-chnaif · 2024-03-03T14:34:08Z

This is also out of scope. User display name and avatar are broken in report preview action before opening expense report.

Screen.Recording.2024-03-03.at.3.32.17.PM.mov

tienifr · 2024-03-06T02:33:21Z

@roryabraham Please have a look.

tienifr · 2024-03-11T07:39:54Z

@roryabraham Kindly check this when you have time.

tienifr · 2024-03-12T09:30:05Z

@aimane-chnaif ReportScreen was migrated to TS so I rewrote the isEmpty function. Please take a look.

aimane-chnaif · 2024-03-12T09:43:53Z

@aimane-chnaif ReportScreen was migrated to TS so I rewrote the isEmpty function. Please take a look.

Looks good

tienifr · 2024-03-12T09:46:08Z

@aimane-chnaif Please hold up, reportID was fallback to empty string here so the above logic won't work. Will notify you once it's ready for review again. Sorry for the inconvenience!

aimane-chnaif · 2024-03-12T09:48:57Z

@aimane-chnaif Please hold up, reportID was fallback to empty string here so the above logic won't work. Will notify you once it's ready for review again. Sorry for the inconvenience!

oh bad TS migration

aimane-chnaif · 2024-03-12T14:23:19Z

@aimane-chnaif Please hold up, reportID was fallback to empty string here so the above logic won't work. Will notify you once it's ready for review again. Sorry for the inconvenience!

oh bad TS migration

I asked confirmation in that PR - https://github.com/Expensify/App/pull/35566/files#r1521561705

tienifr · 2024-03-13T05:23:01Z

@aimane-chnaif I got the reply from TS migration author and seems like that was a mandantory change. I updated isEmpty logic to include empty string check and things worked fine. Please take a look!

Screen.Recording.2024-03-13.at.12.21.00-compressed.mov

aimane-chnaif · 2024-03-13T09:30:19Z

@aimane-chnaif I got the reply from TS migration author and seems like that was a mandantory change. I updated isEmpty logic to include empty string check and things worked fine. Please take a look!

Looks good, though it's a bit weird

tienifr · 2024-03-13T10:05:01Z

Awating input from @roryabraham.

melvin-bot · 2024-03-18T16:05:30Z

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

roryabraham · 2024-03-18T16:06:05Z

not sure what wasn't passing? Looked all 🟢 to me?

OSBotify · 2024-03-18T16:30:10Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.54-0 🚀

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

OSBotify · 2024-03-19T23:11:14Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.54-4 🚀

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

tienifr added 2 commits February 6, 2024 23:51

fix: app crashes when changing from auditor to employee

21e3ec0

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

7f2ac51

tienifr marked this pull request as ready for review February 7, 2024 05:36

tienifr requested a review from a team as a code owner February 7, 2024 05:36

melvin-bot bot requested review from aimane-chnaif and removed request for a team February 7, 2024 05:36

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

6f440f2

aimane-chnaif reviewed Feb 11, 2024

View reviewed changes

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

a691831

tienifr changed the title ~~Fix: App crashes when changing from auditor to employee~~ Fix: Infinite loading in policy expense chat when changing from auditor to employee Feb 24, 2024

tienifr added 4 commits February 24, 2024 13:51

remove redundant change

a78c3f8

fix: infinite loading in policy expense chat when changing from audit…

229e156

…or to employee

fix lint

feeceae

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

6bdef36

aimane-chnaif reviewed Feb 26, 2024

View reviewed changes

change function name

f7ec94a

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

53c791f

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

58884aa

tienifr mentioned this pull request Mar 1, 2024

[HOLD for payment 2024-03-26] [$500] Web - Expense - App crashes when changing the role of user from auditor to employee #34879

Closed

6 tasks

aimane-chnaif approved these changes Mar 3, 2024

View reviewed changes

melvin-bot bot requested a review from roryabraham March 3, 2024 14:42

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

f20772e

Merge branch 'main' into fix/34879

b2c69c7

aimane-chnaif mentioned this pull request Mar 12, 2024

[TS migration] Migrate 'Report' page to TypeScript #35566

Merged

50 tasks

tienifr added 2 commits March 13, 2024 12:14

Merge branch 'main' of https://github.com/tienifr/App into fix/34879

9b12bd1

modify isEmpty logic

884b3ed

fix lint

20b108b

roryabraham approved these changes Mar 18, 2024

View reviewed changes

roryabraham merged commit 55495b1 into Expensify:main Mar 18, 2024
15 checks passed

melvin-bot bot added the Emergency label Mar 18, 2024

roryabraham removed the Emergency label Mar 18, 2024

github-actions bot mentioned this pull request Mar 18, 2024

Deploy Checklist: New Expensify 2024-03-18 #38489

Closed

65 tasks

kavimuru mentioned this pull request Mar 19, 2024

User is not navigated to Concierge chat after changing their role to Employee #38580

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

tienifr commented Feb 6, 2024 •

edited

Loading

melvin-bot bot commented Feb 7, 2024

aimane-chnaif Feb 11, 2024

aimane-chnaif commented Feb 11, 2024 •

edited

Loading

aimane-chnaif Feb 11, 2024

tienifr Feb 24, 2024

tienifr commented Feb 26, 2024

aimane-chnaif Feb 26, 2024

tienifr Feb 26, 2024 •

edited

Loading

tienifr commented Feb 29, 2024

aimane-chnaif commented Feb 29, 2024

tienifr commented Feb 29, 2024

aimane-chnaif commented Feb 29, 2024

tienifr commented Mar 1, 2024 •

edited

Loading

aimane-chnaif commented Mar 3, 2024

tienifr commented Mar 6, 2024

tienifr commented Mar 11, 2024

tienifr commented Mar 12, 2024

aimane-chnaif commented Mar 12, 2024

tienifr commented Mar 12, 2024

aimane-chnaif commented Mar 12, 2024 •

edited

Loading

aimane-chnaif commented Mar 12, 2024

tienifr commented Mar 13, 2024

aimane-chnaif commented Mar 13, 2024

tienifr commented Mar 13, 2024

melvin-bot bot commented Mar 18, 2024

roryabraham commented Mar 18, 2024

OSBotify commented Mar 18, 2024

OSBotify commented Mar 19, 2024

Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

Conversation

tienifr commented Feb 6, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 7, 2024

aimane-chnaif Feb 11, 2024

Choose a reason for hiding this comment

aimane-chnaif commented Feb 11, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

aimane-chnaif Feb 11, 2024

Choose a reason for hiding this comment

tienifr Feb 24, 2024

Choose a reason for hiding this comment

tienifr commented Feb 26, 2024

aimane-chnaif Feb 26, 2024

Choose a reason for hiding this comment

tienifr Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

tienifr commented Feb 29, 2024

aimane-chnaif commented Feb 29, 2024

tienifr commented Feb 29, 2024

aimane-chnaif commented Feb 29, 2024

tienifr commented Mar 1, 2024 • edited Loading

aimane-chnaif commented Mar 3, 2024

tienifr commented Mar 6, 2024

tienifr commented Mar 11, 2024

tienifr commented Mar 12, 2024

aimane-chnaif commented Mar 12, 2024

tienifr commented Mar 12, 2024

aimane-chnaif commented Mar 12, 2024 • edited Loading

aimane-chnaif commented Mar 12, 2024

tienifr commented Mar 13, 2024

aimane-chnaif commented Mar 13, 2024

tienifr commented Mar 13, 2024

melvin-bot bot commented Mar 18, 2024

roryabraham commented Mar 18, 2024

OSBotify commented Mar 18, 2024

OSBotify commented Mar 19, 2024

tienifr commented Feb 6, 2024 •

edited

Loading

aimane-chnaif commented Feb 11, 2024 •

edited

Loading

tienifr Feb 26, 2024 •

edited

Loading

tienifr commented Mar 1, 2024 •

edited

Loading

aimane-chnaif commented Mar 12, 2024 •

edited

Loading