Merge branch 'staging' into entry-page

Author: mvadari

.github/pull_request_template.md

@@ -34,14 +34,11 @@ Please check relevant options, delete irrelevant ones.
 ### Codebase Modernization
 
 <!--
-In an effort to modernize the codebase, you should convert the files that you work with to React Hooks and TypeScript,
-and update tests to use the React Testing Library instead of Enzyme. If this is not possible (e.g. it's too many
-changes, touching too many files, etc.) please explain why here.
+In an effort to modernize the codebase, you should convert the files that you work with to React Hooks and TypeScript If this is not possible (e.g. it's too many changes, touching too many files, etc.) please explain why here.
 -->
 
 - [ ] Updated files to React Hooks
 - [ ] Updated files to TypeScript
-- [ ] Updated tests to React Testing Library
 
 ## Before / After