[NO JIRA] Fix returning promises where void is expected

2 files changed, 15 insertions, 8 deletions

diff --git a/server/sonar-web/src/main/js/app/components/branch-status/BranchStatusContextProvider.tsx b/server/sonar-web/src/main/js/app/components/branch-status/BranchStatusContextProvider.tsx
index 8ff18aefaa4..cf2d2ba3279 100644
--- a/server/sonar-web/src/main/js/app/components/branch-status/BranchStatusContextProvider.tsx
+++ b/server/sonar-web/src/main/js/app/components/branch-status/BranchStatusContextProvider.tsx
@@ -89,7 +89,11 @@ export default class BranchStatusContextProvider extends React.PureComponent<{},
       <BranchStatusContext.Provider
         value={{
           branchStatusByComponent: this.state.branchStatusByComponent,
-          fetchBranchStatus: this.fetchBranchStatus,
+          fetchBranchStatus: (branchLike: BranchLike, projectKey: string) => {
+            this.fetchBranchStatus(branchLike, projectKey).catch(() => {
+              /* noop */
+            });
+          },
           updateBranchStatus: this.updateBranchStatus,
         }}
       >
diff --git a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts
index 1eb4396e0e3..1840a9178a9 100644
--- a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts
+++ b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts
@@ -28,15 +28,18 @@ const LS_INDEXATION_COMPLETED_NOTIFICATION_SHOULD_BE_DISPLAYED =
 export default class IndexationNotificationHelper {
   private static interval?: NodeJS.Timeout;
 
-  static startPolling(onNewStatus: (status: IndexationStatus) => void) {
+  static async startPolling(onNewStatus: (status: IndexationStatus) => void) {
     this.stopPolling();
 
-    // eslint-disable-next-line promise/catch-or-return
-    this.poll(onNewStatus).then((status) => {
-      if (!status.isCompleted) {
-        this.interval = setInterval(() => this.poll(onNewStatus), POLLING_INTERVAL_MS);
-      }
-    });
+    const status = await this.poll(onNewStatus);
+
+    if (!status.isCompleted) {
+      this.interval = setInterval(() => {
+        this.poll(onNewStatus).catch(() => {
+          /* noop */
+        });
+      }, POLLING_INTERVAL_MS);
+    }
   }
 
   static stopPolling() {