Skip to content

Commit 4a6c409

Browse files
committed
Merge branch 'main' into bugfix/start-test-drive-migrated-accounts
2 parents e5b21a6 + f129ecb commit 4a6c409

54 files changed

Lines changed: 394 additions & 237 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* [canBeMissing onyx param](#canbemissing-onyx-param)
2525

2626
#### Additional Reading
27+
* [Application Philosophy](contributingGuides/philosophies/INDEX.md)
2728
* [API Details](contributingGuides/API.md)
2829
* [Offline First](contributingGuides/OFFLINE_UX.md)
2930
* [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
@@ -525,7 +526,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
525526
4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App.
526527

527528

528-
> [!Note]
529+
> [!Note]
529530
> #### For external agencies and C+ contributors only
530531
>
531532
> 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
560561

561562
### Working with HybridApp vs Standalone NewDot
562563

563-
Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.
564-
The primary difference is that the native code, which runs React Native, is located in the following directories:
564+
Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.
565+
The primary difference is that the native code, which runs React Native, is located in the following directories:
565566
566567
- `./Mobile-Expensify/Android`
567568
- `./Mobile-Expensify/iOS`
568569
569570
### Important Notes:
570571
1. **Root Folders Do Not Affect HybridApp Builds:**
571-
- Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.
572+
- Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.
572573

573574
2. **Modifying iOS Code for HybridApp:**
574575
- 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
583584
584585
### Updating the `Mobile-Expensify` Submodule
585586
586-
The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.
587+
The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.
587588
588-
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:
589+
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:
589590

590591
```
591592
git config submodule.recurse true
592593
```
593594

594-
> [!WARNING]
595+
> [!WARNING]
595596
> 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!
596597

597598
If you'd like to download the most recent changes from the `main` branch, please use the following command:
598599
```bash
599600
git submodule update --remote
600601
```
601602

602-
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.
603+
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.
603604

604605
### Adding HybridApp-related patches
605606

@@ -805,7 +806,7 @@ Some pointers:
805806
- When working with translations that involve plural forms, it's important to handle different cases correctly.
806807

807808
For example:
808-
- zero: Used when there are no items **(optional)**.
809+
- zero: Used when there are no items **(optional)**.
809810
- one: Used when there's exactly one item.
810811
- two: Used when there's two items. **(optional)**
811812
- few: Used for a small number of items **(optional)**.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Application Philosophies
2+
The following pages include details on how different systems are meant to be used.
3+
4+
## Contents
5+
* [Routing Philosophy](contributingGuides/philosophies/ROUTING.md)
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# Routing Philosophy
2+
Learn how URLs are constructed and used to route users through all parts of the application.
3+
4+
[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.
5+
6+
## Definitions
7+
- 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>`
8+
- Route - A unique identifier of a specific location within the app's navigation hierarchy
9+
- Object Route - A route pointing to a specific object (eg. report, transaction, workspace, etc.)
10+
- Page Route - A route for a specific page (eg. settings, add bank account, etc.)
11+
12+
This guide is based on [[PSR-1]] and [[PSR-2]].
13+
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
14+
"OPTIONAL" in this document are to be interpreted as described in [[RFC 2119]].
15+
16+
## Rules
17+
When adding new routes, or refactoring existing routes, follow these rules:
18+
19+
### - MUST be unique
20+
There are no aliases where different routes lead to the same place.
21+
22+
### - SHOULD be short
23+
Aim for the shortest possible URL that is also still human readable.
24+
25+
Exceptions:
26+
- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) for strategic purposes
27+
28+
### - MUST use kebab-case for all parts of a URL (eg. words separated by hyphens)
29+
### - MUST use all lower case words
30+
### - MUST be defined in `ROUTES.ts`
31+
### - MUST convey page hierarchy
32+
Just like breadcrumbs, the URL should reflect the path a user has taken.
33+
34+
Example of the paths taken to manage a workspace member:
35+
1. `workspaces`
36+
1. `workspaces/:policyID/overview`
37+
1. `workspaces/:policyID/members`
38+
1. `workspaces/:policyID/members/:memberID`
39+
40+
### - MUST have the route parameters validated
41+
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.
42+
43+
### - MUST NOT start with a slash
44+
### - MUST NOT contain jargon or acronyms
45+
### - MUST NOT contain sensitive information that could be logged by third-parties
46+
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).
47+
48+
### - SHOULD NOT use query parameters
49+
Exceptions:
50+
- When a URL needs to be encoded and added to the path (eg. `?backTo=URL`, `?forwardTo=URL`)
51+
- When complex data needs to be part of the path (eg. `/search?q=QUERY`)
52+
53+
### - SHOULD NOT use optional parameters
54+
If there are optional parameters, use two separate route definitions instead to be explicit.
55+
56+
### - SHOULD use plural nouns when there are multiple objects that can exist
57+
Exceptions:
58+
59+
- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) then plurality does not matter
60+
61+
### - SHOULD use only the minimal necessary information to render the page
62+
Examples:
63+
- `r/:threadReportID` GOOD - `threadReportID` is all that is needed and all the rest of the page can be derived from that
64+
- `r/:parentReportID/:threadReportID` BAD - the `parentReportID` is not necessary so it just adds cruft to the URL
65+
66+
Exceptions:
67+
68+
- When multiple IDs are **required** to render the page.

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@
273273
"Highlightable",
274274
"Hoverable",
275275
"HRMS",
276+
"HSBCSGS",
276277
"hybridapp",
277278
"Hydronics",
278279
"iaco",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,8 @@ However, if you encounter an error during this process, you can close the pop-up
5252

5353
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.
5454

55+
## Why can't I add my HSBC bank account details in Singapore?
56+
57+
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.
58+
5559
</div>

docs/articles/new-expensify/wallet-and-payments/Connect-a-Personal-Bank-Account.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ No. Expensify does not charge you to add or use a personal account. It’s inclu
8080

8181
## Are there countries where personal bank accounts aren’t supported?
8282

83-
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.
83+
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.
84+
85+
## Why can't I add my HSBC bank account details in Singapore?
86+
87+
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.
8488

8589
</div>

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
4747
"perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
4848
"typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
49-
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=320 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=319 --cache --cache-location=node_modules/.cache/eslint",
5050
"lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
5151
"lint-watch": "npx eslint-watch --watch --changed",
5252
"shellcheck": "./scripts/shellCheck.sh",
@@ -179,7 +179,7 @@
179179
"react-native-modal": "^13.0.0",
180180
"react-native-nitro-modules": "0.26.2",
181181
"react-native-nitro-sqlite": "9.1.10",
182-
"react-native-onyx": "2.0.127",
182+
"react-native-onyx": "2.0.130",
183183
"react-native-pager-view": "6.5.3",
184184
"react-native-pdf": "6.7.3",
185185
"react-native-performance": "^5.1.4",

patches/react-native/details.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,10 @@
190190
- Upstream PR/issue: https://github.com/facebook/react-native/pull/50782
191191
- E/App issue: https://github.com/Expensify/App/issues/64900
192192
- PR introducing patch: [#65804](https://github.com/Expensify/App/pull/65804)
193+
194+
### [react-native+0.79.2+027+fix-clipboard-text-data-can-be-null.patch](react-native+0.79.2+027+fix-clipboard-text-data-can-be-null.patch)
195+
196+
- Reason: This patch fixes a crash that occurred when the clipboard text data can be null.
197+
- Upstream PR/issue: 🛑
198+
- E/App issue: [#66925](https://github.com/Expensify/App/issues/66925)
199+
- PR introducing patch: [#66749](https://github.com/Expensify/App/pull/66749)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
2+
index 5a05e82..095313e 100644
3+
--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
4+
+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
5+
@@ -370,9 +370,12 @@ public class ReactEditText extends AppCompatEditText {
6+
7+
if (clipData.getDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
8+
type = ClipDescription.MIMETYPE_TEXT_PLAIN;
9+
- data = item.getText().toString();
10+
- if (mPasteWatcher != null) {
11+
- mPasteWatcher.onPaste(type, data);
12+
+ CharSequence text = item.getText();
13+
+ if (text != null) {
14+
+ data = text.toString();
15+
+ if (mPasteWatcher != null) {
16+
+ mPasteWatcher.onPaste(type, data);
17+
+ }
18+
}
19+
// Don't return - let the system proceed with default text pasting behavior
20+
}

0 commit comments

Comments
 (0)