Merge branch 'develop' into 'main'

Develop

See merge request witapp/aura-webapp!123

src/api/resources/User.ts

@@ -174,6 +174,7 @@ export interface ICreateAuthorizePayload {
 
 export interface ICreateAuthorizeResponse {
   token: string;
+  userId?: string;
 }
 
 export const createAuthorizeRequest = (data: ICreateAuthorizePayload): Request => {

src/components/App/index.tsx

@@ -228,7 +228,8 @@ function App(): JSX.Element {
         return dispatch(actions.status.update("lead"));
       }
     })();
-  }, [dispatch, api, token, user]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dispatch, api, token]);
 
   useEffect(() => {
     async function getApng() {

src/components/PaymentPage/results/SuccessPage/index.tsx

@@ -13,7 +13,7 @@ function PaymentSuccessPage(): JSX.Element {
   const dispatch = useDispatch();
   const handleNext = () => {
     dispatch(actions.status.update("subscribed"));
-    navigate(routes.client.home());
+    navigate(routes.client.addReport());
   };
 
   return (

src/hooks/authentication/use-authentication.ts

@@ -114,7 +114,13 @@ export const useAuthentication = () => {
         try {
             setIsLoading(true);
             const payload = getAuthorizationPayload(email, source);
-            const { token } = await api.authorization(payload);
+            const { token, userId } = await api.authorization(payload);
+            if (userId?.length && !!window.ym) {
+                window.ym(95799066, 'userParams', {
+                    UserID: userId
+                })
+                window.ym(95799066, 'setUserID', userId);
+            }
             const { user } = await api.getUser({ token });
             signUp(token, user);
             setToken(token);

src/types.ts

@@ -22,3 +22,11 @@ export interface SignupForm {
 }
 
 export type UserStatus = "lead" | "registred" | "subscribed" | "unsubscribed";
+
+declare global {
+  interface Window {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ym: any;
+  }
+}
+