@coopenomics/desktop 2025.11.17-alpha-4 → 2025.11.18-alpha-1

package/extensions/capital/features/Commit/CreateCommit/ui/CreateCommitButton.vue

@@ -33,7 +33,7 @@ q-btn(
 import { ref, watch } from 'vue';
 import { useCreateCommit } from '../model';
 import { useSystemStore } from 'src/entities/System/model';
-import { useCurrentUser } from 'src/entities/Session/composables/useCurrentUser';
+import { useSessionStore } from 'src/entities/Session';
 import { generateUniqueHash } from 'src/shared/lib/utils/generateUniqueHash';
 import { FailAlert, SuccessAlert } from 'src/shared/api/alerts';
 import { ModalBase } from 'src/shared/ui/ModalBase';
@@ -49,8 +49,8 @@ const props = defineProps<{
 }>();
 
 const system = useSystemStore();
-const { username } = useCurrentUser();
-const { createCommit, createCommitInput } = useCreateCommit(props.projectHash, username);
+const session = useSessionStore();
+const { createCommit, createCommitInput } = useCreateCommit(props.projectHash, session.username);
 
 const loading = ref(false);
 const showDialog = ref(false);
@@ -88,7 +88,7 @@ const handleCreateCommit = async () => {
       coopname: system.info.coopname,
       commit_hours: formData.value.creator_hours,
       project_hash: props.projectHash || createCommitInput.value.project_hash,
-      username: username || createCommitInput.value.username,
+      username: session.username || createCommitInput.value.username,
       description: formData.value.description,
       meta: JSON.stringify({}),
     };

package/extensions/capital/pages/ProjectsListPage/ui/ProjectsListPage.vue

@@ -38,7 +38,7 @@ div
               )
 
   // Floating Action Button для создания проекта
-  Fab(v-if='currentUser.isChairman || currentUser.isMember')
+  Fab(v-if='session.isChairman || session.isMember')
     template(#actions)
       CreateProjectFabAction
 </template>
@@ -53,11 +53,11 @@ import { Fab } from 'src/shared/ui';
 import { CreateProjectFabAction } from 'app/extensions/capital/features/Project/CreateProject';
 import { ProjectsListWidget, ComponentsListWidget, IssuesListWidget, ListFilterWidget } from 'app/extensions/capital/widgets';
 import { useProjectFilters } from 'app/extensions/capital/widgets/ListFilterWidget/useProjectFilters';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useProjectStore } from 'app/extensions/capital/entities/Project/model';
 
 const router = useRouter();
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 const projectStore = useProjectStore();
 
 // Используем композабл для управления фильтрами

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.11.17-alpha-4",
+  "version": "2025.11.18-alpha-1",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -25,9 +25,9 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.11.17-alpha-4",
-    "@coopenomics/notifications": "2025.11.17-alpha-4",
-    "@coopenomics/sdk": "2025.11.17-alpha-4",
+    "@coopenomics/controller": "2025.11.18-alpha-1",
+    "@coopenomics/notifications": "2025.11.18-alpha-1",
+    "@coopenomics/sdk": "2025.11.18-alpha-1",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@editorjs/code": "^2.9.3",
@@ -59,7 +59,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.11.17-alpha-4",
+    "cooptypes": "2025.11.18-alpha-1",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -123,5 +123,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "16393dbc9d82015b329840ea57f0bff498f08556"
+  "gitHead": "86172790d1a19def4062384a0aa1f67f40ca51cf"
 }

package/src/app/layouts/useDefaultLayoutLogic.ts

@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useWindowSize } from 'vue-window-size';
 import { useSystemStore } from 'src/entities/System/model';
 import { useSessionStore } from 'src/entities/Session';
-import { useCurrentUser } from 'src/entities/Session';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 
 export function useDefaultLayoutLogic() {
@@ -12,7 +11,6 @@ export function useDefaultLayoutLogic() {
   const { width } = useWindowSize();
   const route = useRoute();
   const session = useSessionStore();
-  const currentUser = useCurrentUser();
   const system = useSystemStore();
   const desktop = useDesktopStore();
 
@@ -32,7 +30,7 @@ export function useDefaultLayoutLogic() {
   );
 
   const isRegistrationComplete = computed(
-    () => currentUser.isRegistrationComplete.value,
+    () => session.isRegistrationComplete,
   );
 
   const loggedIn = computed(

package/src/entities/CmdkMenu/model/store.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia';
 import { computed, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { useSystemStore } from 'src/entities/System/model';
 import type { PageItem, GroupedItem } from './types';
@@ -11,7 +11,7 @@ const namespace = 'cmdk-menu';
 export const useCmdkMenuStore = defineStore(namespace, () => {
   // Composables
   const router = useRouter();
-  const user = useCurrentUser();
+  const session = useSessionStore();
   const desktop = useDesktopStore();
   const { info } = useSystemStore();
 
@@ -71,7 +71,7 @@ export const useCmdkMenuStore = defineStore(namespace, () => {
 
 // Вычисляем роль пользователя
 const userRole = computed(() =>
-  user.isChairman.value ? 'chairman' : user.isMember.value ? 'member' : 'user'
+  session.isChairman ? 'chairman' : session.isMember ? 'member' : 'user'
 );
 
 // Группировка воркспейсов с их страницами
@@ -100,10 +100,10 @@ const groupedItems = computed<GroupedItem[]>(() => {
             page.meta.roles.length === 0;
           const conditionMatch = page.meta?.conditions
               ? evaluateCondition(page.meta.conditions, {
-                isCoop: user.privateAccount.value?.type === 'organization' &&
-                       user.privateAccount.value?.organization_data?.type?.toUpperCase() === 'COOP',
+                isCoop: session.privateAccount?.type === 'organization' &&
+                       session.privateAccount?.organization_data?.type?.toUpperCase() === 'COOP',
                 userRole: userRole.value,
-                userAccount: user.privateAccount.value,
+                userAccount: session.privateAccount,
                 coopname: info.coopname,
               })
             : true;

package/src/entities/Desktop/model/store.ts

@@ -7,7 +7,7 @@ import type {
 } from './types';
 import { api } from '../api';
 import { useSystemStore } from 'src/entities/System/model';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 
 interface WorkspaceMenuItem {
   workspaceName: string;
@@ -139,12 +139,12 @@ export const useDesktopStore = defineStore(namespace, () => {
 
     // Получаем настройки системы
     const systemStore = useSystemStore();
-    const currentUser = useCurrentUser();
+    const session = useSessionStore();
 
     let defaultWorkspace = 'participant'; // дефолтное значение
 
     // Определяем, какие настройки использовать (авторизованный или неавторизованный пользователь)
-    if (currentUser.isAuth) {
+    if (session.isAuth) {
       // Для авторизованных пользователей используем authorized_default_workspace
       defaultWorkspace = systemStore.info?.settings?.authorized_default_workspace || 'participant';
     } else {
@@ -242,7 +242,7 @@ export const useDesktopStore = defineStore(namespace, () => {
     params: Record<string, any>;
   } | null {
     const { info } = useSystemStore();
-    const currentUser = useCurrentUser();
+    const session = useSessionStore();
 
     if (!currentDesktop.value || !activeWorkspaceName.value) {
       return null;
@@ -260,7 +260,7 @@ export const useDesktopStore = defineStore(namespace, () => {
     // Проверяем, есть ли настроенный маршрут для текущего рабочего стола
     let configuredRoute: string | undefined;
 
-    if (currentUser.isAuth) {
+    if (session.isAuth) {
       // Для авторизованных пользователей используем authorized_default_route
       configuredRoute = info?.settings?.authorized_default_route;
     } else {

package/src/entities/Session/index.ts

@@ -1,3 +1,2 @@
 export * from './api';
 export * from './model/store';
-export * from './composables/useCurrentUser';

package/src/entities/Session/model/store.ts

@@ -19,10 +19,17 @@ interface ISessionStore {
   // Добавляю данные текущего пользователя
   currentUserAccount: Ref<IAccount | undefined>;
   setCurrentUserAccount: (account: IAccount | undefined) => void;
+  clearAccount: () => void;
   // Computed свойства для текущего пользователя
   isRegistrationComplete: ComputedRef<boolean>;
   isChairman: ComputedRef<boolean>;
   isMember: ComputedRef<boolean>;
+  // Удобные геттеры для различных типов данных
+  userAccount: ComputedRef<IAccount['user_account'] | undefined>;
+  privateAccount: ComputedRef<IAccount['private_account'] | undefined>;
+  blockchainAccount: ComputedRef<IAccount['blockchain_account'] | undefined>;
+  participantAccount: ComputedRef<IAccount['participant_account'] | undefined>;
+  providerAccount: ComputedRef<IAccount['provider_account'] | undefined>;
 }
 
 export const useSessionStore = defineStore('session', (): ISessionStore => {
@@ -37,6 +44,10 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
     currentUserAccount.value = account;
   };
 
+  const clearAccount = () => {
+    setCurrentUserAccount(undefined);
+  };
+
   const close = async (): Promise<void> => {
     isAuth.value = false;
     session.value = undefined;
@@ -87,6 +98,19 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
     () => currentUserAccount.value?.provider_account?.role === 'member',
   );
 
+  // Удобные геттеры для различных типов данных
+  const userAccount = computed(() => currentUserAccount.value?.user_account);
+  const privateAccount = computed(() => currentUserAccount.value?.private_account);
+  const blockchainAccount = computed(
+    () => currentUserAccount.value?.blockchain_account,
+  );
+  const participantAccount = computed(
+    () => currentUserAccount.value?.participant_account,
+  );
+  const providerAccount = computed(
+    () => currentUserAccount.value?.provider_account,
+  );
+
   const username = computed(() => globalStore.username);
 
   return {
@@ -98,8 +122,15 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
     loadComplete,
     currentUserAccount,
     setCurrentUserAccount,
+    clearAccount,
     isRegistrationComplete,
     isChairman,
     isMember,
+    // Удобные геттеры для различных типов данных
+    userAccount,
+    privateAccount,
+    blockchainAccount,
+    participantAccount,
+    providerAccount,
   };
 });

package/src/entities/User/index.ts

@@ -2,6 +2,3 @@ export * from './ui';
 export * from './api';
 export * from './model';
 
-// Старая система User удалена
-// Используйте useCurrentUser из entities/Session
-export { useCurrentUser as useCurrentUserStore } from 'src/entities/Session';

package/src/features/User/CreateUser/model/index.ts

@@ -9,7 +9,6 @@ import { useGlobalStore } from 'src/shared/store';
 import { useSystemStore } from 'src/entities/System/model';
 
 import type { IInitialPaymentOrder } from 'src/shared/lib/types/payments';
-import { useCurrentUser } from 'src/entities/Session';
 import { useRegistratorStore } from 'src/entities/Registrator';
 import {
   IEntrepreneurData,
@@ -233,14 +232,13 @@ export function useCreateUser() {
 
     await sessionStore.init();
 
-    const currentUser = useCurrentUser();
     const accountStore = useAccountStore();
     // После создания пользователя обновляем данные в сессии
     const updatedAccount = await accountStore.getAccount(account.username);
     if (updatedAccount) {
       console.log('updatedAccount: ', updatedAccount);
 
-      currentUser.setCurrentUserAccount(updatedAccount);
+      sessionStore.setCurrentUserAccount(updatedAccount);
     }
   }
 

package/src/features/User/LoginUser/model/index.ts

@@ -2,7 +2,6 @@ import { useSessionStore } from 'src/entities/Session';
 import { useGlobalStore } from 'src/shared/store';
 import { api } from '../api';
 import { client } from 'src/shared/api/client';
-import { useCurrentUser } from 'src/entities/Session';
 import { useRegistratorStore } from 'src/entities/Registrator';
 import type { ITokens } from 'src/shared/lib/types/user';
 import { useInitWalletProcess } from 'src/processes/init-wallet';
@@ -10,7 +9,7 @@ import type { Zeus } from '@coopenomics/sdk';
 
 export function useLoginUser() {
   const globalStore = useGlobalStore();
-  const currentUser = useCurrentUser();
+  const session = useSessionStore();
 
   async function login(email: string, wif: string): Promise<void> {
     const auth = await api.loginUser(email, wif);
@@ -30,17 +29,15 @@ export function useLoginUser() {
     await globalStore.setWif(account.username, wif);
     await globalStore.setTokens(adaptedTokens);
 
-    const session = useSessionStore();
     await session.init();
     client.setToken(auth.tokens.access.token);
 
     const { run } = useInitWalletProcess();
     await run(); //запускаем фоновое обновление кошелька - заменить на подписку потом
-    if (!currentUser.isRegistrationComplete.value) {
+    if (!session.isRegistrationComplete) {
       const { state, steps } = useRegistratorStore();
-      state.userData.type = currentUser.privateAccount.value
-        ?.type as Zeus.AccountType;
-      const privateData = currentUser.privateAccount.value;
+      state.userData.type = session?.privateAccount?.type as Zeus.AccountType;
+      const privateData = session?.privateAccount;
 
       // Для каждого типа пользователя берём нужное поле и, если оно существует, переносим совпадающие ключи
       const dataMap = {
@@ -59,15 +56,15 @@ export function useLoginUser() {
       }
 
       //continue registration process here
-      state.account.username = currentUser.username as string;
+      state.account.username = session.username as string;
       state.account.private_key = wif;
-      state.account.public_key = currentUser.providerAccount.value
+      state.account.public_key = session.providerAccount
         ?.public_key as string;
 
-      state.email = currentUser.providerAccount.value?.email as string;
+      state.email = session.providerAccount?.email as string;
 
       // Статус берем из userAccount, не providerAccount
-      const userStatus = currentUser.userAccount.value?.status;
+      const userStatus = session.userAccount?.status;
       if (userStatus === 'created') state.step = steps.ReadStatement;
       else if (userStatus === 'joined') state.step = steps.PayInitial;
       else if (userStatus === 'payed') state.step = steps.WaitingRegistration;

package/src/features/User/LoginUser/ui/LoginForm/LoginForm.vue

@@ -34,7 +34,6 @@ form.full-width(@submit.prevent='submit')
   )
 </template>
 <script lang="ts" setup>
-import { useCurrentUser } from 'src/entities/Session';
 import { useSessionStore } from 'src/entities/Session';
 import { useLoginUser } from 'src/features/User/LoginUser';
 import { useNotificationPermissionDialog } from 'src/features/NotificationPermissionDialog';
@@ -49,7 +48,7 @@ const router = useRouter();
 const email = ref('');
 const privateKey = ref('');
 const loading = ref(false);
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 
 // Диалог разрешения уведомлений
 const { showDialog } = useNotificationPermissionDialog();
@@ -104,13 +103,11 @@ const submit = async () => {
     const { login } = useLoginUser();
     await login(email.value, privateKey.value);
 
-    if (!currentUser.isRegistrationComplete.value) {
+    if (!session.isRegistrationComplete) {
       // Если регистрация не завершена, выключаем лоадер и идем на signup
       desktops.setWorkspaceChanging(false);
       router.push({ name: 'signup' });
     } else {
-      const session = useSessionStore();
-
       // Дожидаемся завершения загрузки данных пользователя (включая роль)
       let attempts = 0;
       const maxAttempts = 50; // 5 секунд максимум

package/src/features/User/Logout/model/index.ts

@@ -1,7 +1,6 @@
 import { useSessionStore } from 'src/entities/Session';
 import { useGlobalStore } from 'src/shared/store';
 // import { api } from '../api'
-import { useCurrentUser } from 'src/entities/Session';
 import { useRegistratorStore } from 'src/entities/Registrator';
 
 export function useLogoutUser() {
@@ -12,8 +11,9 @@ export function useLogoutUser() {
 
     await global.logout();
 
-    useSessionStore().close();
-    useCurrentUser().clearAccount();
+    const session = useSessionStore();
+    session.close();
+    session.clearAccount();
   }
 
   return {

package/src/features/User/Logout/ui/LogoutButton/LogoutButton.vue

@@ -11,15 +11,13 @@ import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useLogoutUser } from '../../model';
 import { FailAlert } from 'src/shared/api';
-import { useCurrentUser } from 'src/entities/Session';
 import { useSessionStore } from 'src/entities/Session';
 
 const router = useRouter();
 const session = useSessionStore();
-const currentUser = useCurrentUser();
 
 const loggedIn = computed(
-  () => currentUser.isRegistrationComplete.value && session.isAuth,
+  () => session.isRegistrationComplete && session.isAuth,
 );
 
 const logout = async () => {

package/src/pages/Cooperative/ListOfAgenda/ui/ListOfAgendaQuestions.vue

@@ -3,7 +3,7 @@ q-card(flat)
   QuestionsTable(
     :decisions='decisions',
     :loading='loading',
-    :isChairman='currentUser.isChairman.value',
+    :isChairman='session.isChairman',
     :format-decision-title='formatDecisionTitle',
     :is-voted-for='isVotedFor',
     :is-voted-against='isVotedAgainst',
@@ -18,7 +18,7 @@ q-card(flat)
 <script setup lang="ts">
 import { onBeforeUnmount, computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { CreateProjectButton } from 'src/features/Decision/CreateProject';
 import { useDecisionProcessor } from 'src/processes/process-decisions';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
@@ -26,7 +26,8 @@ import { QuestionsTable } from 'src/widgets/Questions';
 import { useHeaderActions } from 'src/shared/hooks';
 
 const route = useRoute();
-const currentUser = useCurrentUser();
+const session = useSessionStore();
+
 const processingDecisions = ref<Record<number, boolean>>({});
 
 // Инжектим кнопку создания решения в заголовок

package/src/pages/Cooperative/ListOfMeets/ui/ListOfMeetsPage.vue

@@ -14,7 +14,7 @@ import { useRoute } from 'vue-router';
 import { MeetCardsList } from 'src/widgets/Meets/MeetCardsList';
 import { CreateMeetButton } from 'src/features/Meet/CreateMeet';
 import { useMeetStore } from 'src/entities/Meet';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useHeaderActions } from 'src/shared/hooks';
 import { FailAlert } from 'src/shared/api';
 
@@ -22,7 +22,7 @@ const route = useRoute();
 const coopname = computed(() => route.params.coopname as string);
 const meetStore = useMeetStore();
 
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 
 // Данные напрямую из стора
 const meets = computed(() => meetStore.meets);
@@ -45,7 +45,7 @@ const loadMeets = async () => {
 
 // Проверка разрешений
 const canCreateMeet = computed(() => {
-  return currentUser.isMember || currentUser.isChairman;
+  return session.isMember || session.isChairman;
 });
 
 // Функция для регистрации кнопки
@@ -55,7 +55,7 @@ const registerCreateMeetButton = () => {
       id: CREATE_MEET_BUTTON_ID,
       component: CreateMeetButton,
       props: {
-        isChairman: currentUser.isChairman,
+        isChairman: session.isChairman,
       },
       order: 1,
     });

package/src/pages/PermissionDenied/PermissionDenied.vue

@@ -19,16 +19,14 @@
 import { useRouter } from 'vue-router';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { useSessionStore } from 'src/entities/Session';
-import { useCurrentUser } from 'src/entities/Session';
 
 const router = useRouter();
 const desktops = useDesktopStore();
 const session = useSessionStore();
-const currentUser = useCurrentUser();
 
 function goBack() {
   // Если пользователь авторизован, пытаемся перейти на безопасную страницу
-  if (session.isAuth && currentUser.isRegistrationComplete.value) {
+  if (session.isAuth && session.isRegistrationComplete) {
     // Пытаемся перейти на participant workspace как самый безопасный вариант
     const hasParticipantWorkspace = desktops.currentDesktop?.workspaces.some(
       (ws) => ws.name === 'participant',

package/src/pages/Registrator/SignIn/ui/SignInPage.vue

@@ -14,7 +14,6 @@
 </template>
 <script lang="ts" setup>
 import { useSessionStore } from 'src/entities/Session';
-import { useCurrentUser } from 'src/entities/Session';
 import { SignIn } from 'src/widgets/Registrator/SignIn';
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
@@ -23,10 +22,12 @@ const store = useRegistratorStore().state;
 
 const router = useRouter();
 
+const session = useSessionStore();
+
 const registeredAndloggedIn = computed(() => {
   return (
-    useCurrentUser().isRegistrationComplete &&
-    useSessionStore().isAuth &&
+    session.isRegistrationComplete &&
+    session.isAuth &&
     store.step == 1
   );
 });

package/src/pages/Registrator/SignUp/SignUp.vue

@@ -43,8 +43,6 @@ import SelectBranch from './SelectBranch.vue';
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore();
 
-import { useCurrentUser } from 'src/entities/Session';
-
 import { useRegistratorStore } from 'src/entities/Registrator';
 import { useLogoutUser } from 'src/features/User/Logout';
 import { useSessionStore } from 'src/entities/Session';
@@ -56,7 +54,6 @@ import { useInitWalletProcess } from 'src/processes/init-wallet';
 import { useDesktopStore } from 'src/entities/Desktop';
 import { Zeus } from '@coopenomics/sdk';
 
-const currentUser = useCurrentUser();
 const session = useSessionStore();
 const router = useRouter();
 const { state, clearUserData, steps } = useRegistratorStore();
@@ -69,8 +66,8 @@ const { showDialog } = useNotificationPermissionDialog();
 
 onMounted(() => {
   agreementer.loadCooperativeAgreements(info.coopname);
-  if (!currentUser.isRegistrationComplete.value) {
-    const userStatus = currentUser.providerAccount.value?.status;
+  if (!session.isRegistrationComplete) {
+    const userStatus = session.providerAccount?.status;
     if (
       userStatus === Zeus.UserStatus.Registered ||
       userStatus === Zeus.UserStatus.Active ||
@@ -156,7 +153,7 @@ watch(
 
 const registeredAndloggedIn = computed(() => {
   return (
-    currentUser.isRegistrationComplete.value &&
+    session.isRegistrationComplete &&
     session.isAuth &&
     store.step == steps.EmailInput
   );

package/src/pages/Registrator/SignUp/WaitingRegistration.vue

@@ -5,7 +5,7 @@ div
     title='Получите решение совета о приёме Вас в пайщики кооператива',
     :done='store.isStepDone("WaitingRegistration")'
   )
-    template(v-if='currentUser?.userAccount.value?.status !== "failed"')
+    template(v-if='session?.userAccount?.status !== "failed"')
       p Ваш платеж принят. Ожидаем, когда совет рассмотрит Ваше заявление и примет решение о приёме Вас в пайщики. Это может занять до 24 часов. Вы получите уведомление, когда решение будет принято.
       span Эту страницу можно закрыть, а при необходимости, войти с другого устройства с помощью ключа доступа, который был сохранён ранее.
       Loader
@@ -15,7 +15,7 @@ div
 
 <script lang="ts" setup>
 import { ref, computed, watch, onBeforeUnmount, onMounted } from 'vue';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { Loader } from 'src/shared/ui/Loader';
 import { useRegistratorStore } from 'src/entities/Registrator';
 
@@ -33,9 +33,9 @@ watch(step, (newValue) => {
   }
 });
 
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 
-const participantAccount = computed(() => currentUser.participantAccount);
+const participantAccount = computed(() => session.participantAccount);
 
 onMounted(() => {
   if (participantAccount.value && step.value === currentStep) store.next();

package/src/pages/User/PaymentMethodsPage/ui/PaymentMethods.vue

@@ -6,11 +6,11 @@ PaymentMethodsCard(:username='username')
 import { PaymentMethodsCard } from 'src/widgets/User/PaymentMethods';
 import { AddPaymentButton } from 'src/features/PaymentMethod/AddPaymentMethod';
 import { computed, onMounted } from 'vue';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useHeaderActions } from 'src/shared/hooks';
 
-const currentUser = useCurrentUser();
-const username = computed(() => currentUser.username);
+const session = useSessionStore();
+const username = computed(() => session.username);
 
 // Инжектим кнопку добавления реквизитов в заголовок
 const { registerAction } = useHeaderActions();

package/src/pages/User/ProfilePage/ui/ProfilePage.vue

@@ -22,7 +22,7 @@
               .info-item
                 .info-label Имя аккаунта
                 .info-value.username-value
-                  span.username-text {{ currentUser.username || '' }}
+                  span.username-text {{ session.username || '' }}
                   q-btn.copy-btn(
                     icon='content_copy',
                     flat,
@@ -145,7 +145,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import type {
   IEntrepreneurData,
   IIndividualData,
@@ -157,17 +157,17 @@ import { copyToClipboard } from 'quasar';
 import { SuccessAlert, FailAlert } from 'src/shared/api';
 import 'src/shared/ui/CardStyles/index.scss';
 
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 
 const userType = computed(() => {
-  return currentUser.privateAccount.value?.type;
+  return session.privateAccount?.type;
 });
 
 const userProfile = computed(() => {
   return (
-    currentUser.privateAccount.value?.individual_data ||
-    currentUser.privateAccount.value?.organization_data ||
-    currentUser.privateAccount.value?.entrepreneur_data ||
+    session.privateAccount?.individual_data ||
+    session.privateAccount?.organization_data ||
+    session.privateAccount?.entrepreneur_data ||
     null
   );
 });
@@ -205,8 +205,8 @@ const currentProfile = computed(() => {
 const { displayName, isIP } = useDisplayName(currentProfile.value);
 
 const role = computed(() => {
-  if (currentUser.isChairman) return 'Председатель совета';
-  else if (currentUser.isMember) return 'Член совета';
+  if (session.isChairman) return 'Председатель совета';
+  else if (session.isMember) return 'Член совета';
   else return 'Пайщик';
 });
 
@@ -241,7 +241,7 @@ const getUserTypeLabel = () => {
 
 // Копирование имени аккаунта
 const copyUsername = async () => {
-  const username = currentUser.username || '';
+  const username = session.username || '';
   try {
     await copyToClipboard(username);
     SuccessAlert('Имя аккаунта скопировано в буфер обмена');

package/src/pages/User/WalletPage/ui/WalletPage.vue

@@ -11,10 +11,8 @@
 
 <script lang="ts" setup>
 import { WalletWidget, WalletProgramWidget } from 'src/widgets/Wallet';
-// import { useCurrentUser } from 'src/entities/Session';
 import 'src/shared/ui/CardStyles';
 
-// const currentUser = useCurrentUser();
 </script>
 
 <style lang="scss" scoped>

package/src/processes/navigation-guard-setup/index.ts

@@ -1,6 +1,5 @@
 import { Router } from 'vue-router';
 import { useSessionStore } from 'src/entities/Session';
-import { useCurrentUser } from 'src/entities/Session';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { useSystemStore } from 'src/entities/System/model';
 import { LocalStorage } from 'quasar';
@@ -25,7 +24,6 @@ export function setupNavigationGuard(router: Router) {
   const systemStore = useSystemStore();
 
   router.beforeEach(async (to, from, next) => {
-    const currentUser = useCurrentUser();
     // если требуется установка
     const allowedRoutesDuringInstall = ['install', 'invite'];
     if ((systemStore.info.system_status === Zeus.SystemStatus.install || systemStore.info.system_status === Zeus.SystemStatus.initialized) && !allowedRoutesDuringInstall.includes(to.name as string)) {
@@ -54,9 +52,9 @@ export function setupNavigationGuard(router: Router) {
     // Определяем роль пользователя при каждом запросе
     let userRole: string | null = null;
     if (session.isAuth) {
-      if (currentUser.isChairman) {
+      if (session.isChairman) {
         userRole = 'chairman';
-      } else if (currentUser.isMember) {
+      } else if (session.isMember) {
         userRole = 'member';
       } else {
         userRole = 'user'; // Авторизованный пользователь без специальной роли
@@ -66,7 +64,7 @@ export function setupNavigationGuard(router: Router) {
     // редирект с index
     if (to.name === 'index') {
       // Убеждаемся, что правильный рабочий стол выбран
-      if (session.isAuth && currentUser.isRegistrationComplete.value) {
+      if (session.isAuth && session.isRegistrationComplete) {
         // Если рабочий стол не выбран - выбираем по правам пользователя
         if (!desktops.activeWorkspaceName) {
           desktops.selectDefaultWorkspace();

package/src/widgets/Desktop/SecondLevelMenuList/SecondLevelMenuList.vue

@@ -22,7 +22,7 @@ div
 </template>
 
 <script lang="ts" setup>
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useDesktopStore } from 'src/entities/Desktop/model';
@@ -32,7 +32,7 @@ import { Zeus } from '@coopenomics/sdk';
 
 const desktop = useDesktopStore();
 const router = useRouter();
-const user = useCurrentUser();
+const session = useSessionStore();
 const { info } = useSystemStore();
 
 // Функция для проверки условия
@@ -51,22 +51,22 @@ const evaluateCondition = (
 
 // Вычисляем роль пользователя
 const userRole = computed(() =>
-  user.isChairman ? 'chairman' : user.isMember ? 'member' : 'user'
+  session.isChairman ? 'chairman' : session.isMember ? 'member' : 'user'
 );
 
 // Контекст для evaluateCondition и проверки ролей
 const context = computed(() => {
   const isCoop =
-    user.privateAccount.value?.type === Zeus.AccountType.organization &&
-    user.privateAccount.value?.organization_data &&
-    'type' in user.privateAccount.value.organization_data &&
-    user.privateAccount.value.organization_data.type.toUpperCase() ===
+    session.currentUserAccount?.private_account?.type === Zeus.AccountType.organization &&
+    session.currentUserAccount?.private_account?.organization_data &&
+    'type' in session.currentUserAccount?.private_account?.organization_data &&
+    session.currentUserAccount?.private_account?.organization_data.type.toUpperCase() ===
       Zeus.OrganizationType.COOP;
 
   return {
     isCoop,
     userRole: userRole.value,
-    userAccount: user.privateAccount.value,
+    userAccount: session.currentUserAccount?.private_account,
     coopname: info.coopname,
   };
 });

package/src/widgets/Desktop/WorkspaceMenu/WorkspaceMenu.vue

@@ -79,7 +79,7 @@ div
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
 import { useRouter } from 'vue-router';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { ModalBase } from 'src/shared/ui/ModalBase';
 
@@ -100,7 +100,7 @@ interface GroupedApp {
 }
 
 const router = useRouter();
-const user = useCurrentUser();
+const session = useSessionStore();
 const desktop = useDesktopStore();
 
 // Состояние карусели и диалога
@@ -150,7 +150,7 @@ const workspaceMenus = computed(() => desktop.workspaceMenus);
 
 // Вычисляем роль пользователя
 const userRole = computed(() =>
-  user.isChairman ? 'chairman' : user.isMember ? 'member' : 'user'
+  session.isChairman ? 'chairman' : session.isMember ? 'member' : 'user'
 );
 
 // Фильтрация по ролям

package/src/widgets/Header/CommonHeader/MainHeader.vue

@@ -87,7 +87,6 @@ q-header.header(bordered, :class='headerClass')
 import { computed, ref, nextTick, onMounted, onUpdated, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
-import { useCurrentUser } from 'src/entities/Session';
 import { useSessionStore } from 'src/entities/Session';
 import config from 'src/app/config';
 import { useWindowSize, useHeaderActionsReader } from 'src/shared/hooks';
@@ -127,9 +126,9 @@ const isDark = computed(() => $q.dark.isActive);
 const headerClass = computed(() =>
   isDark.value ? 'text-white bg-dark' : 'text-black bg-light',
 );
-const currentUser = useCurrentUser();
+
 const loggedIn = computed(() => {
-  return currentUser.isRegistrationComplete.value && session.isAuth;
+  return session.isRegistrationComplete && session.isAuth;
 });
 
 const showRegisterButton = computed(() => {

package/src/widgets/Header/SettingsDropdown/SettingsDropdown.vue

@@ -36,15 +36,13 @@ q-btn-dropdown(
 <script lang="ts" setup>
 import { useRouter } from 'vue-router';
 import { ToogleDarkLight } from '../../../shared/ui/ToogleDarkLight';
-import { useCurrentUser } from 'src/entities/Session';
 import { computed } from 'vue';
 import { useSessionStore } from 'src/entities/Session';
 
 const session = useSessionStore();
 
-const currentUser = useCurrentUser();
 const loggedIn = computed(
-  () => currentUser.isRegistrationComplete.value && session.isAuth,
+  () => session.isRegistrationComplete && session.isAuth,
 );
 
 defineProps({

package/src/widgets/NotificationCenter/NotificationCenter.vue

@@ -3,22 +3,22 @@
 </template>
 
 <script setup lang="ts">
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useQuasar } from 'quasar';
 import { env } from 'src/shared/config';
 import { NotifyAlert } from 'src/shared/api';
 import { computed, onMounted, onBeforeUnmount, watch, ref } from 'vue';
 
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 const $q = useQuasar();
 const isDark = computed(() => $q.dark.isActive);
 
 // Определяем роль пользователя
 const userRole = computed((): string => {
-  if (currentUser.isChairman) {
+  if (session.isChairman) {
     return 'chairman';
   }
-  if (currentUser.isMember) {
+  if (session.isMember) {
     return 'member';
   }
   return 'user';
@@ -66,7 +66,7 @@ async function mountNovu() {
     const { dark } = await import('@novu/js/themes');
 
     // Получаем данные подписчика из providerAccount
-    const providerAccount = currentUser.providerAccount.value;
+    const providerAccount = session.providerAccount;
 
     if (!providerAccount?.subscriber_id || !providerAccount?.subscriber_hash) {
       console.error(

package/src/widgets/Questions/ui/QuestionCard/QuestionCard.vue

@@ -69,7 +69,7 @@ import { ComplexDocument } from 'src/shared/ui/ComplexDocument';
 import { formatToFromNow } from 'src/shared/lib/utils/dates/formatToFromNow';
 import { getShortNameFromCertificate } from 'src/shared/lib/utils/getNameFromCertificate';
 import { VotingButtons } from '../VotingButtons';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import type { IAgenda } from 'src/entities/Agenda/model';
 import { Cooperative } from 'cooptypes';
 import 'src/shared/ui/CardStyles/index.scss';
@@ -105,8 +105,8 @@ const props = defineProps({
 
 defineEmits(['toggle-expand', 'authorize', 'vote-for', 'vote-against']);
 
-const currentUser = useCurrentUser();
-const isChairman = computed(() => currentUser.isChairman);
+const session = useSessionStore();
+const isChairman = computed(() => session.isChairman);
 
 // Получение заголовка документа с поддержкой агрегатов
 function getDocumentTitle() {

package/src/widgets/User/CoopCard/ui/CoopCard.vue

@@ -7,7 +7,7 @@
           .col-12.col-md-3.flex.justify-center
             AutoAvatar(
               style='width: 60px; border-radius: 50%',
-              :username='currentUser.username'
+              :username='session.username'
             )
           .col-12.col-md-9.q-mt-sm.q-mt-md-0
             q-badge(
@@ -27,7 +27,7 @@
         q-item
           q-item-section
             q-item-label(caption) Имя аккаунта
-            q-item-label.text-bold(style='font-size: 20px') {{ currentUser.username }}
+            q-item-label.text-bold(style='font-size: 20px') {{ session.username }}
 
         //- q-item
         //-   q-item-section
@@ -37,7 +37,7 @@
         q-item
           q-item-section
             q-item-label(caption) Минимальный паевый счёт
-            q-item-label.text-bold(style='font-size: 20px') {{ currentUser.participantAccount.value?.minimum_amount }}
+            q-item-label.text-bold(style='font-size: 20px') {{ session.participantAccount?.minimum_amount }}
 
         //- q-item
         //-   q-item-section
@@ -61,41 +61,41 @@ import { DepositButton } from 'src/features/Wallet/DepositToWallet';
 import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet';
 import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
 import { useWalletStore } from 'src/entities/Wallet';
+import { useSessionStore } from 'src/entities/Session';
 const walletStore = useWalletStore();
+const session = useSessionStore();
 
-import { useCurrentUser } from 'src/entities/Session';
 import { computed } from 'vue';
-const currentUser = useCurrentUser();
 
-const userType = computed(() => currentUser.privateAccount.value?.type);
+const userType = computed(() => session.privateAccount?.type);
 
 const isIP = computed(
-  () => currentUser.privateAccount.value?.type === 'entrepreneur',
+  () => session.privateAccount?.type === 'entrepreneur',
 );
 
 const role = computed(() => {
-  if (currentUser.isChairman) return 'Председатель совета';
-  else if (currentUser.isMember) return 'Член совета';
+  if (session.isChairman) return 'Председатель совета';
+  else if (session.isMember) return 'Член совета';
   else return 'Пайщик';
 });
 
 const individualProfile = computed(() => {
   if (userType.value === 'individual') {
-    return currentUser.privateAccount.value?.individual_data;
+    return session.privateAccount?.individual_data;
   }
   return null;
 });
 
 const entrepreneurProfile = computed(() => {
   if (userType.value === 'entrepreneur') {
-    return currentUser.privateAccount.value?.entrepreneur_data;
+    return session.privateAccount?.entrepreneur_data;
   }
   return null;
 });
 
 const organizationProfile = computed(() => {
   if (userType.value === 'organization') {
-    return currentUser.privateAccount.value?.organization_data;
+    return session.privateAccount?.organization_data;
   }
   return null;
 });

package/src/widgets/Wallet/MicroWallet/ui/MicroWallet.vue

@@ -26,7 +26,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useWalletStore } from 'src/entities/Wallet';
 import { useSystemStore } from 'src/entities/System/model';
 import { ColorCard } from 'src/shared/ui';
@@ -35,7 +35,7 @@ import { DepositButton } from 'src/features/Wallet/DepositToWallet';
 import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet';
 
 const router = useRouter();
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 const walletStore = useWalletStore();
 const { info } = useSystemStore();
 
@@ -48,9 +48,9 @@ const formattedBalance = computed(() => {
 // Профиль
 const currentProfile = computed(() => {
   return (
-    currentUser.privateAccount.value?.individual_data ||
-    currentUser.privateAccount.value?.entrepreneur_data ||
-    currentUser.privateAccount.value?.organization_data ||
+    session.privateAccount?.individual_data ||
+    session.privateAccount?.entrepreneur_data ||
+    session.privateAccount?.organization_data ||
     null
   );
 });
@@ -81,8 +81,8 @@ const isIP = computed(() => {
 });
 
 const role = computed(() => {
-  if (currentUser.isChairman) return 'Председатель';
-  else if (currentUser.isMember) return 'Член совета';
+  if (session.isChairman) return 'Председатель';
+  else if (session.isMember) return 'Член совета';
   else return 'Пайщик';
 });
 

package/src/widgets/Wallet/WalletWidget/ui/WalletWidget.vue

@@ -27,7 +27,7 @@ q-card.main-wallet-card(flat)
 
   ColorCard(
     color='orange'
-    v-if='currentUser.participantAccount.value?.minimum_amount'
+    v-if='session.participantAccount?.minimum_amount'
   ).minimum-balance.q-mt-md
     .minimum-balance-info
       .info-icon
@@ -42,19 +42,19 @@ import { computed } from 'vue';
 import { DepositButton } from 'src/features/Wallet/DepositToWallet';
 import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet';
 import { useWalletStore } from 'src/entities/Wallet';
-import { useCurrentUser } from 'src/entities/Session';
+import { useSessionStore } from 'src/entities/Session';
 import { useSystemStore } from 'src/entities/System/model';
 import { ColorCard } from 'src/shared/ui';
 import { formatAsset2Digits } from 'src/shared/lib/utils/formatAsset2Digits';
 
 const walletStore = useWalletStore();
-const currentUser = useCurrentUser();
+const session = useSessionStore();
 const { info } = useSystemStore();
 
 // Сумма заблокированных средств и минимального неснижаемого остатка
 const totalBlocked = computed(() => {
   const blocked = parseFloat(walletStore.program_wallets[0]?.blocked || '0');
-  const minimum = parseFloat(currentUser.participantAccount.value?.minimum_amount || '0');
+  const minimum = parseFloat(session.participantAccount?.minimum_amount || '0');
   const total = (blocked + minimum).toString();
   return formatAsset2Digits(`${total} ${info.symbols.root_govern_symbol}`);
 });
@@ -67,7 +67,7 @@ const availableBalance = computed(() => {
 
 // Минимальный остаток с форматированием
 const minimumBalance = computed(() => {
-  const minimum = currentUser.participantAccount.value?.minimum_amount || '0';
+  const minimum = session.participantAccount?.minimum_amount || '0';
   return formatAsset2Digits(`${minimum} ${info.symbols.root_govern_symbol}`);
 });
 </script>

package/src/entities/Session/composables/useCurrentUser.ts

@@ -1,39 +0,0 @@
-import { computed } from 'vue';
-import { useSessionStore } from '../model/store';
-
-/**
- * Композабл для работы с данными текущего пользователя
- * Заменяет устаревший useCurrentUserStore
- */
-export function useCurrentUser() {
-  const session = useSessionStore();
-
-  return {
-    // Основные данные
-    username: session.username,
-    currentUserAccount: session.currentUserAccount,
-
-    // Удобные геттеры для различных типов данных
-    userAccount: computed(() => session.currentUserAccount?.user_account),
-    privateAccount: computed(() => session.currentUserAccount?.private_account),
-    blockchainAccount: computed(
-      () => session.currentUserAccount?.blockchain_account,
-    ),
-    participantAccount: computed(
-      () => session.currentUserAccount?.participant_account,
-    ),
-    providerAccount: computed(
-      () => session.currentUserAccount?.provider_account,
-    ),
-
-    // Computed свойства для проверки статуса
-    isRegistrationComplete: computed(() => session.isRegistrationComplete),
-    isChairman: computed(() => session.isChairman),
-    isMember: computed(() => session.isMember),
-    isAuth: computed(() => session.isAuth),
-
-    // Методы
-    setCurrentUserAccount: session.setCurrentUserAccount,
-    clearAccount: () => session.setCurrentUserAccount(undefined),
-  };
-}