Merge branch 'Expensify:main' into fixgetDisplayNameForParticipant

Author: allgandalf

Mobile-Expensify

@@ -443,15 +443,7 @@ Files should be named after the component/function/constants they export, respec
 - All React components should be PascalCase (a.k.a. UpperCamelCase 🐫).
 
 ## Platform-Specific File Extensions
-In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
-- Mobile => `index.native.js`
-- iOS Native App/Android Native App => `index.ios.js`/`index.android.js`
-- Web => `index.website.js`
-- Desktop => `index.desktop.js`
-
-**Note:** `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`.
-
-`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.website.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
+This section has moved [here](contributingGuides/philosophies/CROSS-PLATFORM.md).
 
 ## API building
 When adding new API commands (and preferably when starting using a new one that was not yet used in this codebase) always
@@ -659,10 +651,7 @@ This application is built with the following principles.
         5. UI updates with data from the server
 
 1. **Cross Platform 99.9999%**
-    1. A feature isn't done until it works on all platforms.  Accordingly, don't even bother writing a platform-specific code block because you're just going to need to undo it.
-    1. If the reason you can't write cross-platform code is because there is a bug in ReactNative that is preventing it from working, the correct action is to fix RN and submit a PR upstream -- not to hack around RN bugs with platform-specific code paths.
-    1. If there is a feature that simply doesn't exist on all platforms and thus doesn't exist in RN, rather than doing if (platform=iOS) { }, instead write a "shim" library that is implemented with NOOPs on the other platforms.  For example, rather than injecting platform-specific multi-tab code (which can only work on browsers, because it's the only platform with multiple tabs), write a TabManager class that just is NOOP for non-browser platforms.  This encapsulates the platform-specific code into a platform library, rather than sprinkling through the business logic.
-    1. Put all platform specific code in dedicated files and folders, like /platform, and reject any PR that attempts to put platform-specific code anywhere else.  This maintains a strict separation between business logic and platform code.
+See details [here](contributingGuides/philosophies/CROSS-PLATFORM.md).
 
 ----
 

README.md

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009019702
-        versionName "9.1.97-2"
+        versionCode 1009019703
+        versionName "9.1.97-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

@@ -189,19 +189,12 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                      */
                     exclude: [new RegExp(`node_modules/(?!(${includeModules})/).*|.native.js$`)],
                 },
-
                 // We are importing this worker as a string by using asset/source otherwise it will default to loading via an HTTPS request later.
                 // This causes issues if we have gone offline before the pdfjs web worker is set up as we won't be able to load it from the server.
                 {
-                    // eslint-disable-next-line prefer-regex-literals
                     test: new RegExp('node_modules/pdfjs-dist/build/pdf.worker.min.mjs'),
                     type: 'asset/source',
                 },
-                {
-                    // eslint-disable-next-line prefer-regex-literals
-                    test: new RegExp('node_modules/pdfjs-dist/legacy/build/pdf.worker.min.mjs'),
-                    type: 'asset/source',
-                },
 
                 // Rule for react-native-web-webview
                 {

config/webpack/webpack.common.ts

@@ -0,0 +1,45 @@
+# Cross Platform Philosophy
+Learn how the app supports features across all our different platforms.
+
+Currently supported platforms:
+- Web
+- Mobile Web
+- Desktop
+- iOS
+- Android
+
+The goal is: **Cross Platform 99.9999%**
+
+## Rules
+### - Features MUST be implemented on all supported platforms
+A feature isn't done until it works on all platforms. Any platform-specific code blocks will be asked to be undone.
+
+### - React Native bugs MUST be fixed upstream
+If the reason cross-platform code cannot be written is because there is a bug in ReactNative that is preventing it from working, the correct action is to fix RN and submit a PR upstream -- not to hack around RN bugs with platform-specific code paths.
+
+While upstream PRs are waiting to be merged, a patch can be used which is managed by the NPM package `patch-package`. Read more about it [here](https://github.com/Expensify/App?tab=readme-ov-file#adding-hybridapp-related-patches).
+
+### - Features that don't exist on all platforms MUST use NOOP shims
+If there is a feature that simply doesn't exist on all platforms and thus doesn't exist in RN, rather than doing `if (platform=iOS) { }`, instead write a "shim" library that is implemented with NOOPs on the other platforms.  For example, rather than injecting platform-specific multi-tab code (which can only work on browsers, because it's the only platform with multiple tabs), write a TabManager class that just is NOOP for non-browser platforms.  This encapsulates the platform-specific code into a platform library, rather than sprinkling through the business logic.
+
+### - Platform specific code MUST be placed in dedicated files and folders
+Put all platform specific code in dedicated files and folders (see below) and reject any PR that attempts to put platform-specific code anywhere else.  This maintains a strict separation between business logic and platform code.
+
+## Platform-Specific File Extensions
+In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
+- Mobile => `index.native.js`
+- iOS Native App/Android Native App => `index.ios.js`/`index.android.js`
+- Web => `index.website.js`
+- Desktop => `index.desktop.js`
+
+**Note:** `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`.
+
+`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.website.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
+
+### Supporting Mobile Web
+The above platform-specific files only work because they are compiled when the app is built for the different platforms. This means that a different mechanism needs to be used for Mobile Web (since "mobile web" and "web" are the same at build time).
+
+It is also well known that different mobile browsers have different quirks and need to use different workarounds at times.
+
+#### - Mobile browser detection SHOULD never be used
+If there is absolutely no other way to fix a bug, then the proper way of detecting the browser is using `@libs/Browser`. Use this as an absolute last resort and have the exception approved by several (ie. more than one) internal engineers.

contributingGuides/philosophies/CROSS-PLATFORM.md

@@ -5,5 +5,6 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
 "OPTIONAL" are to be interpreted as described in [RFC 2119](https://datatracker.ietf.org/doc/html/rfc2119).
 
 ## Contents
+* [Cross-Platform Philosophy](/contributingGuides/philosophies/CROSS-PLATFORM.md)
 * [Offline Philosophy](/contributingGuides/philosophies/OFFLINE.md)
 * [Routing Philosophy](/contributingGuides/philosophies/ROUTING.md)

contributingGuides/philosophies/INDEX.md

@@ -438,6 +438,7 @@
         "numberformat",
         "objc",
         "oblador",
+        "OCBC",
         "octocat",
         "officedocument",
         "oldarch",

cspell.json

@@ -52,8 +52,35 @@ 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.
+## I can't find all the details for my bank in Singapore that you require. Where can I find them?
+
+Expensify requires many fields to add a Singaporean Business account (for paying out) or Personal account (for receiving into). The Name and Address fields are self-explanatory. The other fields are:
+
+- Swift Code  
+- Account Number  
+- Clearing Code  
+
+The Swift code can generally be found by searching for your bank [here](https://wise.com/gb/swift-codes/countries). It always contains a capitalized alphanumerical string of characters that end in either XXX or the bank **Branch Code**. There is no requirement to use anything but the XXX head office option.
+
+The Account Number can usually be found on your statement or in your online banking portal. For example, HSBC typically includes the **Branch Code** (the final three digits of the Swift Code, e.g. HSBCSGS2XXX → 146) in the **Account Number**. If you see figures like `146172002492`, drop the first 3 digits (`146`), which form the Branch Code, and use the remainder as the Account No.
+
+The Clearing Code is made up of both the **Bank Code** and the **Branch Code** to form a full 7-digit Clearing Code. Some bank-specific help is outlined below:
+
+- **UOB (Standard Accounts)** — Bank Code: 7375. Branch Code: first 3 digits of Account No. Account No: unchanged.  
+  Example: `9102031012` → Branch Code `030`, Clearing Code `7375030`, Account No `9102031012`.
+- **DBS** — Bank Code: 7171. Branch Code: first 3 digits of Account No. Account No: unchanged.  
+  Example: `0052312891` → Branch Code `005`, Clearing Code `7171005`.
+- **POSBank** — Bank Code: 7171. Branch Code: always `081`. Account No: unchanged.  
+  Example: `84102395` → Branch Code `081`, Clearing Code `7171081`.
+- **OCBC** — Bank Code: 7339. Branch Code: first 3 digits of Account No. Account No: drop the first 3 digits.  
+  Example: `5501089550` → Branch Code `550`, Clearing Code `7339550`, Account No `1089550`.
+- **HSBC (Corporate)** — Bank Code: 7232. Branch Code: first 3 digits of Account No. Account No: drop the first 3 digits.  
+  Example: `146172002492` → Branch Code `146`, Clearing Code `7232146`, Account No `172002492`.
+- **HSBC (Personal)** — Bank Code: 9548. Branch Code: first 3 digits of Account No. Account No: drop the first 3 digits.  
+  Example: `146123843293` → Branch Code `146`, Clearing Code `9548146`, Account No `123843293`.
+- **SBI** — Bank Code: 7791. Branch Code: first 3 digits of Account No. Account No: drop the first 3 digits.  
+  Example: `27767012518738` → Branch Code `277`, Clearing Code `7791277`, Account No `67012518738`.
+- **Standard Chartered** — Bank Code: 9496. Branch Code: `0` + first 2 digits of Account No. Account No: full 10 digits.  
+  Example: `1803645852` → Branch Code `018`, Clearing Code `9496018`, Account No `1803645852`.
 
 </div>

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

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.97.2</string>
+	<string>9.1.97.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.97</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.97.2</string>
+	<string>9.1.97.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>