Skip to content

Commit 3d3b4ed

Browse files
committed
Merge branch 'main' into marco-clearDuplicateTransactions
2 parents 234327d + fd94469 commit 3d3b4ed

File tree

1,033 files changed

+806663
-54033
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,033 files changed

+806663
-54033
lines changed

.env.example

+2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ USE_WEB_PROXY=false
1111
USE_WDYR=false
1212
CAPTURE_METRICS=false
1313
ONYX_METRICS=false
14+
USE_THIRD_PARTY_SCRIPTS=false
1415

1516
EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
17+
EXPENSIFY_ACCOUNT_ID_ACCOUNTS_PAYABLE=-1
1618
EXPENSIFY_ACCOUNT_ID_ADMIN=-1
1719
EXPENSIFY_ACCOUNT_ID_BILLS=-1
1820
EXPENSIFY_ACCOUNT_ID_CHRONOS=-1

.env.production

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ USE_WEB_PROXY=false
88
ENVIRONMENT=production
99
SEND_CRASH_REPORTS=true
1010

11-
FB_API_KEY=AIzaSyDxzigVLZl4G8MP7jACQ0qpmADMzmrrON0
12-
FB_APP_ID=1:921154746561:web:1583e882584cf151027c40
13-
FB_PROJECT_ID=expensify-chat
11+
FB_API_KEY=AIzaSyBrLKgCuo6Vem6Xi5RPokdumssW8HaWBow
12+
FB_APP_ID=1:1008697809946:web:08de4ecb7656b7235445a3
13+
FB_PROJECT_ID=expensify-mobile-app

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ module.exports = {
294294
files: ['*.ts', '*.tsx'],
295295
rules: {
296296
'rulesdir/prefer-at': 'error',
297+
'rulesdir/boolean-conditional-rendering': 'error',
297298
},
298299
},
299300
],

.github/ISSUE_TEMPLATE/Internal.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Open an internal issue for a backend fix
3+
about: Use this template to report a backend issue that an internal Expensify employee needs to fix
4+
labels: Daily, Internal, AutoAssignerNewDotQuality
5+
---
6+
7+
<!-- Please link the original GH where the problem was reported -->
8+
**Original GH:**
9+
10+
## Action Performed:
11+
Break down in numbered steps
12+
13+
## Expected Result:
14+
Describe what you think the backend _SHOULD_ have done
15+
16+
## Actual Result:
17+
Describe what the backend _ACTUALLY_ did
18+
19+
## Screenshots/Videos
20+
21+
<details>
22+
<summary>Add any screenshot/video evidence</summary>
23+
24+
25+
</details>

.github/ISSUE_TEMPLATE/Standard.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ___
1616
**Logs:** https://stackoverflow.com/c/expensify/questions/4856
1717
**Expensify/Expensify Issue URL:**
1818
**Issue reported by:**
19-
**Slack conversation:**
19+
**Slack conversation** (hyperlinked to channel name):
2020

2121
## Action Performed:
2222
Break down in numbered steps

.github/PULL_REQUEST_TEMPLATE.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ For example:
5151
1. Click on the text input to bring it into focus
5252
2. Upload an image via copy paste
5353
3. Verify a modal appears displaying a preview of that image
54+
55+
It's acceptable to write "Same as tests" if the QA team is able to run the tests in the above "Tests" section.
5456
--->
57+
// TODO: These must be filled out, or the issue title must include "[No QA]."
5558

5659
- [ ] Verify that no errors appear in the JS console
5760

@@ -79,11 +82,10 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
7982
- [ ] I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
8083
- [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
8184
- [ ] 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`)
82-
- [ ] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. `myBool && <MyComponent />`.
8385
- [ ] I verified that comments were added to code that is not self explanatory
8486
- [ ] 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.
8587
- [ ] 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)
86-
- [ ] If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
88+
- [ ] 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:
8789
- [ ] 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)
8890
- [ ] 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)
8991
- [ ] 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.

0 commit comments

Comments
 (0)