Merge remote-tracking branch 'origin/angular-12' into angular-13

claims/linking/bulkClaim/bulkClaim.component.ts

@@ -226,7 +226,7 @@ export class BulkClaimComponent {
   }
 
   makeFileRequest(url: string, params: Array<string>, files: Array<File>) {
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       const formData: any = new FormData();
       const xhr = new XMLHttpRequest();
       for (let i = 0; i < files.length; i++) {

searchPages/searchResearchResults.component.ts

@@ -210,7 +210,7 @@ export class SearchResearchResultsComponent {
   }
 
   racePromiseWithTimeout() {
-    const timeoutPromise = new Promise((_, reject) => {
+    const timeoutPromise = new Promise<void>((_, reject) => {
       this.timeoutId = setTimeout(() => {
         this.publicCommunities = [];
         reject(new Error('Request timed out'));