Skip to content

Commit ae3dc67

Browse files
committed
Fix conflicts
2 parents ca1b09e + 83f0094 commit ae3dc67

File tree

172 files changed

+49781
-7614
lines changed

Some content is hidden

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

172 files changed

+49781
-7614
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: 'expensify',
2+
extends: ['expensify', 'plugin:storybook/recommended'],
33
parser: 'babel-eslint',
44
ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js'],
55
env: {

.github/CODEOWNERS

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
11
# Every PR gets a review from an internal Expensify engineer
22
* @Expensify/pullerbear
3-
4-
# Performance sensitive and problem areas
5-
src/pages/home/report/ReportActionsView.js @marcaaron
6-
src/libs/OptionsListUtils.js @marcaaron
7-
src/libs/Network.js @marcaaron
8-
src/libs/actions/Report.js @marcaaron
9-
src/pages/LogInWithShortLivedTokenPage.js @marcaaron
10-
src/pages/home/ReportScreen.js @marcaaron
11-
src/components/InvertedFlatList @marcaaron
12-
src/components/OptionsList @marcaaron
13-
src/components/OptionsSelector.js @marcaaron
14-
src/libs/Navigation/CustomActions.js @marcaaron
15-
src/libs/Navigation/Navigation.js @marcaaron
16-
src/libs/Navigation/NavigationRoot.js @marcaaron
17-
src/libs/NetworkConnection.js @marcaaron
18-
src/libs/actions/NetworkRequestQueue.js @marcaaron
19-
src/libs/actions/ReportActions.js @marcaaron

.github/ISSUE_TEMPLATE/Accessibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Accessibility issue template
33
about: A template to follow when creating a new issue for accessibility failures
44
---
55

6-
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
6+
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/docs/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
77
___
88

99
## Action Performed:

.github/ISSUE_TEMPLATE/Performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: "[Performance] "
55
labels: Engineering, Daily
66
---
77

8-
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
8+
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/docs/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
99
___
1010

1111
## What performance issue do we need to solve?

.github/ISSUE_TEMPLATE/Standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: A standard template to follow when creating a new issue in this repositor
44
labels: AutoAssignerTriage, Daily
55
---
66

7-
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
7+
If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/docs/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
88
___
99

1010
## Action Performed:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
4242
- [ ] I added steps for Staging and/or Production testing in the `QA steps` section
4343
- [ ] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
4444
- [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
45-
- [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
45+
- [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/docs/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
4646
- [ ] I ran the tests on **all platforms** & verified they passed on:
4747
- [ ] iOS / native
4848
- [ ] Android / native
4949
- [ ] iOS / Safari
5050
- [ ] Android / Chrome
5151
- [ ] MacOS / Chrome
5252
- [ ] MacOS / Desktop
53-
- [ ] I verified there are no console errors (if theres a console error not related to the PR, report it or open an issue for it to be fixed)
54-
- [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
53+
- [ ] 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)
54+
- [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/docs/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
5555
- [ ] 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`)
5656
- [ ] I verified that comments were added to code that is not self explanatory
57-
- [ ] 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.
57+
- [ ] 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.
5858
- [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files
5959
- [ ] I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
60-
- [ ] 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.
61-
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed
60+
- [ ] 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.
61+
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/docs/STYLE.md#jsdocs)) were followed
6262
- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
63-
- [ ] I followed the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md)
63+
- [ ] I followed the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/docs/PR_REVIEW_GUIDELINES.md)
6464
- [ ] I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` are working as expected)
6565
- [ ] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
6666
- [ ] I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
@@ -74,42 +74,47 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
7474
- [ ] For Class Components, any internal methods passed to components event handlers are bound to `this` properly so there are no scoping issues (i.e. for `onClick={this.submit}` the method `this.submit` should be bound to `this` in the constructor)
7575
- [ ] Any internal methods bound to `this` are necessary to be bound (i.e. avoid `this.submit = this.submit.bind(this);` if `this.submit` is never passed to a component event handler like `onClick`)
7676
- [ ] All JSX used for rendering exists in the render method
77-
- [ ] The component has the minimum amount of code necessary for its purpose and it is
77+
- [ ] The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
7878
- [ ] If a new CSS style is added I verified that:
79-
- [ ] A similar style doesnt already exist
80-
- [ ] The style cant be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
79+
- [ ] A similar style doesn't already exist
80+
- [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
8181
- [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
8282
- [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
83-
83+
- [ ] I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.
8484

8585
<details>
86-
<summary><h4>PR Reviewer Checklist</h4></summary>
86+
<summary><h4>PR Reviewer Checklist</h4>
87+
88+
The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed
89+
</summary>
8790

91+
- [ ] I have verified the author checklist is complete (all boxes are checked off).
8892
- [ ] I verified the correct issue is linked in the `### Fixed Issues` section above
8993
- [ ] I verified testing steps are clear and they cover the changes made in this PR
9094
- [ ] I verified the steps for local testing are in the `Tests` section
9195
- [ ] I verified the steps for Staging and/or Production testing are in the `QA steps` section
9296
- [ ] I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
9397
- [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
94-
- [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
98+
- [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/docs/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
9599
- [ ] I verified tests pass on **all platforms** & I tested again on:
96100
- [ ] iOS / native
97101
- [ ] Android / native
98102
- [ ] iOS / Safari
99103
- [ ] Android / Chrome
100104
- [ ] MacOS / Chrome
101105
- [ ] MacOS / Desktop
102-
- [ ] I verified there are no console errors (if theres a console error not related to the PR, report it or open an issue for it to be fixed)
103-
- [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
106+
- [ ] 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)
107+
- [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/docs/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
104108
- [ ] 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`).
105109
- [ ] I verified that comments were added to code that is not self explanatory
106-
- [ ] 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.
110+
- [ ] 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.
107111
- [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files
108112
- [ ] I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
109-
- [ ] 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.
110-
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed
113+
- [ ] 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.
114+
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/docs/STYLE.md#jsdocs)) were followed
111115
- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
112-
- [ ] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md)
116+
- [ ] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/docs/PR_REVIEW_GUIDELINES.md)
117+
- [ ] I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` have been tested & I retested again)
113118
- [ ] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
114119
- [ ] I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
115120
- [ ] If a new component is created I verified that:
@@ -122,12 +127,13 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
122127
- [ ] For Class Components, any internal methods passed to components event handlers are bound to `this` properly so there are no scoping issues (i.e. for `onClick={this.submit}` the method `this.submit` should be bound to `this` in the constructor)
123128
- [ ] Any internal methods bound to `this` are necessary to be bound (i.e. avoid `this.submit = this.submit.bind(this);` if `this.submit` is never passed to a component event handler like `onClick`)
124129
- [ ] All JSX used for rendering exists in the render method
125-
- [ ] The component has the minimum amount of code necessary for its purpose and it is broken down into smaller components in order to separate concerns and functions
130+
- [ ] The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
126131
- [ ] If a new CSS style is added I verified that:
127-
- [ ] A similar style doesnt already exist
128-
- [ ] The style cant be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
132+
- [ ] A similar style doesn't already exist
133+
- [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
129134
- [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
130135
- [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
136+
- [ ] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
131137

132138
</details>
133139

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: 'Announce failed workflow in Slack'
2+
description: 'Post failed workflow in Slack #announce channel'
3+
4+
inputs:
5+
SLACK_WEBHOOK:
6+
description: 'URL of the slack webhook'
7+
required: true
8+
9+
runs:
10+
using: composite
11+
steps:
12+
- uses: 8398a7/action-slack@v3
13+
name: Job failed Slack notification
14+
with:
15+
status: custom
16+
fields: workflow, repo
17+
custom_payload: |
18+
{
19+
channel: '#announce',
20+
attachments: [{
21+
color: "#DB4545",
22+
pretext: `<!subteam^S4TJJ3PSL>`,
23+
text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
24+
}]
25+
}
26+
env:
27+
GITHUB_TOKEN: ${{ github.token }}
28+
SLACK_WEBHOOK_URL: ${{ inputs.SLACK_WEBHOOK }}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: 'Setup Git for OSBotify'
2+
description: 'Setup Git for OSBotify'
3+
4+
inputs:
5+
GPG_PASSPHRASE:
6+
description: 'Passphrase used to decrypt GPG key'
7+
required: true
8+
9+
runs:
10+
using: composite
11+
steps:
12+
- name: Decrypt OSBotify GPG key
13+
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase=${{ inputs.GPG_PASSPHRASE }} --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
14+
shell: bash
15+
16+
- name: Import OSBotify GPG Key
17+
shell: bash
18+
run: cd .github/workflows && gpg --import OSBotify-private-key.asc
19+
20+
- name: Set up git for OSBotify
21+
shell: bash
22+
run: |
23+
git config user.signingkey 367811D53E34168C
24+
git config commit.gpgsign true
25+
git config user.name OSBotify
26+
git config user.email [email protected]

0 commit comments

Comments
 (0)