Merge remote-tracking branch 'origin/master' into monaco_editor_refactoring

# Conflicts:
#	src/common/user-store/preferences-helpers.ts
#	src/common/user-store/user-store.ts

integration/__tests__/app-preferences.tests.ts

@@ -33,7 +33,7 @@ describe("preferences page tests", () => {
 
   beforeEach(async () => {
     let app: ElectronApplication;
-    
+
     ({ window, cleanup, app } = await utils.start());
     await utils.clickWelcomeButton(window);
 
@@ -74,7 +74,7 @@ describe("preferences page tests", () => {
   utils.itIf(process.platform !== "win32")("ensures helm repos", async () => {
     await window.click("[data-testid=kubernetes-tab]");
     await window.waitForSelector("[data-testid=repository-name]", {
-      timeout: 100_000,
+      timeout: 140_000,
     });
     await window.click("#HelmRepoSelect");
     await window.waitForSelector("div.Select__option");

integration/helpers/utils.ts

@@ -93,7 +93,7 @@ export async function start() {
 }
 
 export async function clickWelcomeButton(window: Page) {
-  await window.click("#hotbarIcon-catalog-entity .Icon");
+  await window.click("[data-testid=welcome-menu-container] li a");
 }
 
 function minikubeEntityId() {