Merge branch 'master' into tma858-remind-users

# Conflicts:
#	src/components/friends/InviteFriendTile.tsx

3 files changed, 51 insertions, 12 deletions

diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
new file mode 100644
index 00000000..d5d2a2fe
--- /dev/null
+++ b/.github/auto_assign.yml
@@ -0,0 +1,31 @@
+# https://github.com/marketplace/actions/auto-assign-action
+
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set addAssignees to 'author' to set the PR creator as the assignee.
+addAssignees: author
+
+# A list of reviewers to be added to pull requests (GitHub user name)
+reviewers:
+  - IvanIFChen
+  - shravyaramesh
+  - grusuTagg
+  - brian-tagg
+
+# A number of reviewers added to the pull request
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 1
+
+# A list of assignees, overrides reviewers if set
+# assignees:
+#   - assigneeA
+
+# A number of assignees to add to the pull request
+# Set to 0 to add all of the assignees.
+# Uses numberOfReviewers if unset.
+# numberOfAssignees: 2
+
+# A list of keywords to be skipped the process that add reviewers if pull requests include it
+# skipKeywords:
+#   - wip
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b39e49be..6d068539 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -7,30 +7,24 @@
 ## Description
 <!--- Describe your changes in detail -->
 
-## Packages added (using `yarn add` or `yarn add --dev`)
-<!--- List all packages that were added in this PR and provide a succinct explanation of their use cases -->
-- **package-name** — Use case of package within project
-
 ## How Has This Been Tested?
 <!--- Please describe in detail how you tested your changes. -->
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
+- [ ] Requires testing on different screen sizes (iPhone 8, iPhone 11) (optional)
+- [ ] Requires testing on different screen sizes (iPhone 12 mini, iPhone 12 Pro Max) (optional)
 
 ## Screenshots (if appropriate)
 
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-- [ ] Documentation/repository update
+<!--- ## Packages added (using `yarn add` or `yarn add --dev`) -->
+<!--- List all packages that were added in this PR and provide a succinct explanation of their use cases -->
+<!--- - **package-name** — Use case of package within project -->
 
 ## Checklist
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask! -->
 - [ ] I thoroughly tested my changes and ensured that they integrate with existing functionality.
-- [ ] I ran `yarn lint` and `yarn type`, and I fixed any syntax or type errors that came up.
 - [ ] I ran `git pull --rebase upstream master` in my branch and resolved any merge conflicts on my end.
-- [ ] I clearly documented and detailed my code where I deemed it necessary to do so.
+- [ ] I documented my code in line with our [style guide](https://taggid.atlassian.net/wiki/spaces/~523670961/pages/891944961).
 - [ ] My changes require a change to the documentation...
   - [ ] ... which I have updated accordingly.
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
new file mode 100644
index 00000000..c7fbf844
--- /dev/null
+++ b/.github/workflows/auto-assign.yml
@@ -0,0 +1,14 @@
+# https://github.com/marketplace/actions/auto-assign-action
+
+name: 'Auto Assign'
+on:
+  pull_request:
+    types: [opened, ready_for_review]
+
+jobs:
+  add-reviews:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kentaro-m/auto-assign-action@v1.1.2
+        with:
+          configuration-path: ".github/auto_assign.yml"
\ No newline at end of file