[No QA] Simplify hybrid and standalone setup #60494

mateuuszzzzz · 2025-04-18T12:04:42Z

Explanation of Change

⚠️ PR has its Mobile-Expensify part and they need to be merged at the same time

This PR unblocks: #60270 and #60421

In the past, building the app from the command line or an IDE worked fine because react-native.config.js didn’t need to differentiate between the standalone app and HybridApp. However, now that we need to include hybrid-specific dependencies (such as Google’s Wallet SDK, which is available only on HybridApp), it's necessary to determine the build type during autolinking.json generation (i.e. wallet has to be excluded from autolinking on standalone). Using the IS_HYBRID_APP flag provides a clear and reliable way to make that distinction across all build environments, including Android Studio and gradlew command (which is not the case with the current configuration).

RNEF was also upgraded to a newer version to address configuration issues.

Fixed Issues

$ #36957
PROPOSAL:

MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/13536

Tests

All builds must pass in the following variants

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2025-04-18T12:04:58Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

mateuuszzzzz · 2025-04-18T14:00:28Z

I changed value of root in rnef.config.mjs for debugging purposes. Probably we're gonna remove this key. We also need to revert commit that introduces different submodule commit before merging.

package.json

adhorodyski · 2025-04-22T15:53:42Z

Backlinking to the other issue this is a part of: #58743

Looks like we're going to have to bring back the root setting 🤔 Should work for iOS as well bringing it back to life.

This is the config output before the Hybrid build kicked off.

Run JSON_OUTPUT=$(npx rnef config -p android)
{
  "android": {
    "sourceDir": "/home/runner/work/App/App/android",
    "appName": "app",
    "packageName": "com.expensify.chat",
    "applicationId": "com.expensify.chat",
    "mainActivity": ".MainActivity",
    "assets": []
  }
}

Should look like this, as per our latest successful internal run from today:

Run JSON_OUTPUT=$(npx rnef config -p android)
{
  "android": {
    "sourceDir": "/home/runner/work/Expensify-App/Expensify-App/Mobile-Expensify/Android",
    "appName": "",
    "packageName": "org.me.mobiexpensifyg",
    "applicationId": "org.me.mobiexpensifyg",
    "mainActivity": ".ExpensifyActivityBase",
    "assets": []
  }
}

rnef.config.mjs

Mobile-Expensify

.github/workflows/remote-build-ios.yml

adhorodyski · 2025-04-23T13:20:19Z

Android seem to be ok now, we currently work on why iOS stopped working (pod installation does not work yet).

parasharrajat · 2025-04-30T18:23:46Z

Build failed earlier. I am trying full clean now.

parasharrajat · 2025-05-01T23:17:23Z

After several tries, I was unable to build ios standalone app.

parasharrajat · 2025-05-02T13:02:08Z

@mateuuszzzzz

mateuuszzzzz · 2025-05-05T07:03:11Z

After several tries, I was unable to build ios standalone app.

Could you share logs?

adhorodyski · 2025-05-05T10:48:57Z

Either way, have you tried a git clean using git clean -fdx (in both root and the submodule) followed by npm run i-standalone in the root and npm run ios-standalone? This usually fixed it for me. No need for pod installation as this now happens automatically.

parasharrajat · 2025-05-05T10:49:50Z

@mateuuszzzzz

parasharrajat · 2025-05-05T11:00:13Z

Either way, have you tried a git clean using git clean -fdx (in both root and the submodule) followed by npm run i-standalone in the root and npm run ios-standalone? This usually fixed it for me. No need for pod installation as this now happens automatically

We should able to build both apps without the need to clean the repo.

adhorodyski · 2025-05-05T11:05:40Z

node_modules will always require a reinstall - Hybrid needs a different set of patches to be applied so it won't work without a clean up in between.

parasharrajat · 2025-05-05T11:09:08Z

So If I run npm run i-standalone, will it replace the modules or first I have to delete the Node_modules and then run it.

Here is my test flow.

npm i.
npm run ios
remove node_modules.
npm run i-standalone.
npm run ios-standalone.

I still see that error. If I need to clean the repo for each type of build, it is overkill.

adhorodyski · 2025-05-05T11:17:47Z

Alright the above set of steps should work, I'll test this myself locally now.
@parasharrajat I understand it's not the desired workflow - just to confirm though, can I ask you to run a full clean up followed by run ios-standalone (no Hybrid run) so we can cross that out? I want to understand where precisely the problem is.

parasharrajat · 2025-05-05T11:19:23Z

Yup doing it.

Clean repo.
Remove node modules.
run i-standalone.
run io-standalone

parasharrajat · 2025-05-05T11:30:02Z

same error.

adhorodyski · 2025-05-05T11:49:26Z

Just did a git reset --hard to @mateuuszzzzz's branch, followed by:

git clean -fdx
npm run i-standalone
npm run ios-standalone

adhorodyski · 2025-05-05T11:53:12Z

Can you try the above steps 1:1? Also, cleaning up Xcode's derived data before might do the trick for you. It's a part of the clean-standalone script but let's do these things the same way.

mateuuszzzzz · 2025-05-05T14:10:06Z

Yup doing it.

Clean repo.

Remove node modules.

run i-standalone.

run io-standalone

Also, could you provide the exact reproduction steps? I assume that by a clean repo, you mean running npm run clean-standalone, right?

parasharrajat · 2025-05-05T14:13:33Z

It got build this way.

parasharrajat · 2025-05-05T14:16:06Z

All builds must pass in the following variants

Android standalone

npm run android-standalone	Android Studio build	gradlew build (e.g. installDebugDevelopment)

iOS standalone

npm run ios-standalone	Xcode build

Android HybridApp

npm run android	Android Studio build	gradlew build (e.g. installDebug)

iOS HybridApp

npm run ios	Xcode build

web

Desktop

parasharrajat

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.

🎀 👀 🎀 C+ reviewed

adhorodyski · 2025-05-05T14:19:21Z

cc @roryabraham off to you!

OSBotify · 2025-05-05T16:31:43Z

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

mateuuszzzzz · 2025-05-05T16:48:41Z

@roryabraham can we merge Mobile-Expensify PR as well? https://github.com/Expensify/Mobile-Expensify/pull/13536 HybridApp builds will fail without this one

github-actions · 2025-05-06T01:26:14Z

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

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

github-actions · 2025-05-07T00:06:58Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.40-7 🚀

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

mateuuszzzzz added 2 commits April 18, 2025 10:25

Introduce IS_HYBRID env

86e8424

Simplify envs passing during builds

fa6158a

mateuuszzzzz added 6 commits April 18, 2025 14:05

Remove redundant lines

cfc35b7

Remove verbose flag

3d0fb71

Update Podfile.lock

374a2ca

Update submodule PR

5b7d1f5

Bump rnef

db1824c

Upgrade cli-config-android

1bf040d

mateuuszzzzz added 4 commits April 18, 2025 16:02

Fix conflict

7a90b4c

Update paths in rnef and react-native configs

fc3e9b2

Change submodule commit

9b07905

Merge branch 'main' into simplify-hybrid-and-standalone-setup

83f7be3

adhorodyski reviewed Apr 22, 2025

View reviewed changes

package.json Outdated Show resolved Hide resolved

Update rnef package

0300fc7

adhorodyski reviewed Apr 22, 2025

View reviewed changes

rnef.config.mjs Show resolved Hide resolved

adhorodyski reviewed Apr 22, 2025

View reviewed changes

rnef.config.mjs Show resolved Hide resolved

adhorodyski reviewed Apr 22, 2025

View reviewed changes

rnef.config.mjs Show resolved Hide resolved

mateuuszzzzz added 4 commits April 23, 2025 11:09

Bring back root parameter

83cd0c5

Fix paths

23bb38b

Change submodule commit

578b55e

Add trailing slash

53eeb88

mountiny reviewed Apr 23, 2025

View reviewed changes

Mobile-Expensify Outdated Show resolved Hide resolved

adhorodyski reviewed Apr 23, 2025

View reviewed changes

.github/workflows/remote-build-ios.yml Show resolved Hide resolved

mateuuszzzzz added 2 commits April 23, 2025 13:15

Pick correct build

ec080cf

Pick correct build in run-build.sh

2251b77

Merge branch 'main' into simplify-hybrid-and-standalone-setup

1bfd237

mountiny requested a review from parasharrajat April 30, 2025 10:10

mountiny mentioned this pull request Apr 30, 2025

[$1000] Create new library and native module react-native-wallet #36957

Open

parasharrajat approved these changes May 5, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny May 5, 2025 14:18

roryabraham approved these changes May 5, 2025

View reviewed changes

roryabraham merged commit dba59ca into Expensify:main May 5, 2025
26 checks passed

github-actions bot mentioned this pull request May 6, 2025

Deploy Checklist: New Expensify 2025-05-06 #61424

Closed

77 tasks

war-in mentioned this pull request May 6, 2025

Revert "[No QA] Simplify hybrid and standalone setup" #61514

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA] Simplify hybrid and standalone setup #60494

[No QA] Simplify hybrid and standalone setup #60494

mateuuszzzzz commented Apr 18, 2025 •

edited

Loading

github-actions bot commented Apr 18, 2025

mateuuszzzzz commented Apr 18, 2025 •

edited

Loading

adhorodyski commented Apr 22, 2025 •

edited

Loading

adhorodyski commented Apr 23, 2025

parasharrajat commented Apr 30, 2025

parasharrajat commented May 1, 2025

parasharrajat commented May 2, 2025

mateuuszzzzz commented May 5, 2025

adhorodyski commented May 5, 2025 •

edited

Loading

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

adhorodyski commented May 5, 2025

parasharrajat commented May 5, 2025 •

edited

Loading

adhorodyski commented May 5, 2025

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

adhorodyski commented May 5, 2025

adhorodyski commented May 5, 2025

mateuuszzzzz commented May 5, 2025 •

edited

Loading

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

parasharrajat left a comment

adhorodyski commented May 5, 2025

OSBotify commented May 5, 2025

mateuuszzzzz commented May 5, 2025

github-actions bot commented May 6, 2025

github-actions bot commented May 7, 2025

[No QA] Simplify hybrid and standalone setup #60494

[No QA] Simplify hybrid and standalone setup #60494

Conversation

mateuuszzzzz commented Apr 18, 2025 • edited Loading

Explanation of Change

⚠️ PR has its Mobile-Expensify part and they need to be merged at the same time

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Apr 18, 2025

mateuuszzzzz commented Apr 18, 2025 • edited Loading

adhorodyski commented Apr 22, 2025 • edited Loading

adhorodyski commented Apr 23, 2025

parasharrajat commented Apr 30, 2025

parasharrajat commented May 1, 2025

parasharrajat commented May 2, 2025

mateuuszzzzz commented May 5, 2025

adhorodyski commented May 5, 2025 • edited Loading

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

adhorodyski commented May 5, 2025

parasharrajat commented May 5, 2025 • edited Loading

adhorodyski commented May 5, 2025

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

adhorodyski commented May 5, 2025

adhorodyski commented May 5, 2025

mateuuszzzzz commented May 5, 2025 • edited Loading

parasharrajat commented May 5, 2025

parasharrajat commented May 5, 2025

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

adhorodyski commented May 5, 2025

OSBotify commented May 5, 2025

mateuuszzzzz commented May 5, 2025

github-actions bot commented May 6, 2025

github-actions bot commented May 7, 2025

mateuuszzzzz commented Apr 18, 2025 •

edited

Loading

mateuuszzzzz commented Apr 18, 2025 •

edited

Loading

adhorodyski commented Apr 22, 2025 •

edited

Loading

adhorodyski commented May 5, 2025 •

edited

Loading

parasharrajat commented May 5, 2025 •

edited

Loading

mateuuszzzzz commented May 5, 2025 •

edited

Loading