Clean up

Author: alexr00

src/github/pullRequestOverview.ts

@@ -653,10 +653,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 
 	private async setReadyForReviewAndMerge(message: IRequestMessage<{ mergeMethod: MergeMethod }>): Promise<void> {
 		try {
-			// Step 1: Mark as ready for review
 			const readyResult = await this._item.setReadyForReview();
 
-			// Step 2: Approve the PR
 			try {
 				await this._item.approve(this._folderRepositoryManager.repository, '');
 			} catch (e) {
@@ -665,7 +663,6 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				return;
 			}
 
-			// Step 3: Enable auto-merge
 			try {
 				await this._item.enableAutoMerge(message.args.mergeMethod);
 			} catch (e) {
@@ -674,7 +671,6 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				return;
 			}
 
-			// Return the ready result to update the UI
 			this._replyMessage(message, readyResult);
 		} catch (e) {
 			vscode.window.showErrorMessage(`Unable to mark pull request as ready for review. ${formatError(e)}`);

webviews/components/merge.tsx

@@ -298,10 +298,12 @@ export const ReadyForReview = ({ isSimple, isCopilotOnMyBehalf, mergeMethod }: {
 
 	const markReadyAndMerge = useCallback(async () => {
 		try {
+			setBusy(true);
 			setMergeBusy(true);
 			const result = await readyForReviewAndMerge({ mergeMethod: mergeMethod });
 			updatePR(result);
 		} finally {
+			setBusy(false);
 			setMergeBusy(false);
 		}
 	}, [readyForReviewAndMerge, updatePR, mergeMethod]);
@@ -319,15 +321,15 @@ export const ReadyForReview = ({ isSimple, isCopilotOnMyBehalf, mergeMethod }: {
 				{isCopilotOnMyBehalf && (
 					<button
 						className="icon-button"
-						disabled={isBusy || isMergeBusy}
+						disabled={isBusy}
 						onClick={markReadyAndMerge}
 						title="Mark as ready for review, approve, and enable auto-merge with default merge method"
 						aria-label="Ready for Review, Approve, and Auto-Merge"
 					>
 						{isMergeBusy ? loadingIcon : checkAllIcon}
 					</button>
 				)}
-				<button disabled={isBusy || isMergeBusy} onClick={markReadyForReview}>Ready for Review</button>
+				<button disabled={isBusy} onClick={markReadyForReview}>Ready for Review</button>
 			</div>
 		</div>
 	);