JS-5569: logic

anyproto · Nov 13, 2024 · 7b40fd8 · 7b40fd8
1 parent d4e57c9
commit 7b40fd8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/scss/component/emailCollectionForm.scss b/src/scss/component/emailCollectionForm.scss
@@ -7,7 +7,8 @@
 
     .buttonWrapper { padding-top: 8px; }
     .buttonWrapper {
-        .button { width: 100%; }
+        .button { width: 100%; overflow: hidden; }
+        .loaderWrapper { border-radius: 0px !important; }
     }
 
     .step0 { padding-top: 16px; }

diff --git a/src/ts/app.tsx b/src/ts/app.tsx
@@ -220,10 +220,6 @@ class App extends React.Component<object, State> {
 
 	componentDidMount () {
 		this.init();
-
-		window.setTimeout(() => {
-			Onboarding.start('emailCollection', false, true);
-		}, 1500);
 	};
 
 	init () {

diff --git a/src/ts/component/menu/onboarding.tsx b/src/ts/component/menu/onboarding.tsx
@@ -250,10 +250,19 @@ const MenuOnboarding = observer(class MenuSelect extends React.Component<I.Menu,
 
 	onClose () {
 		const { param, close } = this.props;
-		const { data } = param;
-		const { key, current } = data;
+		const { data, onClose } = param;
+		const { key, current, isPopup } = data;
+		const section = this.getSection();
+
+
+		let menuParam = Onboarding.getParam(section, {}, isPopup);
 
 		close();
+
+		if (menuParam.onClose) {
+			menuParam.onClose();
+		};
+
 		analytics.event('ClickOnboardingTooltip', { type: 'close', id: key, step: (current + 1) });
 	};
 

diff --git a/src/ts/docs/help/onboarding.ts b/src/ts/docs/help/onboarding.ts
@@ -1,4 +1,4 @@
-import { I, U, translate, S } from 'Lib';
+import { I, U, translate, S, Onboarding } from 'Lib';
 
 export default {
 	mainGraph: () => ({
@@ -106,6 +106,9 @@ export default {
 				'.widget', 
 				'#containerWidget #list .buttons',
 			],
+			onClose: () => {
+				Onboarding.start('emailCollection', false);
+			},
 		},
 		items: [
 			{