Skip to content

Commit adde95c

Browse files
committedJul 6, 2023
Merge main into branch
2 parents c613590 + afaf337 commit adde95c

File tree

179 files changed

+3553
-2408
lines changed

Some content is hidden

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

179 files changed

+3553
-2408
lines changed
 

‎.github/PULL_REQUEST_TEMPLATE.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
### Fixed Issues
77
<!---
8-
1. Please replace GH_LINK with a URL link to the GitHub issue this Pull Request is fixing.
9-
2. Please replace PROPOSAL: GH_LINK_ISSUE(COMMENT) with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify).
8+
1. Please postfix `$` with a URL link to the GitHub issue this Pull Request is fixing. For example, `$ https://github.com/Expensify/App/issues/123`.
9+
2. Please postfix `PROPOSAL:` with a URL link to your GitHub comment, which contains the approved proposal (i.e. the proposal that was approved by Expensify). For example, `PROPOSAL: https://github.com/Expensify/App/issues/123#issuecomment-1369752925`
1010
1111
Do NOT add the special GH keywords like `fixed` etc, we have our own process of managing the flow.
12-
It MUST be an entire link to the github issue and your comment proposal ; otherwise, the linking will not work as expected.
12+
It MUST be an entire link to the github issue and your comment proposal ; otherwise, the linking and its automation will not work as expected.
1313
1414
Make sure this section looks similar to this (you can link multiple issues using the same formatting, just add a new line):
1515
@@ -18,8 +18,8 @@ $ https://github.com/Expensify/App/issues/<number-of-the-issue(comment)>
1818
1919
Do NOT only link the issue number like this: $ #<number-of-the-issue>
2020
--->
21-
$ GH_LINK
22-
PROPOSAL: GH_LINK_ISSUE(COMMENT)
21+
$
22+
PROPOSAL:
2323

2424

2525
### Tests
@@ -100,6 +100,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
100100
- [ ] The file is named correctly
101101
- [ ] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
102102
- [ ] The only data being stored in the state is data necessary for rendering and nothing else
103+
- [ ] If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
103104
- [ ] 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)
104105
- [ ] 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`)
105106
- [ ] All JSX used for rendering exists in the render method

‎android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ android {
106106
minSdkVersion rootProject.ext.minSdkVersion
107107
targetSdkVersion rootProject.ext.targetSdkVersion
108108
multiDexEnabled rootProject.ext.multiDexEnabled
109-
versionCode 1001033505
110-
versionName "1.3.35-5"
109+
versionCode 1001033703
110+
versionName "1.3.37-3"
111111
}
112112

113113
splits {

0 commit comments

Comments
 (0)