Skip to content

Commit fd6d4ad

Browse files
committed
Merge main to resolve conflicts
2 parents eec991d + ab5175c commit fd6d4ad

File tree

1,076 files changed

+44685
-28480
lines changed

Some content is hidden

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

1,076 files changed

+44685
-28480
lines changed

.env.example

+4
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
2828
EXPENSIFY_ACCOUNT_ID_REWARDS=-1
2929
EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
3030
EXPENSIFY_ACCOUNT_ID_SVFG=-1
31+
32+
FB_API_KEY=YOUR_API_KEY
33+
FB_APP_ID=YOUR_APP_ID
34+
FB_PROJECT_ID=YOUR_PROJECT_ID

.env.production

+4
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ PUSHER_APP_KEY=268df511a204fbb60884
77
USE_WEB_PROXY=false
88
ENVIRONMENT=production
99
SEND_CRASH_REPORTS=true
10+
11+
FB_API_KEY=AIzaSyDxzigVLZl4G8MP7jACQ0qpmADMzmrrON0
12+
FB_APP_ID=1:921154746561:web:1583e882584cf151027c40
13+
FB_PROJECT_ID=expensify-chat

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.github/actions/**/index.js
44
*.config.js
55
**/.eslintrc.js
6+
**/.eslintrc.changed.js
67
**/node_modules/**
78
**/dist/**
89
android/**/build/**
@@ -11,3 +12,4 @@ docs/assets/**
1112
web/gtm.js
1213
**/.expo/**
1314
src/libs/SearchParser/searchParser.js
15+
help/_scripts/**

.eslintrc.changed.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
plugins: ['@typescript-eslint', 'deprecation'],
3+
parser: '@typescript-eslint/parser',
4+
parserOptions: {
5+
project: './tsconfig.json',
6+
},
7+
rules: {
8+
'deprecation/deprecation': 'error',
9+
},
10+
};

.eslintrc.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module.exports = {
108108
'plugin:you-dont-need-lodash-underscore/all',
109109
'plugin:prettier/recommended',
110110
],
111-
plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library', 'eslint-plugin-react-compiler'],
111+
plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library', 'eslint-plugin-react-compiler', 'lodash', 'deprecation'],
112112
ignorePatterns: ['lib/**'],
113113
parser: '@typescript-eslint/parser',
114114
parserOptions: {
@@ -177,6 +177,7 @@ module.exports = {
177177
// ESLint core rules
178178
'es/no-nullish-coalescing-operators': 'off',
179179
'es/no-optional-chaining': 'off',
180+
'deprecation/deprecation': 'off',
180181

181182
// Import specific rules
182183
'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
@@ -231,6 +232,7 @@ module.exports = {
231232
'you-dont-need-lodash-underscore/throttle': 'off',
232233
// The suggested alternative (structuredClone) is not supported in Hermes:https://github.com/facebook/hermes/issues/684
233234
'you-dont-need-lodash-underscore/clone-deep': 'off',
235+
'lodash/import-scope': ['error', 'method'],
234236
'prefer-regex-literals': 'off',
235237
'valid-jsdoc': 'off',
236238
'jsdoc/no-types': 'error',
@@ -289,5 +291,11 @@ module.exports = {
289291
'rulesdir/use-periods-for-error-messages': 'error',
290292
},
291293
},
294+
{
295+
files: ['*.ts', '*.tsx'],
296+
rules: {
297+
'rulesdir/prefer-at': 'error',
298+
},
299+
},
292300
],
293301
};

.eslintrc.pr.js

-7
This file was deleted.

.github/ISSUE_TEMPLATE/Standard.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ Which of our officially supported platforms is this issue occurring on?
4343

4444
## Screenshots/Videos
4545

46-
Add any screenshot/video evidence
46+
<details>
47+
<summary>Add any screenshot/video evidence</summary>
4748

49+
4850
</details>
4951

5052
[View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)

.github/actions/composite/buildAndroidE2EAPK/action.yml

-102
This file was deleted.

.github/actions/composite/setupGitForOSBotify/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
- name: Set up git for OSBotify
2121
shell: bash
2222
run: |
23-
git config user.signingkey 367811D53E34168C
23+
git config user.signingkey AEE1036472A782AB
2424
git config commit.gpgsign true
2525
git config user.name OSBotify
2626
git config user.email infra+osbotify@expensify.com

.github/actions/composite/setupGitForOSBotifyApp/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ runs:
5050
- name: Set up git for OSBotify
5151
shell: bash
5252
run: |
53-
git config user.signingkey 367811D53E34168C
53+
git config user.signingkey AEE1036472A782AB
5454
git config commit.gpgsign true
5555
git config user.name OSBotify
5656
git config user.email infra+osbotify@expensify.com

.github/actions/javascript/authorChecklist/authorChecklist.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ function partitionWithChecklist(body: string): string[] {
5454
async function getNumberOfItemsFromAuthorChecklist(): Promise<number> {
5555
const response = await fetch(pathToAuthorChecklist);
5656
const fileContents = await response.text();
57-
const checklist = partitionWithChecklist(fileContents)[1];
58-
const numberOfChecklistItems = (checklist.match(/\[ \]/g) ?? []).length;
57+
const checklist = partitionWithChecklist(fileContents).at(1);
58+
const numberOfChecklistItems = (checklist?.match(/\[ \]/g) ?? []).length ?? 0;
5959
return numberOfChecklistItems;
6060
}
6161

0 commit comments

Comments
 (0)