resolve conflict

Author: paulnjs

.github/ISSUE_TEMPLATE/OnboardOffboardExpertContributor.md

@@ -34,4 +34,5 @@ Which action do you wish to take for this team member (select one):
 
 ### Ring0 Tasks
 
-- [ ] Add to / remove from the appropriate GitHub child team of [external-expert-contributors](https://github.com/orgs/Expensify/teams/external-expert-contributors/teams) (each agency must have its own child team)
+- [ ] If adding, add to the appropriate GitHub child team of [external-expert-contributors](https://github.com/orgs/Expensify/teams/external-expert-contributors/teams) (each agency must have its own child team)
+- [ ] If removing, remove from our organization [here](https://github.com/orgs/Expensify/people)

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009021614
-        versionName "9.2.16-14"
+        versionCode 1009021702
+        versionName "9.2.17-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

README.md

@@ -11,7 +11,7 @@ The UI binds to the data stored on the local device's database (Onyx).
 ## Rules
 ### - The UI MUST use `useOnyx` to get data and subscribe to changes of that data in Onyx
 ### - The UI MUST NOT call any Onyx methods directly
-### - The UI MUST trigger an an action when something needs to happen
+### - The UI MUST trigger an action when something needs to happen
 For example, a person inputs data, the UI calls an action and passes the user's input.
 
 ### - The UI SHOULD anticipate missing or incomplete data

android/app/build.gradle

@@ -14,3 +14,8 @@ This is how data flows through the app:
 6. Go to 1
 
 ![New Expensify Data Flow Chart](/contributingGuides/philosophies/data_flow.png)
+
+## Rules
+
+### - API commands SHOULD return created/updated data directly
+When adding new API commands, always prefer to return the created/updated data in the command itself, instead of saving and reloading. For example: if we call `CreateTransaction`, we SHOULD prefer making `CreateTransaction` return the data it just created instead of calling `CreateTransaction` then `Get` rvl=transactionList.

contributingGuides/philosophies/DATA-BINDING.md

@@ -0,0 +1,122 @@
+# HybridApp Philosophy
+This describes how the HybridApp architecture works and the conventions that MUST be followed when working with it.
+
+#### Terminology
+- **HybridApp** - The production app containing both "Expensify Classic" and "New Expensify"
+- **NewDot** - The new Expensify application (this repository)
+- **Mobile-Expensify** - Git submodule containing Expensify Classic code
+- **Standalone** - NewDot running independently without Classic integration
+
+## Overview
+
+Currently, the production Expensify app contains both "Expensify Classic" and "New Expensify". The file structure is as follows:
+
+- 📂 [**App**](https://github.com/Expensify/App)
+    - 📂 [**android**](https://github.com/Expensify/App/tree/main/android): New Expensify Android specific code (not a part of HybridApp native code)
+    - 📂 [**ios**](https://github.com/Expensify/App/tree/main/ios): New Expensify iOS specific code (not a part of HybridApp native code)
+    - 📂 [**src**](https://github.com/Expensify/App/tree/main/src): New Expensify TypeScript logic
+    - 📂 [**Mobile-Expensify**](https://github.com/Expensify/Mobile-Expensify): `git` submodule that is pointed to [Mobile-Expensify](https://github.com/Expensify/Mobile-Expensify)
+        - 📂 [**Android**](https://github.com/Expensify/Mobile-Expensify/tree/main/Android): Expensify Classic Android specific code
+        - 📂 [**iOS**](https://github.com/Expensify/Mobile-Expensify/tree/main/iOS): Expensify Classic iOS specific code
+        - 📂 [**app**](https://github.com/Expensify/Mobile-Expensify/tree/main/app): Expensify Classic JavaScript logic (aka YAPL)
+
+You can only build HybridApp if you have been granted access to [`Mobile-Expensify`](https://github.com/Expensify/Mobile-Expensify). For most contributors, you will be working on the standalone NewDot application.
+
+## Rules
+
+### - Access to Mobile-Expensify repository is REQUIRED to build HybridApp
+For most contributors, you SHOULD work on the standalone NewDot application instead.
+
+### - Git submodule MUST be properly initialized and configured
+When working with HybridApp:
+
+1. Initialize the submodule: `git submodule init`
+2. Update the submodule: `git submodule update`
+3. Configure automatic updates: `git config --global submodule.recurse true`
+
+### - HybridApp native code MUST be accessed through Mobile-Expensify directories
+The native code for HybridApp is located in:
+- `./Mobile-Expensify/Android` (not `./android`)
+- `./Mobile-Expensify/iOS` (not `./ios`)
+
+Changes to `./android` and `./ios` folders at the root **will NOT affect HybridApp builds**.
+
+### - IDEs MUST open the correct workspace for HybridApp development
+To open HybridApp projects:
+- **Android Studio**: `./Mobile-Expensify/Android`
+- **Xcode**: `./Mobile-Expensify/iOS/Expensify.xcworkspace`
+
+### - Scripts automatically target HybridApp when Mobile-Expensify is present
+Default npm scripts target HybridApp when the submodule exists:
+
+| Command               | Description                        |
+| --------------------- | ---------------------------------- |
+| `npm run android`     | Build **HybridApp** for Android    |
+| `npm run ios`         | Build **HybridApp** for iOS        |
+| `npm run ipad`        | Build **HybridApp** for iPad       |
+| `npm run ipad-sm`     | Build **HybridApp** for small iPad |
+| `npm run pod-install` | Install pods for **HybridApp**     |
+| `npm run clean`       | Clean native code of **HybridApp** |
+
+### - Standalone scripts MUST be used when targeting NewDot only
+Append `-standalone` to target standalone NewDot:
+
+| Command                          | Description                                                 |
+| -------------------------------- | ----------------------------------------------------------- |
+| `npm run install-standalone`     | Install standalone **NewDot** node modules (`npm install`) |
+| `npm run clean-standalone`       | Clean native code for standalone **NewDot**                |
+| `npm run android-standalone`     | Build **NewDot** for Android in standalone mode            |
+| `npm run ios-standalone`         | Build **NewDot** for iOS in standalone mode                |
+| `npm run pod-install-standalone` | Install pods for standalone **NewDot**                     |
+| `npm run ipad-standalone`        | Build **NewDot** for iPad in standalone mode               |
+| `npm run ipad-sm-standalone`     | Build **NewDot** for small iPad in standalone mode         |
+
+## Setup Instructions
+
+### Initial Setup
+1. Follow [NewDot setup instructions](https://github.com/Expensify/App?tab=readme-ov-file#getting-started) first
+2. Initialize submodule: `git submodule init`
+3. Update submodule: `git submodule update`
+   - For faster setup: `git submodule update --init --progress --depth 100`
+4. Configure Git for automatic submodule updates: `git config --global submodule.recurse true`
+
+### Git Configuration
+If you have access to `Mobile-Expensify` and commands fail, add to `~/.gitconfig`:
+
+```
+[url "https://github.com/"]
+    insteadOf = ssh://git@github.com/
+```
+
+To prevent submodule changes from appearing in `git status`, add to `.git/config`:
+
+```
+[submodule "Mobile-Expensify"]
+    ignore = all
+```
+
+### External Contributors and C+ Contributors
+If you need to modify `Mobile-Expensify` source code:
+
+1. Create your own fork of Mobile-Expensify
+2. Swap the origin: `cd Mobile-Expensify && git remote set-url origin <YOUR_FORK_URL>`
+
+## Submodule Management
+
+### - Submodule updates SHOULD be done carefully
+The `Mobile-Expensify` directory points to a specific commit. To update:
+
+- Download latest changes: `git submodule update --remote`
+- Manual update: Switch branches and pull within the `Mobile-Expensify` directory
+
+### - Submodule state MUST be considered when switching branches
+When switching branches, run `git submodule update` to ensure compatibility.
+
+## HybridApp-Specific Features
+
+### Patches
+- Patches are applied automatically during `npm install`
+- Add HybridApp-specific patches: `npx patch-package <PACKAGE_NAME> --patch-dir Mobile-Expensify/patches`
+
+### Additional Resources
+For extended documentation, troubleshooting, and pro tips, refer to [HYBRID_APP.md](contributingGuides/HYBRID_APP.md).

contributingGuides/philosophies/DATA-FLOW.md

@@ -8,8 +8,10 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
 * [Cross-Platform Philosophy](/contributingGuides/philosophies/CROSS-PLATFORM.md)
 * [Data Flow Philosophy](/contributingGuides/philosophies/DATA-FLOW.md)
 * [Data Binding Philosophy](/contributingGuides/philosophies/DATA-BINDING.md)
-* [Onyx Data Management Philosophy](/contributingGuides/philosophies/ONYX-DATA-MANAGEMENT.md)
 * [Directory Structure and File Naming Philosophy](/contributingGuides/philosophies/DIRECTORIES.md)
+* [Internationalization Philosophy](/contributingGuides/philosophies/INTERNATIONALIZATION.md)
+* [HybridApp Philosophy](/contributingGuides/philosophies/HYBRID-APP.md)
 * [Offline Philosophy](/contributingGuides/philosophies/OFFLINE.md)
+* [Onyx Data Management Philosophy](/contributingGuides/philosophies/ONYX-DATA-MANAGEMENT.md)
 * [Routing Philosophy](/contributingGuides/philosophies/ROUTING.md)
 * [Security Philosophy](/contributingGuides/philosophies/SECURITY.md)

contributingGuides/philosophies/HYBRID-APP.md

@@ -0,0 +1,81 @@
+# Internationalization Philosophy
+This application is built with Internationalization (I18n) / Localization (L10n) support to provide a consistent experience across different languages and regions.
+
+#### Related Philosophies
+- [Data Binding Philosophy](/contributingGuides/philosophies/DATA-BINDING.md)
+
+#### Terminology
+- **I18n** - Internationalization, the process of designing software to support multiple languages
+- **L10n** - Localization, the process of adapting software for specific languages and regions
+- **Translation Keys** - Unique identifiers for translatable strings
+- **Locale** - A specific language and region combination (e.g., en-US, es-ES)
+
+## Rules
+
+### - All user-facing content MUST be localized
+The following types of data MUST always be localized when presented to the user (including accessibility texts that are not rendered):
+
+- **Texts**: Use the [translate method](https://github.com/Expensify/App/blob/655ba416d552d5c88e57977a6e0165fb7eb7ab58/src/libs/translate.js#L15)
+- **Date/time**: Use [DateUtils](https://github.com/Expensify/App/blob/f579946fbfbdc62acc5bd281dc75cabb803d9af0/src/libs/DateUtils.js)
+- **Numbers and amounts**: Use [NumberFormatUtils](https://github.com/Expensify/App/blob/55b2372d1344e3b61854139806a53f8a3d7c2b8b/src/libs/NumberFormatUtils.js) and [LocaleDigitUtils](https://github.com/Expensify/App/blob/55b2372d1344e3b61854139806a53f8a3d7c2b8b/src/libs/LocaleDigitUtils.js)
+- **Phone numbers**: Use [LocalPhoneNumber](https://github.com/Expensify/App/blob/bdfbafe18ee2d60f766c697744f23fad64b62cad/src/libs/LocalePhoneNumber.js#L51-L52)
+
+### - Components MUST use the `useLocalize` hook for translations
+In most cases, you will need to localize data used in a component. Use the [useLocalize](https://github.com/Expensify/App/blob/4510fc76bbf5df699a2575bfb49a276af90f3ed7/src/hooks/useLocalize.ts) hook, which abstracts most of the logic you need (primarily subscribing to the [NVP_PREFERRED_LOCALE](https://github.com/Expensify/App/blob/6cf1a56df670a11bf61aa67eeb64c1f87161dea1/src/ONYXKEYS.js#L88) Onyx key).
+
+### - Translations MUST be organized by feature and stored in language files
+All translations are stored in language files in [src/languages](https://github.com/Expensify/App/tree/b114bc86ff38e3feca764e75b3f5bf4f60fcd6fe/src/languages). Translations SHOULD be grouped by their pages/components for better organization.
+
+### - Common phrases SHOULD be shared when used in multiple places
+A common rule of thumb is to move a common word/phrase to be shared when it's used in 3 or more places.
+
+### - Complex translation strings MUST use arrow function format
+Always prefer longer and more complex strings in the translation files. For example, if you need to generate the text `User has sent $20.00 to you on Oct 25th at 10:05am`, add just one key to the translation file and use the arrow function version:
+
+```javascript
+nameOfTheKey: ({amount, dateTime}) => `User has sent ${amount} to you on ${datetime}`,
+```
+
+This is because the order of phrases might vary from one language to another.
+
+### - Plural forms MUST be handled correctly using plural translation objects
+When working with translations that involve plural forms, it's important to handle different cases correctly:
+
+- **zero**: Used when there are no items **(optional)**
+- **one**: Used when there's exactly one item
+- **two**: Used when there's two items **(optional)**
+- **few**: Used for a small number of items **(optional)**
+- **many**: Used for larger quantities **(optional)**
+- **other**: A catch-all case for other counts or variations
+
+Example implementation:
+```javascript
+messages: () => ({
+    zero: 'No messages',
+    one: 'One message',
+    two: 'Two messages',
+    few: (count) => `${count} messages`,
+    many: (count) => `You have ${count} messages`,
+    other: (count) => `You have ${count} unread messages`,
+})
+```
+
+Usage in code:
+```javascript
+translate('common.messages', {count: 1});
+```
+
+## Translation Generation
+
+### - `src/languages/en.ts` MUST be the source of truth for static strings
+`src/languages/en.ts` is the source of truth for static strings in the App. `src/languages/es.ts` is (for now) manually-curated. The remainder are AI-generated using `scripts/generateTranslations.ts`.
+
+### - Translation script SHOULD be used for generating non-English translations
+The script is run automatically in GH and a diff with the translations is posted as a comment. See example: https://github.com/Expensify/App/pull/70702#issuecomment-3312988591
+
+### - Translation quality SHOULD be improved through context and prompt refinement
+If you are unhappy with the results of an AI translation, there are two methods of recourse:
+
+1. **Context annotations**: If you are adding a string that can have an ambiguous meaning without proper context, you can add a context annotation in `en.ts`. This takes the form of a comment before your string starting with `@context`.
+
+2. **Prompt adjustment**: The base prompt(s) can be found in `prompts/translation`, and can be adjusted if necessary.

contributingGuides/philosophies/INDEX.md

@@ -21,3 +21,31 @@ Example of creating a new optimistic comment:
 3. Comment is created in the server
 4. Server responds
 5. UI updates with data from the server
+
+### - Collections SHOULD be stored as individual keys when components bind directly to them
+Store collections as individual keys+ID (e.g., `report_1234`, `report_4567`) when a component will bind directly to one of those keys. For example: reports are stored as individual keys because `OptionRow.js` binds to the individual report keys for each link. However, report actions are stored as an array of objects because nothing binds directly to a single report action.
+
+### - Onyx keys MUST be defined using constants in `ONYXKEYS`
+Each Onyx key represents either a collection of items or a specific entry in storage. For example, since all reports are stored as individual keys like `report_1234`, if code needs to know about all the reports (e.g., display a list of them in the nav menu), then it MUST subscribe to the key `ONYXKEYS.COLLECTION.REPORT`.
+
+### - Storage eviction MUST be configured for non-critical data
+Different platforms come with varying storage capacities and Onyx has a way to gracefully fail when those storage limits are encountered.
+
+**To flag a key as safe for removal:**
+- Add the key to the `evictableKeys` option in `Onyx.init(options)`
+- Implement `canEvict` in the Onyx config for each component subscribing to a key
+- The key will only be deleted when all subscribers return `true` for `canEvict`
+
+Example:
+```js
+Onyx.init({
+    evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+});
+
+export default withOnyx({
+    reportActions: {
+        key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+        canEvict: props => !props.isActiveReport,
+    },
+})(ReportActionsView);
+```