resolve conflict

Author: nkdengineer

Mobile-Expensify

@@ -24,6 +24,7 @@
 * [canBeMissing onyx param](#canbemissing-onyx-param)
 
 #### Additional Reading
+* [Application Philosophy](contributingGuides/philosophies/INDEX.md)
 * [API Details](contributingGuides/API.md)
 * [Offline First](contributingGuides/OFFLINE_UX.md)
 * [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
@@ -525,7 +526,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
 4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App.
 
 
-> [!Note]  
+> [!Note]
 > #### For external agencies and C+ contributors only
 >
 > If you'd like to modify the `Mobile-Expensify` source code, it is best that you create your own fork. Then, you can swap origin of the remote repository by executing this command:
@@ -560,15 +561,15 @@ If for some reason, you need to target the standalone NewDot application, you ca
 
 ### Working with HybridApp vs Standalone NewDot
 
-Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.  
-The primary difference is that the native code, which runs React Native, is located in the following directories:  
+Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.
+The primary difference is that the native code, which runs React Native, is located in the following directories:
 
 - `./Mobile-Expensify/Android`
 - `./Mobile-Expensify/iOS`
 
 ### Important Notes:
 1. **Root Folders Do Not Affect HybridApp Builds:**
-   - Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.  
+   - Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.
 
 2. **Modifying iOS Code for HybridApp:**
    - If you need to remove `Pods`, you must do it in the **`./Mobile-Expensify/iOS`** directory.
@@ -583,23 +584,23 @@ The primary difference is that the native code, which runs React Native, is loca
 
 ### Updating the `Mobile-Expensify` Submodule
 
-The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.  
+The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.
 
-If you'd like to fetch the submodule while executing the `git pull` command in `Expensify/App` instead of updating it manually you can run this command in the root of the project: 
+If you'd like to fetch the submodule while executing the `git pull` command in `Expensify/App` instead of updating it manually you can run this command in the root of the project:
 
 ```
 git config submodule.recurse true
 ```
 
-> [!WARNING]  
+> [!WARNING]
 > Please, remember that the submodule will get updated automatically only after executing the `git pull` command - if you switch between branches it is still recommended to execute `git submodule update` to make sure you're working on a compatible submodule version!
 
 If you'd like to download the most recent changes from the `main` branch, please use the following command:
 ```bash
 git submodule update --remote
 ```
 
-It's important to emphasize that a git submodule is just a **regular git repository** after all. It means that you can switch branches, pull the newest changes, and execute all regular git commands within the `Mobile-Expensify` directory. 
+It's important to emphasize that a git submodule is just a **regular git repository** after all. It means that you can switch branches, pull the newest changes, and execute all regular git commands within the `Mobile-Expensify` directory.
 
 ### Adding HybridApp-related patches
 
@@ -805,7 +806,7 @@ Some pointers:
 - When working with translations that involve plural forms, it's important to handle different cases correctly.
 
   For example:
-  - zero: Used when there are no items **(optional)**. 
+  - 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)**.

README.md

@@ -1,7 +1,7 @@
 import CONST from '@src/CONST';
 import type {Report} from '@src/types/onyx';
 
-const usersIDs = [15593135, 51760358, 26502375];
+const usersIDs = [15593135, 51760358, 26502375] as const;
 const amount = 10402;
 const currency = CONST.CURRENCY.USD;
 
@@ -20,7 +20,7 @@ const participants = usersIDs.reduce((prev, userID) => {
     };
 }, {});
 
-const iouReportR14932: Report = {
+const iouReportR14932 = {
     currency,
     participants,
     total: amount,
@@ -31,9 +31,9 @@ const iouReportR14932: Report = {
     parentReportActionID: PARENT_REPORT_ACTION_ID_R14932,
     parentReportID: PARENT_REPORT_ID_R14932,
     reportID: REPORT_ID_R14932,
-    lastActorAccountID: usersIDs.at(0),
-    ownerAccountID: usersIDs.at(0),
-    managerID: usersIDs.at(1),
+    lastActorAccountID: usersIDs[0],
+    ownerAccountID: usersIDs[0],
+    managerID: usersIDs[1],
     permissions: [CONST.REPORT.PERMISSIONS.READ, CONST.REPORT.PERMISSIONS.WRITE],
     policyID: CONST.POLICY.ID_FAKE,
     reportName: CONST.REPORT.ACTIONS.TYPE.IOU,
@@ -60,7 +60,7 @@ const iouReportR14932: Report = {
     welcomeMessage: '',
     description: '',
     oldPolicyName: '',
-};
+} satisfies Report;
 
 const chatReportR14932: Report = {
     currency,

__mocks__/reportData/reports.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018802
-        versionName "9.1.88-2"
+        versionCode 1009018803
+        versionName "9.1.88-3"
         // 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"

android/app/build.gradle

@@ -0,0 +1,5 @@
+# Application Philosophies
+The following pages include details on how different systems are meant to be used.
+
+## Contents
+* [Routing Philosophy](contributingGuides/philosophies/ROUTING.md)

contributingGuides/philosophies/INDEX.md

@@ -0,0 +1,68 @@
+# Routing Philosophy
+Learn how URLs are constructed and used to route users through all parts of the application.
+
+[React Navigation](https://reactnavigation.org/) is the library used for all routing and navigation, so refer to its [docs](https://reactnavigation.org/docs/getting-started) to understand how the library works. This page will not focus on how routing works, but how URLs are constructed and what patterns to follow when adding new URLs.
+
+## Definitions
+- URL - The web address for every page in the app. On web, this is shown on the browser bar, and is of the format `https://new.expensify.com/<route>`
+- Route - A unique identifier of a specific location within the app's navigation hierarchy
+- Object Route - A route pointing to a specific object (eg. report, transaction, workspace, etc.)
+- Page Route - A route for a specific page (eg. settings, add bank account, etc.)
+
+This guide is based on [[PSR-1]] and [[PSR-2]].
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
+"OPTIONAL" in this document are to be interpreted as described in [[RFC 2119]].
+
+## Rules
+When adding new routes, or refactoring existing routes, follow these rules:
+
+### - MUST be unique
+There are no aliases where different routes lead to the same place.
+
+### - SHOULD be short
+Aim for the shortest possible URL that is also still human readable.
+
+Exceptions:
+- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) for strategic purposes
+
+### - MUST use kebab-case for all parts of a URL (eg. words separated by hyphens)
+### - MUST use all lower case words
+### - MUST be defined in `ROUTES.ts`
+### - MUST convey page hierarchy
+Just like breadcrumbs, the URL should reflect the path a user has taken.
+
+Example of the paths taken to manage a workspace member:
+1. `workspaces`
+1. `workspaces/:policyID/overview`
+1. `workspaces/:policyID/members`
+1. `workspaces/:policyID/members/:memberID`
+
+### - MUST have the route parameters validated
+Since users can edit the route parameters at any time, to any value, the parameters must always be validated to ensure they are correct and the user has access.
+
+### - MUST NOT start with a slash
+### - MUST NOT contain jargon or acronyms
+### - MUST NOT contain sensitive information that could be logged by third-parties
+Internet routers and third-party-services can see and store any information in the URL. Do not put things like passwords, auth tokens, or PII (personally identifiable information).
+
+### - SHOULD NOT use query parameters
+Exceptions:
+- When a URL needs to be encoded and added to the path (eg. `?backTo=URL`, `?forwardTo=URL`)
+- When complex data needs to be part of the path (eg. `/search?q=QUERY`)
+
+### - SHOULD NOT use optional parameters
+If there are optional parameters, use two separate route definitions instead to be explicit.
+
+### - SHOULD use plural nouns when there are multiple objects that can exist
+Exceptions:
+
+- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) then plurality does not matter
+
+### - SHOULD use only the minimal necessary information to render the page
+Examples:
+- `r/:threadReportID` GOOD - `threadReportID` is all that is needed and all the rest of the page can be derived from that
+- `r/:parentReportID/:threadReportID` BAD - the `parentReportID` is not necessary so it just adds cruft to the URL
+
+Exceptions:
+
+- When multiple IDs are **required** to render the page.

contributingGuides/philosophies/ROUTING.md

@@ -273,6 +273,7 @@
         "Highlightable",
         "Hoverable",
         "HRMS",
+        "HSBCSGS",
         "hybridapp",
         "Hydronics",
         "iaco",

cspell.json

@@ -52,4 +52,8 @@ However, if you encounter an error during this process, you can close the pop-up
 
 Some banks, such as Chase, may display masked or tokenized account numbers when connected via Plaid. This is a security feature implemented by the bank and does not indicate any setup error. As long as the connection was successful and you see your account listed in your **Wallet**, reimbursements should process correctly.
 
+## Why can't I add my HSBC bank account details in Singapore?
+
+You can. HSBC typically includes the **branch code** which is the final three digits of the Swift Code (HSBCSGS2XXX) in their "Account Number". If you see figures like "146172002492", please drop first 3 digit (146) which is the Branch Code.
+
 </div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-Bank-Account.md

@@ -101,11 +101,13 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
 
 To transfer billing ownership of a workspace:
 
-1. Make sure the new billing owner is a **Workspace Admin**
-2. Use the **left-hand navigation bar (LHB)** to go to: **Workspaces > [Workspace Name] > Members**
+1. Ensure the new billing owner is a **Workspace Admin**
+2. Have them log in and go to:  
+   **Workspaces > [Workspace Name] > Members**
 3. Click the current billing owner’s name
 4. Select **Transfer Ownership**
-5. The new owner will need to add a payment card and will be billed starting on the 1st of the next month
+5. The new owner adds a payment card
+6. Billing transfers automatically on the **1st of the next month**
 
 ---
 

docs/articles/new-expensify/billing-and-subscriptions/Billing-Overview.md

@@ -80,6 +80,10 @@ No. Expensify does not charge you to add or use a personal account. It’s inclu
 
 ## Are there countries where personal bank accounts aren’t supported?
 
-Yes. Expensify supports personal bank accounts from 190+ countries, but there’s a small number not supported. The full list of supported countries is available when adding a personal bank account. 
+Yes. Expensify supports personal bank accounts from 190+ countries, but there’s a small number not supported. The full list of supported countries is available when adding a personal bank account.
+
+## Why can't I add my HSBC bank account details in Singapore?
+
+You can. HSBC typically includes the **branch code** which is the final three digits of the Swift Code (HSBCSGS2XXX) in their "Account Number". If you see figures like "146172002492", please drop first 3 digit (146) which is the Branch Code.
 
 </div>