ND changes for Hybrid App switch to fragments on Android by jnowakow · Pull Request #55010 · Expensify/App

jnowakow · 2025-01-09T14:22:01Z

Explanation of Change

This PR adjust app to new way ND is opened in hybrid app on Android. For more details check https://github.com/Expensify/Mobile-Expensify/pull/13349

Fixed Issues

$ #55520
PROPOSAL: N/A

MOBILE-EXPENSIFY:13349

Tests

Verify that no errors appear in the JS console

This PR requires big round of testing of whole app like transitions between app, navigation and all functionalities in ND.

Offline tests

App functionality should in offline mode should not change compared to current main.

QA Steps

Please download app for testing from this link. Unfortunately we can't use adhoc build for this one.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

N/A

MacOS: Desktop

N/A

melvin-bot · 2025-01-09T14:22:34Z

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

…sion-labs/expensify-app-fork into hybrid-app-android-fragment

staszekscp · 2025-01-20T10:36:07Z

src/libs/Navigation/setupCustomAndroidBackHandler/index.android.ts

-        const isLastScreenOnStack = bottomTabRoutes.length === 1 && rootState?.routes?.length === 1;
-
-        if (NativeModules.HybridAppModule && isLastScreenOnStack) {
-            NativeModules.HybridAppModule.exitApp();
-        }
-


Why has this code been deleted?

EDIT: I think I figured that out, but I'd like to make sure anyway 😄

When ND was on home screen and back button was clicked app crashed instead of going to background

# Conflicts: # src/types/modules/react-native.d.ts

mountiny · 2025-01-21T12:08:16Z

Noting QA will run on the combined PRs in the hybridApp Android build from SWM https://expensify.slack.com/archives/C9YU7BX5M/p1737455902896799

# Conflicts: # modules/background-task/android/src/main/java/com/expensify/reactnativebackgroundtask/ReactNativeBackgroundTaskModule.kt

github-actions · 2025-01-21T20:52:33Z

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

github-actions · 2025-01-21T22:24:07Z

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

mountiny · 2025-01-21T23:22:02Z

We got further with the builds 🎉

github-actions · 2025-01-22T13:55:54Z

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

github-actions · 2025-01-22T13:56:01Z

🧪🧪 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
Desktop 💻	Web 🕸️
N/A	N/A
N/A	N/A

👀 View the workflow run that generated this build 👀

# Conflicts: # src/libs/TripReservationUtils.ts # src/pages/Search/EmptySearchView.tsx # src/pages/Travel/ManageTrips.tsx

github-actions · 2025-01-29T14:27:05Z

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

github-actions · 2025-01-29T14:59:29Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55010/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
N/A	N/A
N/A	N/A

👀 View the workflow run that generated this build 👀

github-actions · 2025-01-29T15:48:26Z

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

github-actions · 2025-01-29T16:17:21Z

🧪🧪 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/55010/index.html
The QR code can't be generated, because the Android build failed
Desktop 💻	Web 🕸️
N/A	N/A
N/A	N/A

👀 View the workflow run that generated this build 👀

github-actions · 2025-01-30T10:45:46Z

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

github-actions · 2025-01-30T11:25:17Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55010/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/55010/index.html

Desktop 💻	Web 🕸️
N/A	N/A
N/A	N/A

👀 View the workflow run that generated this build 👀

mountiny · 2025-01-30T21:22:45Z

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny

LGTM and the QA has done full Android testing on this PR https://github.com/Expensify/Mobile-Expensify/pull/13349

Conflicts are present

jnowakow · 2025-01-31T10:22:38Z

Discarding in favour of #56145 to be sure that we don't reintroduce bad commit

jnowakow requested a review from a team as a code owner January 9, 2025 14:22

jnowakow marked this pull request as draft January 9, 2025 14:22

melvin-bot bot requested review from johnmlee101 and removed request for a team January 9, 2025 14:22

Prevent app from crash when putting app in background from ND

fc8cb33

jnowakow force-pushed the hybrid-app-android-fragment branch from 2781604 to fc8cb33 Compare January 9, 2025 14:30

war-in and others added 7 commits January 10, 2025 10:05

Merge branch 'main' into hybrid-app-android-fragment

7b7e501

Merge branch 'main' into hybrid-app-android-fragment

0748146

remove pendingIntent functionality & clean exitApp method

cef80e4

Merge branch 'hybrid-app-android-fragment' of github.com:software-man…

e4cea5c

…sion-labs/expensify-app-fork into hybrid-app-android-fragment

Do not duplicate isNavigationReady call

7f16473

Merge branch 'main' into hybrid-app-android-fragment

c202a77

Merge branch 'main' into hybrid-app-android-fragment

4ea095f

staszekscp reviewed Jan 20, 2025

View reviewed changes

war-in added 2 commits January 20, 2025 15:38

Merge branch 'main' into hybrid-app-android-fragment

bb171ee

# Conflicts: # src/types/modules/react-native.d.ts

fix crashes (util they're fixed on main)

e92ae29

jnowakow marked this pull request as ready for review January 21, 2025 10:40

mateuuszzzzz mentioned this pull request Jan 21, 2025

Hybrid Android - Device navigation bar is black and not green #55217

Closed

8 tasks

mountiny assigned jnowakow Jan 21, 2025

mountiny changed the title ~~ND changes for Hybrid App switch to fragments on Android~~ [HOLD Mobile-Expensify] ND changes for Hybrid App switch to fragments on Android Jan 21, 2025

jnowakow mentioned this pull request Jan 21, 2025

[No QA] Fix workflow warning about changed native files #55518

Closed

50 tasks

mountiny mentioned this pull request Jan 21, 2025

Re-enable the edge to edge mode on Android #55407

Closed

war-in added 2 commits January 21, 2025 15:11

Merge branch 'main' into hybrid-app-android-fragment

f9ecc5a

# Conflicts: # modules/background-task/android/src/main/java/com/expensify/reactnativebackgroundtask/ReactNativeBackgroundTaskModule.kt

fix status bar color when returning to OD

c739b5a

mountiny added the Ready To Build label Jan 21, 2025

This comment has been minimized.

Sign in to view

war-in added 5 commits January 22, 2025 14:57

Merge branch 'main' into hybrid-app-android-fragment

e361946

don't show bootsplash when app in background

4a19dcd

rename new prop

ced4cb3

Merge branch 'main' into hybrid-app-android-fragment

118761d

revert bootsplash changes

640a650

mateuuszzzzz approved these changes Jan 27, 2025

View reviewed changes

war-in added 6 commits January 27, 2025 13:29

Merge branch 'main' into hybrid-app-android-fragment

efbce53

fix status bar on travel page

447038a

fix lint

f2525bf

Merge branch 'main' into hybrid-app-android-fragment

44f8275

# Conflicts: # src/libs/TripReservationUtils.ts # src/pages/Search/EmptySearchView.tsx # src/pages/Travel/ManageTrips.tsx

update bookATrip function after merge

abdb000

Merge branch 'main' into hybrid-app-android-fragment

fdabcc9

mountiny self-requested a review January 29, 2025 14:26

Merge branch 'refs/heads/main' into hybrid-app-android-fragment

0df0295

Merge branch 'refs/heads/main' into hybrid-app-android-fragment

233446a

mountiny changed the title ~~[HOLD Mobile-Expensify] ND changes for Hybrid App switch to fragments on Android~~ ND changes for Hybrid App switch to fragments on Android Jan 30, 2025

mountiny approved these changes Jan 30, 2025

View reviewed changes

jnowakow closed this Jan 31, 2025

jnowakow mentioned this pull request Jan 31, 2025

Hybrid app android fragment v2 #56145

Merged

50 tasks

Conversation

jnowakow commented Jan 9, 2025 • edited by mountiny 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 Jan 9, 2025

Uh oh!

staszekscp Jan 20, 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!

jnowakow Jan 20, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jan 21, 2025

Uh oh!

github-actions bot commented Jan 21, 2025

Uh oh!

This comment has been minimized.

github-actions bot commented Jan 21, 2025

Uh oh!

mountiny commented Jan 21, 2025

Uh oh!

github-actions bot commented Jan 22, 2025

Uh oh!

github-actions bot commented Jan 22, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

mountiny commented Jan 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

jnowakow commented Jan 31, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jnowakow commented Jan 9, 2025 •

edited by mountiny

Loading

staszekscp Jan 20, 2025 •

edited

Loading

mountiny commented Jan 30, 2025 •

edited

Loading