Fix focus view refresh (#8460)

* Fix focus view refresh

* Move clear

* Also finally

* Copilot PR feedback

Author: alexr00

src/github/activityBarViewProvider.ts

@@ -203,7 +203,12 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				this._folderRepositoryManager.mergeQueueMethodForBranch(pullRequestModel.base.ref, pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName),
 				ensureEmojis(this._folderRepositoryManager.context),
 			]);
-			this._updatingPromise = updatingPromise;
+			const clearingPromise = updatingPromise.finally(() => {
+				if (this._updatingPromise === clearingPromise) {
+					this._updatingPromise = undefined;
+				}
+			});
+			this._updatingPromise = clearingPromise;
 			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors, mergeQueueMethod] = await updatingPromise;
 
 			if (!pullRequest) {

src/github/pullRequestOverview.ts

@@ -279,7 +279,12 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				pullRequestModel.validateDraftMode(),
 				this._folderRepositoryManager.getAssignableUsers()
 			]);
-			this._updatingPromise = updatingPromise;
+			const clearingPromise = updatingPromise.finally(() => {
+				if (this._updatingPromise === clearingPromise) {
+					this._updatingPromise = undefined;
+				}
+			});
+			this._updatingPromise = clearingPromise;
 
 			const [
 				pullRequest,
@@ -300,7 +305,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				hasReviewDraft,
 				assignableUsers
 			] = await updatingPromise;
-			this._updatingPromise = undefined;
+
 			if (!pullRequest) {
 				throw new Error(
 					`Fail to resolve Pull Request #${pullRequestModel.number} in ${pullRequestModel.remote.owner}/${pullRequestModel.remote.repositoryName}`,