Skip to content

Commit 71d8806

Browse files
authored
Merge branch 'main' into patch-19
2 parents 2f11253 + b05ae2f commit 71d8806

File tree

2,173 files changed

+123557
-60077
lines changed

Some content is hidden

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

2,173 files changed

+123557
-60077
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

+3
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,5 @@ docs/assets/**
1112
web/gtm.js
1213
**/.expo/**
1314
src/libs/SearchParser/searchParser.js
15+
src/libs/SearchParser/autocompleteParser.js
16+
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-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +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'],
112-
ignorePatterns: ['lib/**'],
111+
plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library', 'eslint-plugin-react-compiler', 'lodash', 'deprecation'],
113112
parser: '@typescript-eslint/parser',
114113
parserOptions: {
115114
project: path.resolve(__dirname, './tsconfig.json'),
@@ -177,6 +176,7 @@ module.exports = {
177176
// ESLint core rules
178177
'es/no-nullish-coalescing-operators': 'off',
179178
'es/no-optional-chaining': 'off',
179+
'deprecation/deprecation': 'off',
180180

181181
// Import specific rules
182182
'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
@@ -231,6 +231,7 @@ module.exports = {
231231
'you-dont-need-lodash-underscore/throttle': 'off',
232232
// The suggested alternative (structuredClone) is not supported in Hermes:https://github.com/facebook/hermes/issues/684
233233
'you-dont-need-lodash-underscore/clone-deep': 'off',
234+
'lodash/import-scope': ['error', 'method'],
234235
'prefer-regex-literals': 'off',
235236
'valid-jsdoc': 'off',
236237
'jsdoc/no-types': 'error',
@@ -289,5 +290,11 @@ module.exports = {
289290
'rulesdir/use-periods-for-error-messages': 'error',
290291
},
291292
},
293+
{
294+
files: ['*.ts', '*.tsx'],
295+
rules: {
296+
'rulesdir/prefer-at': 'error',
297+
},
298+
},
292299
],
293300
};

.github/ISSUE_TEMPLATE/Standard.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ___
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?:**
1314
**If this was caught during regression testing, add the test name, ID and link from TestRail:**
1415
**Email or phone of affected tester (no customers):**
1516
**Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -34,17 +35,21 @@ Can the user still use Expensify without this being fixed? Have you informed the
3435
Check off any platforms that are affected by this issue
3536
--->
3637
Which of our officially supported platforms is this issue occurring on?
37-
- [ ] Android: Native
38+
- [ ] Android: Standalone
39+
- [ ] Android: HybridApp
3840
- [ ] Android: mWeb Chrome
39-
- [ ] iOS: Native
41+
- [ ] iOS: Standalone
42+
- [ ] iOS: HybridApp
4043
- [ ] iOS: mWeb Safari
4144
- [ ] MacOS: Chrome / Safari
4245
- [ ] MacOS: Desktop
4346

4447
## Screenshots/Videos
4548

46-
Add any screenshot/video evidence
49+
<details>
50+
<summary>Add any screenshot/video evidence</summary>
4751

52+
4853
</details>
4954

5055
[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

-103
This file was deleted.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ runs:
2020
- name: Set up git for OSBotify
2121
shell: bash
2222
run: |
23-
git config user.signingkey 367811D53E34168C
24-
git config commit.gpgsign true
25-
git config user.name OSBotify
26-
git config user.email infra+osbotify@expensify.com
23+
git config --global user.signingkey AEE1036472A782AB
24+
git config --global commit.gpgsign true
25+
git config --global user.name OSBotify
26+
git config --global user.email infra+osbotify@expensify.com
2727
2828
- name: Enable debug logs for git
2929
shell: bash

.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/composite/setupNode/action.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@ outputs:
99
runs:
1010
using: composite
1111
steps:
12+
- name: Remove E/App version from package-lock.json
13+
shell: bash
14+
run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
15+
1216
- uses: actions/setup-node@v4
1317
with:
1418
node-version-file: '.nvmrc'
1519
cache: npm
1620
cache-dependency-path: |
17-
package-lock.json
21+
normalized-package-lock.json
1822
desktop/package-lock.json
1923
2024
- id: cache-node-modules

.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)