Align HybridApp environment toggles by 289Adam289 · Pull Request #59663 · Expensify/App

289Adam289 · 2025-04-04T14:02:34Z

Explanation of Change

This aligns OD and ND environment toggles.

Information about toggle in OD is transferred through HybridAppSettings and used to set value in Onyx
When switching toggle in ND new function from HybridApp module is invoked configuring information in YAPL

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

Fixed Issues

$ #58992
PROPOSAL:

Tests

Change ND or OD environment toggle
Verify that second toggle also changes state.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-04-04.at.17.39.14.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2025-04-04T14:02:46Z

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

github-actions · 2025-04-04T15:20:41Z

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

github-actions · 2025-04-04T16:18:06Z

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

Julesssss

Looking good to me

github-actions · 2025-04-04T16:59:25Z

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

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

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

👀 View the workflow run that generated this build 👀

melvin-bot · 2025-04-07T12:00:54Z

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

ZhenjaHorbach · 2025-04-07T12:18:26Z

@289Adam289
Do you need help with review ?

And I suppose we need update a link here

289Adam289 · 2025-04-07T12:55:46Z

@ZhenjaHorbach It would be nice to check that the functionality works and that nothing on the ND side broke regarding the Use Staging Server switch

ZhenjaHorbach · 2025-04-07T12:57:14Z

@ZhenjaHorbach It would be nice to check that the functionality works and that nothing on the ND side broke regarding the Use Staging Server switch

Got it !

ZhenjaHorbach · 2025-04-07T12:57:19Z

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

Screenrecorder-2025-04-07-23-21-20-246.mp4

Android: mWeb Chrome

NA

iOS: Native

2025-04-07.23.23.41.mp4

iOS: mWeb Safari

NA

MacOS: Chrome / Safari

NA

MacOS: Desktop

NA

ZhenjaHorbach · 2025-04-07T15:22:13Z

As far as I understand adhoc builds without new OD changes
In that case I'll check locally !

ZhenjaHorbach · 2025-04-07T21:31:52Z

Changes works good !

The only thing I was thinking —
maybe we should implement the same toggle visibility condition as on ND?
Because right now, only users on expensify.com and expensifail.com can see this toggle
Maybe we should show it for dev env also ?

But this is a minor issue !
LGTM anyway !

Julesssss · 2025-04-07T21:39:57Z

As far as I understand adhoc builds without new OD changes

AdHoc should include mobile changes as we look for MOBILE-EXPENSIFY in the PR description.

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

ZhenjaHorbach · 2025-04-07T21:41:10Z

As far as I understand adhoc builds without new OD changes

AdHoc should include mobile changes as we look for MOBILE-EXPENSIFY in the PR description.

MOBILE-EXPENSIFY: Expensify/Mobile-Expensify#13521

Yes
Everything works
Sorry
I just didn't know that we need to use email with expensify domain 😅

Julesssss · 2025-04-07T21:41:11Z

Because right now, only users on expensify.com and expensifail.com can see this toggle. Maybe we should show it for dev env also ?

Do I understand correctly that you're not able to use the toggle in that case?

ZhenjaHorbach · 2025-04-07T21:47:29Z

Because right now, only users on expensify.com and expensifail.com can see this toggle. Maybe we should show it for dev env also ?

Do I understand correctly that you're not able to use the toggle in that case?

Do you mean with the current logic?

Julesssss · 2025-04-07T21:49:20Z

Yeah, with the current logic

ZhenjaHorbach · 2025-04-07T21:56:52Z

Yeah, with the current logic

Yes, I was unable to test it using my non-Expensify accounts 😅

But fortunately, following this condition:

https://github.com/ZhenjaHorbach/Mobile-Expensify/blob/main/app/expensify.js#L4809

I created an account without validation using a similar domain that ends with the correct domain

Julesssss · 2025-04-07T22:12:43Z

Ah great, that makes sense. Okay so we're just waiting for a failing test build on the Mobile-Expensify side to be fixed.

OSBotify · 2025-04-08T15:47:59Z

✋ 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-04-09T04:40:49Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.25-0 🚀

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

github-actions · 2025-04-10T00:56:37Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.25-4 🚀

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

289Adam289 added 3 commits April 4, 2025 10:50

Add Hybrid -> ND alignment

f69ac72

Add ND -> Android Hybrid alignment

ec434c7

Add ND -> iOS Hybrid alignment

694e0d4

change function name

cef72b0

Julesssss self-requested a review April 4, 2025 16:17

Julesssss reviewed Apr 4, 2025

View reviewed changes

mateuuszzzzz approved these changes Apr 7, 2025

View reviewed changes

289Adam289 marked this pull request as ready for review April 7, 2025 12:00

289Adam289 requested a review from a team as a code owner April 7, 2025 12:00

melvin-bot Bot requested review from ZhenjaHorbach and removed request for a team April 7, 2025 12:00

ZhenjaHorbach approved these changes Apr 7, 2025

View reviewed changes

melvin-bot Bot requested a review from Julesssss April 7, 2025 21:32

Julesssss approved these changes Apr 7, 2025

View reviewed changes

Julesssss approved these changes Apr 8, 2025

View reviewed changes

Julesssss merged commit 4793304 into Expensify:main Apr 8, 2025

github-actions Bot mentioned this pull request Apr 9, 2025

Deploy Checklist: New Expensify 2025-04-09 #59866

Closed

66 tasks

melvin-bot Bot mentioned this pull request Apr 10, 2025

[Due for payment 2025-04-17][$250] Align HybridApp environment toggles #58992

Closed

Uh oh!

Conversation

289Adam289 commented Apr 4, 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!

github-actions Bot commented Apr 4, 2025

Uh oh!

github-actions Bot commented Apr 4, 2025

Uh oh!

github-actions Bot commented Apr 4, 2025

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 4, 2025

Uh oh!

melvin-bot Bot commented Apr 7, 2025

Uh oh!

ZhenjaHorbach commented Apr 7, 2025

Uh oh!

289Adam289 commented Apr 7, 2025

Uh oh!

ZhenjaHorbach commented Apr 7, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

Julesssss commented Apr 7, 2025

Uh oh!

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

Uh oh!

Uh oh!

Julesssss commented Apr 7, 2025

Uh oh!

ZhenjaHorbach commented Apr 7, 2025

Uh oh!

Julesssss commented Apr 7, 2025

Uh oh!

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

Uh oh!

Uh oh!

Julesssss commented Apr 7, 2025

Uh oh!

OSBotify commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

github-actions Bot commented Apr 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

289Adam289 commented Apr 4, 2025 •

edited

Loading

ZhenjaHorbach commented Apr 7, 2025 •

edited

Loading

ZhenjaHorbach commented Apr 7, 2025 •

edited

Loading

ZhenjaHorbach commented Apr 7, 2025 •

edited

Loading

ZhenjaHorbach commented Apr 7, 2025 •

edited

Loading

ZhenjaHorbach commented Apr 7, 2025 •

edited

Loading