From 0c10fbc83fadb40da25f35b724080b18836f7500 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 18 Apr 2023 07:28:50 -0400
Subject: [PATCH] fix: Small changes to user activation modal (no-changelog)
 (#5962)

---
 cypress/e2e/22-user-activation-modal.cy.ts                | 7 +++++++
 .../src/components/UserActivationSurveyModal.vue          | 8 ++------
 packages/editor-ui/src/main.ts                            | 4 +---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/22-user-activation-modal.cy.ts b/cypress/e2e/22-user-activation-modal.cy.ts
index 9a499d934f..6b8f23be2f 100644
--- a/cypress/e2e/22-user-activation-modal.cy.ts
+++ b/cypress/e2e/22-user-activation-modal.cy.ts
@@ -45,13 +45,20 @@ describe('User activation survey', () => {
 
 		workflowPage.actions.activateWorkflow();
 
+		cy.intercept('GET', '/rest/workflows').as('getWorkflows');
+		cy.intercept('GET', '/rest/credentials').as('getCredentials');
+		cy.intercept('GET', '/rest/active').as('getActive');
+
 		cy.request(method, `${BASE_WEBHOOK_URL}/${path}`).then((response) => {
 			expect(response.status).to.eq(200);
 			cy.visit('/');
 			cy.reload();
 
+			cy.wait(['@getWorkflows', '@getCredentials', '@getActive']);
 			userActivationSurveyModal.getters.modalContainer().should('be.visible');
+			userActivationSurveyModal.getters.feedbackInput().should('be.visible');
 			userActivationSurveyModal.getters.feedbackInput().type('testing');
+			userActivationSurveyModal.getters.feedbackInput().should('have.value', 'testing');
 			userActivationSurveyModal.getters.sendFeedbackButton().click();
 		});
 	});
diff --git a/packages/editor-ui/src/components/UserActivationSurveyModal.vue b/packages/editor-ui/src/components/UserActivationSurveyModal.vue
index 29686bd8ff..3cab5fbf59 100644
--- a/packages/editor-ui/src/components/UserActivationSurveyModal.vue
+++ b/packages/editor-ui/src/components/UserActivationSurveyModal.vue
@@ -15,7 +15,7 @@
 							<n8n-text :bold="true"> {{ workflowName }} </n8n-text>
 						</template>
 						<template #ranSuccessfully>
-							<n8n-text :bold="true" :class="$style.link">
+							<n8n-text>
 								{{
 									locale.baseText('userActivationSurveyModal.description.workflowRanSuccessfully')
 								}}
@@ -90,7 +90,7 @@ onMounted(async () => {
 			currentSettings?.firstSuccessfulWorkflowId ?? '',
 		);
 		workflowName.value = name;
-		showConfetti();
+		setTimeout(showConfetti, 500);
 	} catch (e) {}
 });
 
@@ -157,10 +157,6 @@ const showConfetti = () => {
 	margin-top: var(--spacing-l);
 }
 
-.link {
-	color: var(--color-primary);
-}
-
 .description > * {
 	font-size: var(--font-size-s);
 }
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index 97ae494704..b95beda7f2 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -49,9 +49,7 @@ router.afterEach((to, from) => {
 	runExternalHook('main.routeChange', useWebhooksStore(), { from, to });
 	const userStore = useUsersStore();
 	if (userStore.currentUser && to.name && to.name !== VIEWS.SIGNOUT && !to.name.includes('Modal')) {
-		setTimeout(() => {
-			userStore.showUserActivationSurveyModal();
-		}, 500);
+		userStore.showUserActivationSurveyModal();
 	}
 });