Remove reportID param from dismissModal function by WojtekBoman · Pull Request #58191 · Expensify/App

WojtekBoman · 2025-03-11T08:57:03Z

Explanation of Change

This PR removes a reportID param from the dismissModal function. Now dismissModalWithReport is responsible for closing the modal and navigating to a specific report. With this change, the responsibilities of both functions are well defined.

Changes introduced by this PR:

now dismissModal is used only to close the modal without any additional actions.
now when we want to close the modal and open the report we need to use the dismissModalWithReport function which accepts an options object as a parameter. We can pass either the report or the reportID field to this function (you can't pass both).
Previously, when we closed a modal window on a small screen, we performed two actions:
1. pop the modal from the navigation state
2. push a new screen to the split navigator below the removed modal navigator.
It works the same way on the wide layout, but on the narrow layout in this case only one action is performed: the modal navigator is replaced by a new split navigator. With this change only one animation is visible on the screen. It's possible after changes introduced by this PR, the split navigator on a narrow layout doesn't need to have a sidebar screen.

Fixed Issues

$ #56799
$ #56871
PROPOSAL:

Tests

Chat - User lands on inbox before being redirected to new created chat or group.

Open the Expensify app
Tap on FAB and select "Create Chat"
Add some members to a group chat
Finish the creation flow
Verify that only one transition has been performed on screen

Workspace-Overview page is shown briefly before landing on members page when inviting a user

Login with any account
Create a new workspace
Go to workspace settings > Overview>Click Invite
Choose any account > Invite
Verify that only one transition has been performed on screen
Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-03-11.at.09.58.55.mov

Screen.Recording.2025-03-11.at.08.30.07.mov

Android: mWeb Chrome

Screen.Recording.2025-03-11.at.10.01.53.mov

Screen.Recording.2025-03-11.at.10.00.52.mov

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-03-12.at.07.24.41.mov

MacOS: Desktop

Screen.Recording.2025-03-12.at.07.30.29.mov

melvin-bot · 2025-03-12T10:17:27Z

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

dubielzyk-expensify · 2025-03-13T01:02:25Z

Does this need a design review or this mostly technical?

WojtekBoman · 2025-03-13T07:31:28Z

Does this need a design review or this mostly technical?

It's mostly technical, it fixes two issues mentioned in the PR description related to transition between screens

mountiny · 2025-03-17T19:47:37Z

@alitoshmatov What is holding you back, can you please review the PR?

alitoshmatov · 2025-03-18T06:19:37Z

@mountiny Sorry for missing this. Could we reassign it? I was only operating at half capacity this week.

cc: @WojtekBoman

ZhenjaHorbach · 2025-03-18T11:01: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 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: 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.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: Native

Android: mWeb Chrome

android-web-1.mov

android-web-2.mov

iOS: Native

ios-1.mov

ios-2.mov

iOS: mWeb Safari

ios-web-1.mov

ios-web-2.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

web.mov

ZhenjaHorbach · 2025-03-18T11:07:29Z

src/libs/actions/IOU.ts

+    if (isSearchTopmostFullScreenRoute() || !activeReportID) {
+        Navigation.dismissModal();
+    } else {
+        Navigation.dismissModalWithReport({reportID: activeReportID});


Minor comment

This condition is used very often
Maybe we should make a separate function for this ?

src/libs/Navigation/Navigation.ts

ZhenjaHorbach · 2025-03-18T11:40:24Z

Android works good ✅
Android-web works good ✅
Ios-web works good ✅
ios works good ✅

ZhenjaHorbach · 2025-03-18T12:19:28Z

@WojtekBoman
Could you update a branch to the latest version of main ?

ZhenjaHorbach · 2025-03-18T13:12:03Z

Strange This doesn't work for me on android ❌

2025-03-18.12.39.31.mov
Android-web works good ✅ Ios-web works good ✅ ios works good ✅

@mountiny
Could you please help with adhoc builds to test android ?
Maybe the problem is in my dev build

github-actions · 2025-03-18T13:43:32Z

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

ZhenjaHorbach · 2025-03-18T14:32:45Z

Builds are failed

@WojtekBoman
Plus we have conflicts

mountiny · 2025-03-18T20:49:48Z

Lets sync with main and I will retry the builds then

github-actions · 2025-03-19T15:00:17Z

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

WojtekBoman · 2025-03-19T15:11:53Z

Conflicts solved :)

@ZhenjaHorbach I excluded a separate function according to this comment.

About android, I checked it and it seems to work fine

Screen.Recording.2025-03-19.at.15.52.06.mov

ZhenjaHorbach · 2025-03-19T15:21:20Z

Conflicts solved :)

@ZhenjaHorbach I excluded a separate function according to this comment.

About android, I checked it and it seems to work fine

Screen.Recording.2025-03-19.at.15.52.06.mov

Nice
Thanks !
And maybe the problem is with my dev builds 😅

github-actions · 2025-03-19T15:37:17Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed
Android Hybrid 🤖🔄	iOS Hybrid 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/58191-hybrid/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/58191-hybrid/index.html

Desktop 💻	Web 🕸️
❌ FAILED ❌	https://58191.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed

👀 View the workflow run that generated this build 👀

ZhenjaHorbach · 2025-03-19T16:18:56Z

Yeah
Android also works good !

contributingGuides/NAVIGATION.md

ZhenjaHorbach · 2025-03-19T16:40:03Z

LGTM !

mountiny

LGTM, couple questions only

src/libs/actions/IOU.ts

src/styles/utils/index.ts

… memebers page when inviting a user

…reportID

WojtekBoman · 2025-03-20T11:20:27Z

@mountiny I replied to all comments and resolved conflicts, it's ready to merge :)

OSBotify · 2025-03-20T14:32:17Z

✋ 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 · 2025-03-20T15:36:51Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.16-0 🚀

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

github-actions · 2025-03-21T22:20:53Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.16-4 🚀

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

WojtekBoman force-pushed the nav/adjust-dismiss-modal branch from 7fc4118 to ace1346 Compare March 11, 2025 09:18

WojtekBoman marked this pull request as ready for review March 12, 2025 10:17

WojtekBoman requested review from a team as code owners March 12, 2025 10:17

melvin-bot bot requested a review from alitoshmatov March 12, 2025 10:17

melvin-bot bot removed the request for review from a team March 12, 2025 10:17

mountiny assigned WojtekBoman Mar 17, 2025

mountiny requested review from ZhenjaHorbach and removed request for alitoshmatov March 18, 2025 10:43

ZhenjaHorbach reviewed Mar 18, 2025

View reviewed changes

src/libs/Navigation/Navigation.ts Show resolved Hide resolved

mountiny added the Ready To Build label Mar 18, 2025

WojtekBoman force-pushed the nav/adjust-dismiss-modal branch from cf93159 to d0bd658 Compare March 19, 2025 14:57

ZhenjaHorbach reviewed Mar 19, 2025

View reviewed changes

contributingGuides/NAVIGATION.md Show resolved Hide resolved

ZhenjaHorbach approved these changes Mar 19, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny March 19, 2025 16:40

mountiny previously approved these changes Mar 19, 2025

View reviewed changes

src/libs/actions/IOU.ts Show resolved Hide resolved

src/styles/utils/index.ts Outdated Show resolved Hide resolved

WojtekBoman added 7 commits March 20, 2025 10:42

Remove reportID param from dismissModal function

047ece7

Fix issue: Workspace-Overview page is shown briefly before landing on…

ce036e6

… memebers page when inviting a user

Adjust NavigateToReportWithPolicyCheckPayload type to pass report or …

7d284d4

…reportID

Make report and reportID params of dismissModal function mandatory

1a3a518

Fix imports and default id values

c643929

Fix default policyID values in WorkspaceOverviewSharePage

78c2ade

Add dismissModalAndOpenReportInInboxTab

d1e930a

WojtekBoman dismissed mountiny’s stale review via d1e930a March 20, 2025 09:51

WojtekBoman force-pushed the nav/adjust-dismiss-modal branch from d0bd658 to d1e930a Compare March 20, 2025 09:51

WojtekBoman added 2 commits March 20, 2025 10:56

Add private annotation to dismissModalAndOpenReportInInboxTab

4609856

Set text param of getDefaultWorkspaceAvatarColor function to required

6a631c8

WojtekBoman mentioned this pull request Mar 20, 2025

Navigation - Repeating navigation after submitting expense and returning via device gesture #57497

Closed

8 tasks

mountiny approved these changes Mar 20, 2025

View reviewed changes

mountiny merged commit 6e2edad into Expensify:main Mar 20, 2025
17 checks passed

github-actions bot mentioned this pull request Mar 20, 2025

Deploy Checklist: New Expensify 2025-03-20 #58801

Closed

72 tasks

aldo-expensify mentioned this pull request Mar 20, 2025

fix: use dismissModal action instead #58786

Merged

50 tasks

WojtekBoman mentioned this pull request Mar 21, 2025

[CP Staging] fix: chat jumps to top briefly each time the expense is created #58904

Merged

50 tasks

ZhenjaHorbach mentioned this pull request Mar 31, 2025

[Due for payment 2025-03-31] Receipt - Unable to replace receipt and page stucks #58814

Closed

8 tasks

Conversation

WojtekBoman commented Mar 11, 2025 • 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 Mar 12, 2025

Uh oh!

dubielzyk-expensify commented Mar 13, 2025

Uh oh!

WojtekBoman commented Mar 13, 2025

Uh oh!

mountiny commented Mar 17, 2025

Uh oh!

alitoshmatov commented Mar 18, 2025

Uh oh!

ZhenjaHorbach commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ZhenjaHorbach commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Mar 18, 2025

Uh oh!

ZhenjaHorbach commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 18, 2025

Uh oh!

ZhenjaHorbach commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mountiny commented Mar 18, 2025

Uh oh!

github-actions bot commented Mar 19, 2025

Uh oh!

WojtekBoman commented Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 19, 2025

Uh oh!

ZhenjaHorbach commented Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ZhenjaHorbach commented Mar 19, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

WojtekBoman commented Mar 20, 2025

Uh oh!

Uh oh!

OSBotify commented Mar 20, 2025

Uh oh!

github-actions bot commented Mar 20, 2025

Uh oh!

github-actions bot commented Mar 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

WojtekBoman commented Mar 11, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 18, 2025 •

edited

Loading

ZhenjaHorbach Mar 18, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 18, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 18, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 18, 2025 •

edited

Loading

WojtekBoman commented Mar 19, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 19, 2025 •

edited

Loading

ZhenjaHorbach commented Mar 19, 2025 •

edited

Loading