diff --git a/src/components/panels/TopLeftPanel.tsx b/src/components/panels/TopLeftPanel.tsx
index 26d92ef..ae1f8c6 100644
--- a/src/components/panels/TopLeftPanel.tsx
+++ b/src/components/panels/TopLeftPanel.tsx
@@ -1,8 +1,6 @@
-// flow
 import * as React from 'react';
 import { UserLocation } from '$components/UserLocation';
 import { DistanceBar } from '$components/panels/DistanceBar';
-import { Tooltip } from "$components/panels/Tooltip";
 
 export const TopLeftPanel = () => (
   <div className="status-panel top left">
diff --git a/src/components/panels/UserPanel.tsx b/src/components/panels/UserPanel.tsx
index 6a61d8a..2606687 100644
--- a/src/components/panels/UserPanel.tsx
+++ b/src/components/panels/UserPanel.tsx
@@ -16,10 +16,6 @@ import { IRootState } from "$redux/user/reducer";
 import { Tooltip } from "$components/panels/Tooltip";
 
 interface Props extends IRootState {
-  is_empty: boolean,
-  dialog: string,
-  dialog_active: boolean,
-
   userLogout: typeof userLogout,
   setDialog: typeof setDialog,
   setDialogActive: typeof setDialogActive,
@@ -109,7 +105,7 @@ export class Component extends React.PureComponent<Props, State> {
             }
             {
               (user && user.role && user.role !== 'guest' && menuOpened) &&
-                <UserMenu user={user} userLogout={this.props.userLogout} openAppInfoDialog={this.openAppInfoDialog} />
+                <UserMenu userLogout={this.props.userLogout} openAppInfoDialog={this.openAppInfoDialog} />
             }
           </div>
 
diff --git a/src/components/user/GuestButton.jsx b/src/components/user/GuestButton.tsx
similarity index 94%
rename from src/components/user/GuestButton.jsx
rename to src/components/user/GuestButton.tsx
index d86a020..3dd23a4 100644
--- a/src/components/user/GuestButton.jsx
+++ b/src/components/user/GuestButton.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { Icon } from '$components/panels/Icon';
 
 type Props = {
-  onClick: Function,
+  onClick: () => void,
 }
 
 export const GuestButton = ({ onClick }: Props) => (
diff --git a/src/components/user/UserButton.jsx b/src/components/user/UserButton.tsx
similarity index 62%
rename from src/components/user/UserButton.jsx
rename to src/components/user/UserButton.tsx
index 86cebe3..2c5e26b 100644
--- a/src/components/user/UserButton.jsx
+++ b/src/components/user/UserButton.tsx
@@ -1,17 +1,17 @@
 // @flow
 import * as React from 'react';
 import { UserPicture } from '$components/user/UserPicture';
-import { IUser } from '$constants/auth';
+import { IUser } from "$constants/auth";
 
-type Props = {
+interface Props {
   user: IUser,
-  setMenuOpened: Function,
-};
+  setMenuOpened: () => void,
+}
 
 export const UserButton = ({
   setMenuOpened,
   user: {
-    _id,
+    id,
     photo,
     first_name,
   }
@@ -21,8 +21,8 @@ export const UserButton = ({
       <UserPicture photo={photo} />
 
       <div className="user-button-fields">
-        <div className="user-button-name">{(first_name || _id || '...')}</div>
-        <div className="user-button-text">{(_id || 'пользователь')}</div>
+        <div className="user-button-name">{(first_name || id || '...')}</div>
+        <div className="user-button-text">{(id || 'пользователь')}</div>
       </div>
     </div>
   </div>
diff --git a/src/components/user/UserMenu.jsx b/src/components/user/UserMenu.tsx
similarity index 81%
rename from src/components/user/UserMenu.jsx
rename to src/components/user/UserMenu.tsx
index 8efbb0a..fc63909 100644
--- a/src/components/user/UserMenu.jsx
+++ b/src/components/user/UserMenu.tsx
@@ -1,9 +1,10 @@
 import * as React from 'react';
 import { APP_INFO } from '$constants/app_info';
+import { userLogout } from "$redux/user/actions";
 
-type Props = {
-  userLogout: Function,
-  openAppInfoDialog: Function,
+interface Props {
+  userLogout: typeof userLogout,
+  openAppInfoDialog: () => void,
 }
 
 export const UserMenu = ({ userLogout, openAppInfoDialog }: Props) => (
@@ -13,7 +14,7 @@ export const UserMenu = ({ userLogout, openAppInfoDialog }: Props) => (
       <br />
       MAP
       <span className="user-panel-ver">
-        - {(APP_INFO.VERSION || 1)}.{(APP_INFO.RELEASE.length || 0)}
+        - {(APP_INFO.VERSION || 1)}.{(Object.keys(APP_INFO.CHANGELOG).length || 0)}
       </span>
     </div>
     <div className="user-panel-item" onClick={openAppInfoDialog}>
diff --git a/src/components/user/UserPicture.jsx b/src/components/user/UserPicture.tsx
similarity index 100%
rename from src/components/user/UserPicture.jsx
rename to src/components/user/UserPicture.tsx
diff --git a/src/constants/auth.ts b/src/constants/auth.ts
index fea3077..32fcb90 100644
--- a/src/constants/auth.ts
+++ b/src/constants/auth.ts
@@ -12,12 +12,13 @@ export interface IUser {
   success: boolean,
   id?: string,
   token?: string,
-  userdata: {
-    name: string,
-    agent: string,
-    ip: string,
-    photo: string,
-  }
+  photo: string,
+  first_name: string,
+  // userdata: {
+  //   name: string,
+  //   agent: string,
+  //   ip: string,
+  // }
 }
 
 export const ROLES: IRoles = {
@@ -34,10 +35,6 @@ export const DEFAULT_USER: IUser = {
   success: false,
   id: null,
   token: null,
-  userdata: {
-    name: '',
-    agent: '',
-    ip: '',
-    photo: '',
-  }
+  photo: null,
+  first_name: null,
 };