Dismiss entitlements badge on cancel (microsoft#210807)

Author: bhavyaus

src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts

@@ -79,6 +79,11 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 
 	private registerListeners() {
 
+		if (this.storageService.getBoolean(accountsBadgeConfigKey, StorageScope.APPLICATION) === false) {
+			// we have already shown the entitlements. Do not show again
+			return;
+		}
+
 		this._register(this.extensionService.onDidChangeExtensions(async (result) => {
 			for (const ext of result.added) {
 				if (ExtensionIdentifier.equals(this.productService.gitHubEntitlement!.extensionId, ext.identifier)) {
@@ -178,7 +183,15 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 		const menuTitle = org ? this.productService.gitHubEntitlement!.command.title.replace('{{org}}', org) : this.productService.gitHubEntitlement!.command.titleWithoutPlaceHolder;
 
 		const badge = new NumberBadge(1, () => menuTitle);
-		this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge, });
+		this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
+
+		this.contextService.onDidChangeContext(e => {
+			if (e.affectsSome(new Set([accountsBadgeConfigKey]))) {
+				if (!this.contextService.getContextKeyValue<boolean>(accountsBadgeConfigKey)) {
+					this.accountsMenuBadgeDisposable.clear();
+				}
+			}
+		});
 
 		this._register(registerAction2(class extends Action2 {
 			constructor() {
@@ -221,7 +234,7 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 					});
 				}
 
-				const contextKey = new RawContextKey<boolean>(accountsBadgeConfigKey, true).bindTo(contextKeyService);
+				const contextKey = new RawContextKey<boolean>(accountsBadgeConfigKey, false).bindTo(contextKeyService);
 				contextKey.set(false);
 				storageService.store(accountsBadgeConfigKey, false, StorageScope.APPLICATION, StorageTarget.MACHINE);
 			}