Skip to content

Commit 338fd79

Browse files
committed
Merge branch 'main' into fix/59225-gbr-doesnt-show-when-pay-is-needed
2 parents ea7effa + 755b505 commit 338fd79

2,608 files changed

Lines changed: 188488 additions & 90462 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.

.env.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ EXPENSIFY_ACCOUNT_ID_MANAGER_MCTEST=-1
3636
FB_API_KEY=YOUR_API_KEY
3737
FB_APP_ID=YOUR_APP_ID
3838
FB_PROJECT_ID=YOUR_PROJECT_ID
39+
40+
GITHUB_TOKEN=YOUR_TOKEN
41+
OPENAI_API_KEY=YOUR_TOKEN

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ web/gtm.js
1414
src/libs/SearchParser/searchParser.js
1515
src/libs/SearchParser/autocompleteParser.js
1616
help/_scripts/**
17+
modules/ExpensifyNitroUtils/nitrogen/**
1718
Mobile-Expensify/**
1819
vendor

.eslintrc.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,24 @@ const restrictedImportPaths = [
8787
importNames: ['memoize'],
8888
message: "Please use '@src/libs/memoize' instead.",
8989
},
90+
{
91+
name: 'lodash/isEqual',
92+
message: "Please use 'deepEqual' from 'fast-equals' instead.",
93+
},
94+
{
95+
name: 'lodash',
96+
importNames: ['isEqual'],
97+
message: "Please use 'deepEqual' from 'fast-equals' instead.",
98+
},
9099
{
91100
name: 'react-native-animatable',
92101
message: "Please use 'react-native-reanimated' instead.",
93102
},
103+
{
104+
name: 'react-native-onyx',
105+
importNames: ['useOnyx'],
106+
message: "Please use '@hooks/useOnyx' instead.",
107+
},
94108
];
95109

96110
const restrictedImportPatterns = [
@@ -292,6 +306,7 @@ module.exports = {
292306
'@libs': './src/libs',
293307
'@navigation': './src/libs/Navigation',
294308
'@pages': './src/pages',
309+
'@prompts': './prompts',
295310
'@styles': './src/styles',
296311
// This path is provide alias for files like `ONYXKEYS` and `CONST`.
297312
'@src': './src',

.github/ISSUE_TEMPLATE/Accessibility.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ What can we do to fix the issue?
3535
Check off any platforms that are affected by this issue
3636
--->
3737
Which of our officially supported platforms is this issue occurring on? Please only tick the box if you have provided a screen-recording in the thread for each platform:
38-
- [ ] Android: Native
38+
- [ ] Android: App
3939
- [ ] Android: mWeb Chrome
40-
- [ ] iOS: Native
40+
- [ ] iOS: App
4141
- [ ] iOS: mWeb Safari
42+
- [ ] iOS: mWeb Chrome
43+
- [ ] Windows: Chrome
4244
- [ ] MacOS: Chrome / Safari
4345
- [ ] MacOS: Desktop
4446

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: Patch Tracking
3+
about: Template for tracking patches applied to third-party libraries
4+
---
5+
6+
If you haven't already, check out our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md) and [patch guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PATCHES.md) for information on how to manage patches.
7+
___
8+
9+
## Patch Information
10+
11+
**Library Name:** <!-- e.g., react-native-pdf -->
12+
**Library Version:** <!-- e.g., 6.7.3 -->
13+
**Patch Number:** <!-- e.g., 001 -->
14+
**Patch Description:** <!-- e.g., update-podspec-to-support-new-arch -->
15+
**Full Patch Filename:** <!-- e.g., react-native-pdf+6.7.3+001+update-podspec-to-support-new-arch.patch -->
16+
17+
## Patch Details
18+
19+
### Reason for Patch
20+
<!-- Explain why this patch is necessary. What issue does it solve? -->
21+
22+
### Changes Made
23+
<!-- Briefly describe the changes made in the patch -->
24+
25+
### Upstream Status
26+
**Upstream PR/Issue:** <!-- Link to the PR or issue in the upstream repository, if one exists -->
27+
28+
## Related Information
29+
30+
**PR Introducing Patch:** <!-- Link to the PR that introduced this patch -->
31+
32+
## Additional Notes
33+
<!-- Any other relevant information about this patch -->
34+
35+
## Checklist
36+
- [ ] Patch file is correctly named and placed in the appropriate directory
37+
- [ ] Patch is documented in the corresponding `details.md` file
38+
- [ ] This issue is linked in the `details.md` file
39+
- [ ] Upstream PR/issue has been created (if applicable)

.github/ISSUE_TEMPLATE/ExpertContributorChangeRequest.md renamed to .github/ISSUE_TEMPLATE/OnboardOffboardExpertContributor.md

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,37 @@
11
---
2-
name: Add or remove expert contributor from the team
3-
about: In order to get access to the HybridApp setup, expert contributors need to be added to our Github Organization. They also need to be added to the necessary rooms in Slack
2+
name: Onboard or offboard an expert contributor from the team
3+
about: In order to get access to the HybridApp setup, expert contributors need to be added to our GitHub Organization. They also need to be added to the necessary rooms in Slack
44
title: "Expert Contributor Change Request - <insert-name>"
5-
labels: Daily, Task, ring0
5+
labels: Daily, Task, Access Change
66
---
77

8+
### Requester Tasks
9+
10+
- [ ] Provide the Expert Contributor Details requested below
11+
- [ ] Add / remove from the following Slack channels via Slack Connect
12+
- [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
13+
- [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
14+
- [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
15+
- [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
16+
- [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
17+
- [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)
18+
- [ ] [#expert-contributors](https://expensify.enterprise.slack.com/archives/C08CZDJFJ77)
19+
820
### Expert Contributor Details
921

10-
- Name:
11-
- Github handle (or Github profile link):
22+
- Full Name:
23+
- GitHub handle:
1224
- Email:
1325
- Slack post in your team channel with this request for visibility:
1426
- Team (check your team):
1527
- [ ] Callstack
1628
- [ ] Margelo
1729
- [ ] Software Mansion
1830

19-
Do you want to remove this developer from the team? YES/NO
31+
Which action do you wish to take for this team member (select one):
32+
- [ ] Onboard - add them to the team
33+
- [ ] Offboard - remove them from the team
2034

21-
### Tasks for ring0 assignee
35+
### Ring0 Tasks
2236

23-
- [ ] 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)
24-
- [ ] Add to Slack channels using Slack Connect:
25-
- [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
26-
- [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
27-
- [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
28-
- [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
29-
- [ ] [#expense](https://expensify.enterprise.slack.com/archives/C06ML6X0W9L)
30-
- [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
31-
- [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)
32-
- [ ] [#expert-contributors](https://expensify.enterprise.slack.com/archives/C08CZDJFJ77)
37+
- [ ] 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)

.github/ISSUE_TEMPLATE/Performance.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ Note: These should be the same as the benchmarks collected before any changes.
2525

2626
## Platforms:
2727
Select the officially supported platforms where the issue was reproduced:
28-
- [ ] Android: Standalone
29-
- [ ] Android: HybridApp
28+
- [ ] Android: App
3029
- [ ] Android: mWeb Chrome
31-
- [ ] iOS: Standalone
32-
- [ ] iOS: HybridApp
30+
- [ ] iOS: App
3331
- [ ] iOS: mWeb Safari
32+
- [ ] iOS: mWeb Chrome
3433
- [ ] Windows: Chrome
3534
- [ ] MacOS: Chrome / Safari
3635
- [ ] MacOS: Desktop
@@ -39,12 +38,11 @@ Select the officially supported platforms where the issue was reproduced:
3938
<summary>Platforms Tested:</summary>
4039
On which of our officially supported platforms was this issue tested:
4140

42-
- [ ] Android: Standalone
43-
- [ ] Android: HybridApp
41+
- [ ] Android: App
4442
- [ ] Android: mWeb Chrome
45-
- [ ] iOS: Standalone
46-
- [ ] iOS: HybridApp
43+
- [ ] iOS: App
4744
- [ ] iOS: mWeb Safari
45+
- [ ] iOS: mWeb Chrome
4846
- [ ] Windows: Chrome
4947
- [ ] MacOS: Chrome / Safari
5048
- [ ] MacOS: Desktop

.github/ISSUE_TEMPLATE/Standard.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ___
1010
**Version Number:**
1111
**Reproducible in staging?:**
1212
**Reproducible in production?:**
13-
**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
1413
**If this was caught during regression testing, add the test name, ID and link from TestRail:**
1514
**Email or phone of affected tester (no customers):**
1615
**Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -32,12 +31,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
3231

3332
## Platforms:
3433
Select the officially supported platforms where the issue was reproduced:
35-
- [ ] Android: Standalone
36-
- [ ] Android: HybridApp
34+
- [ ] Android: App
3735
- [ ] Android: mWeb Chrome
38-
- [ ] iOS: Standalone
39-
- [ ] iOS: HybridApp
36+
- [ ] iOS: App
4037
- [ ] iOS: mWeb Safari
38+
- [ ] iOS: mWeb Chrome
4139
- [ ] Windows: Chrome
4240
- [ ] MacOS: Chrome / Safari
4341
- [ ] MacOS: Desktop
@@ -46,12 +44,11 @@ Select the officially supported platforms where the issue was reproduced:
4644
<summary>Platforms Tested:</summary>
4745
On which of our officially supported platforms was this issue tested:
4846

49-
- [ ] Android: Standalone
50-
- [ ] Android: HybridApp
47+
- [ ] Android: App
5148
- [ ] Android: mWeb Chrome
52-
- [ ] iOS: Standalone
53-
- [ ] iOS: HybridApp
49+
- [ ] iOS: App
5450
- [ ] iOS: mWeb Safari
51+
- [ ] iOS: mWeb Chrome
5552
- [ ] Windows: Chrome
5653
- [ ] MacOS: Chrome / Safari
5754
- [ ] MacOS: Desktop

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
9292
- [ ] 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`)
9393
- [ ] I verified that comments were added to code that is not self explanatory
9494
- [ ] 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.
95-
- [ ] I verified any copy / text shown in the product is localized by adding it to `src/languages/*` files and using the [translation method](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60)
95+
- [ ] I verified any copy / text shown in the product is localized by adding it to `src/languages/*` files and using the [translation method](https://github.com/Expensify/App/blob/4510fc76bbf5df699a2575bfb49a276af90f3ed7/src/components/LocaleContextProvider.tsx#L80)
9696
- [ ] If any non-english text was added/modified, I used [JaimeGPT](https://chatgpt.com/g/g-2dgOQl5VM-english-to-spanish-translator-aka-jaimegpt) to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
97-
- [ ] I verified all numbers, amounts, dates and phone numbers shown in the product are using the [localization methods](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60-L68)
97+
- [ ] I verified all numbers, amounts, dates and phone numbers shown in the product are using the [localization methods](https://github.com/Expensify/App/blob/4510fc76bbf5df699a2575bfb49a276af90f3ed7/src/components/LocaleContextProvider.tsx#L116-L123)
9898
- [ ] 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)
9999
- [ ] 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.
100100
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs)) were followed

.github/actionlint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ self-hosted-runner:
1010
paths:
1111
'**/*':
1212
ignore:
13-
# This is meant to be a temporary workaround for a bug in actionslint. Upstream:
13+
# This is meant to be a temporary workaround for a bug in actionlint. Upstream:
1414
# - issue: https://github.com/rhysd/actionlint/issues/511
1515
# - PR: https://github.com/rhysd/actionlint/pull/513
1616
- '"env" is not allowed in "runs" section because .* is a Composite action.*'

0 commit comments

Comments
 (0)