@coopenomics/desktop 2.2.10 → 2025.5.2

package/src/pages/Cooperative/ListOfParticipants/ui/ListOfParticipantsPage.vue

@@ -1,14 +1,65 @@
 <template lang="pug">
-ListOfParticipantsWidget
-  template(#top)
-    AddUserDialog
-
-  template(#default="{ expand, receiver }")
-    ListOfDocumentsWidget(v-if="expand" :filter="{receiver: receiver}")
+  q-page.padding
+    ParticipantsTable(
+      :accounts="accountStore.accounts.items"
+      :loading="onLoading"
+      @toggle-expand="toggleExpand"
+      @update="update"
+    )
+      template(#top)
+        AddUserDialog
 </template>
 
-<script lang="ts" setup>
-import { ListOfParticipantsWidget } from 'src/widgets/Cooperative/Participants/ListOfParticipants';
-import { ListOfDocumentsWidget } from 'src/widgets/Cooperative/Documents/ListOfDocuments';
-import { AddUserDialog } from 'src/features/User/AddUser/ui/AddUserDialog';
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { Notify } from 'quasar'
+import { useAccountStore } from 'src/entities/Account/model'
+import { AddUserDialog } from 'src/features/User/AddUser/ui/AddUserDialog'
+import { ParticipantsTable } from 'src/widgets/Participants'
+import {
+  AccountTypes,
+  type IAccount,
+  type IIndividualData,
+  type IOrganizationData,
+  type IEntrepreneurData
+} from 'src/entities/Account/types'
+
+const accountStore = useAccountStore()
+const onLoading = ref(false)
+const expanded = reactive(new Map<string, boolean>())
+const currentTab = reactive<Record<string, string>>({})
+
+const toggleExpand = (id: string) => {
+  expanded.set(id, !expanded.get(id))
+  if (!currentTab[id]) currentTab[id] = 'info'
+}
+
+const loadParticipants = async () => {
+  try {
+    onLoading.value = true
+    await accountStore.getAccounts({ options: { page: 1, limit: 1000, sortOrder: 'DESC' } })
+  } catch (e: any) {
+    Notify.create({ message: e.message, type: 'negative' })
+  } finally {
+    onLoading.value = false
+  }
+}
+loadParticipants()
+
+const update = (account: IAccount, newData: IIndividualData | IOrganizationData | IEntrepreneurData) => {
+  switch (account.private_account?.type) {
+    case AccountTypes.Individual:
+      account.private_account.individual_data = {
+        ...newData as IIndividualData,
+        passport: (newData as IIndividualData).passport ?? undefined
+      }
+      break
+    case AccountTypes.Entrepreneur:
+      account.private_account.entrepreneur_data = newData as IEntrepreneurData
+      break
+    case AccountTypes.Organization:
+      account.private_account.organization_data = newData as IOrganizationData
+      break
+  }
+}
 </script>

package/src/pages/Cooperative/ListOfParticipants/ui/index.ts

@@ -1 +1 @@
-export {default as ListOfParticipantsPage} from './ListOfParticipantsPage.vue'
+export { default as ListOfParticipantsPage } from './ListOfParticipantsPage.vue'

package/src/pages/Cooperative/MeetDetails/ui/MeetDetailsPage.vue

@@ -0,0 +1,88 @@
+<template lang="pug">
+div.q-pa-md
+  div(v-if="loading")
+    q-skeleton(type="rect" height="200px" class="q-mb-md")
+    q-skeleton(type="rect" height="100px" v-for="i in 3" :key="i" class="q-mb-md")
+
+  div(v-else-if="!meet")
+    div.text-h5.text-center Собрание не найдено
+
+  div(v-else)
+    MeetDetailsHeader(:meet="meet")
+    
+    MeetDetailsActions(
+      :meet="meet"
+      :coopname="coopname"
+      :meet-hash="meetHash"
+      class="q-mt-md"
+    )
+    
+    MeetDetailsAgenda(
+      :meet="meet"
+      class="q-mt-md"
+    )
+    
+    MeetDetailsVoting(
+      :meet="meet"
+      :coopname="coopname"
+      :meet-hash="meetHash"
+      class="q-mt-md"
+    )
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { MeetDetailsHeader } from 'src/widgets/Meets/MeetDetailsHeader'
+import { MeetDetailsActions } from 'src/widgets/Meets/MeetDetailsActions'
+import { MeetDetailsAgenda } from 'src/widgets/Meets/MeetDetailsAgenda'
+import { MeetDetailsVoting } from 'src/widgets/Meets/MeetDetailsVoting'
+import { useMeetStore } from 'src/entities/Meet'
+import { FailAlert } from 'src/shared/api'
+import type { IMeet } from 'src/entities/Meet'
+import { useDesktopStore } from 'src/entities/Desktop/model'
+import { useBackButton } from 'src/shared/lib/navigation'
+
+const route = useRoute()
+const meetStore = useMeetStore()
+const desktopStore = useDesktopStore()
+
+const coopname = computed(() => route.params.coopname as string)
+const meetHash = computed(() => route.params.hash as string)
+
+const meet = ref<IMeet | null>(null)
+const loading = ref(true)
+
+const loadMeetDetails = async () => {
+  loading.value = true
+  try {
+    const result = await meetStore.loadMeet({
+      coopname: coopname.value,
+      hash: meetHash.value
+    })
+    meet.value = result
+  } catch (error: any) {
+    FailAlert(error)
+  } finally {
+    loading.value = false
+  }
+}
+
+// Настройка кнопки навигации
+const workspace = computed(() => desktopStore.activeWorkspaceName)
+const buttonText = computed(() => workspace.value === 'soviet' ? 'Собрания' : 'Мои Собрания')
+const targetRouteName = computed(() => workspace.value === 'soviet' ? 'meets' : 'user-meets')
+
+// Используем хук для управления кнопкой
+useBackButton({
+  text: buttonText.value,
+  routeName: targetRouteName.value,
+  params: { coopname: coopname.value },
+  componentId: 'meet-details-' + meetHash.value
+})
+
+// Загрузка деталей собрания
+onMounted(() => {
+  loadMeetDetails()
+})
+</script>

package/src/pages/Cooperative/MeetDetails/ui/index.ts

@@ -0,0 +1 @@
+export { default as MeetDetailsPage } from './MeetDetailsPage.vue'

package/src/pages/Cooperative/MemberBranchList/ui/index.ts

@@ -0,0 +1 @@
+export {default as MemberBranchList} from './MemberBranchListPage.vue'

package/src/pages/Cooperative/Payments/index.ts

@@ -0,0 +1 @@
+export { default as PaymentsPage } from './ui/PaymentsPage.vue'

package/src/pages/Cooperative/Payments/ui/PaymentsPage.vue

@@ -0,0 +1,7 @@
+<template lang="pug">
+ListOfPaymentsWidget
+</template>
+
+<script lang="ts" setup>
+import { ListOfPaymentsWidget } from 'src/widgets/Cooperative/Payments';
+</script>

package/src/pages/{ExtStore → ExtensionStore}/ExtensionPage/ExtensionPage.vue

@@ -5,41 +5,46 @@ div(v-if="extension").row
     div.q-mt-md
       div(v-if="isSettings").row
         q-btn( v-if="!isEmpty" color="teal" @click="save").full-width сохранить
-        q-btn( v-if="isEmpty" @click="cancel").full-width назад
-      div(v-if="isMain && !extension.installed").q-gutter-sm.text-center
+        q-btn( v-if="isEmpty" @click="cancel" flat icon="fas fa-arrow-left").full-width назад
+      div(v-if="isMain && !extension.is_installed").q-gutter-sm.text-center
         q-btn(color="teal" @click="router.push({name: 'extension-install'})").full-width установить
 
-      div(v-if="isInstall && !extension.installed").q-gutter-sm.text-center
+      div(v-if="isInstall && !extension.is_installed").q-gutter-sm.text-center
         // это установка
         q-btn(color="teal" @click="install").full-width включить
 
-      div(v-if="isMain && extension.installed").row
+      div(v-if="isMain && extension.is_installed")
         q-btn(color="teal" @click="openSettings").full-width настройки
-
-        div.col-6.q-pa-sm
-          q-btn(v-if="extension.enabled" size="sm" @click="disable" flat ).full-width
-            q-icon(name="fa-solid fa-toggle-off").text-grey
-            span.q-ml-xs отключить
-          q-btn( size="sm" @click="enable" v-if="!extension.enabled" flat).full-width
-            q-icon(name="fa-solid fa-toggle-on")
-            span.q-ml-xs включить
-
-        div.col-6.q-pa-sm
-          q-btn( size="sm" @click="uninstall" v-if="extension.installed" flat ).full-width
-            q-icon(name="delete").text-grey
-            span.q-ml-xs удалить
+        div(v-if="extension.is_builtin").q-mt-sm
+          p.text-center.text-grey минимальное расширение
+        div(v-else).row
+          div.col-6.q-pa-sm
+            q-btn(v-if="extension.enabled" size="sm" @click="disable" flat :disabled="extension.is_builtin").full-width
+              q-icon(name="fa-solid fa-toggle-on")
+              span.q-ml-xs включено
+
+            q-btn( size="sm" @click="enable" v-if="!extension.enabled" flat :disabled="extension.is_builtin").full-width
+              q-icon(name="fa-solid fa-toggle-off").text-grey
+              span.q-ml-xs отключено
+
+          div.col-6.q-pa-sm
+            q-btn( size="sm" @click="uninstall" v-if="extension.is_installed" flat :disabled="extension.is_builtin").full-width
+              q-icon(name="delete").text-grey
+              span.q-ml-xs удалить
 
   div.col-md-9.col-sm-8.col-xs-12.q-pa-md
     div(v-if="isMain")
       div
         span.text-h1 {{extension.title}}
-          q-chip(square dense size="sm" color="green" outline v-if="extension.installed && extension.enabled").q-ml-sm активно
-          q-chip(square dense size="sm" color="orange" outline v-if="extension.installed && !extension.enabled").q-ml-sm отключено
-          q-chip(size="sm" dense color="orange" v-if="!extension.available" outline) в разработке
+          //- q-chip(square dense size="sm" color="green" outline v-if="extension.is_installed && extension.enabled").q-ml-sm установлено
+          //- q-chip(square dense size="sm" color="orange" outline v-if="extension.is_installed && !extension.enabled").q-ml-sm отключено
+          q-chip(size="sm" dense color="orange" v-if="!extension.is_available" outline) в разработке
         div
           q-chip(outline v-for="tag in extension.tags" v-bind:key="tag" dense size="sm") {{tag}}
 
-      vue-markdown(:source="extension.readme").description.q-mt-md
+      ClientOnly
+        template(#default)
+          vue-markdown(:source="extension.readme").description.q-mt-md
     div(v-if="(isSettings || isInstall) && extension.schema")
       q-form(ref="myFormRef")
         div(v-if="isEmpty && !isInstall")
@@ -47,26 +52,38 @@ div(v-if="extension").row
             p.text-h6 Нет настроек
             span Расширение не предоставило настроек для изменения.
         div(v-if="!isEmpty")
-          vue-markdown(:source="extension.instructions").description.q-mt-md
+
+          //- vue-markdown(:source="extension.instructions").description.q-mt-md
+          ClientOnly
+            template(#default)
+              vue-markdown(v-if="extension.instructions" :source="extension.instructions").description.q-mt-md
           ZodForm(:schema="extension.schema" v-model="data")
 
 </template>
 <script lang="ts" setup>
 import { useExtensionStore } from 'src/entities/Extension/model';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch, defineAsyncComponent } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ZodForm } from 'src/shared/ui/ZodForm';
-import VueMarkdown from 'vue-markdown-render'
+// import VueMarkdown from 'vue-markdown-render'
 import { extractGraphQLErrorMessages, FailAlert, SuccessAlert } from 'src/shared/api';
 import { useUpdateExtension } from 'src/features/Extension/UpdateExtension';
 import { useUninstallExtension } from 'src/features/Extension/UninstallExtension';
 import { useInstallExtension } from 'src/features/Extension/InstallExtension';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { ClientOnly } from 'src/shared/ui/ClientOnly';
+
+// Клиентский компонент для markdown, загружаемый только на клиенте
+const VueMarkdown = defineAsyncComponent(() =>
+  import('vue-markdown-render').then(mod => mod.default)
+);
 
 const route = useRoute();
 const router = useRouter();
 const extStore = useExtensionStore();
 const data = ref({});
 const myFormRef = ref();
+const desktop = useDesktopStore()
 
 onMounted(async () => {
   if (route.params.name) {
@@ -119,6 +136,7 @@ const install = async () => {
     try {
       await installExtension(extension.value.name, true, data.value);
       router.push({ name: 'one-extension' });
+      desktop.loadDesktop()
       SuccessAlert('Расширение установлено');
     } catch (e: unknown) {
       FailAlert(`Ошибка установки расширения: ${extractGraphQLErrorMessages(e)}`);
@@ -131,6 +149,9 @@ const disable = async () => {
   if (extension.value) {
     try {
       await updateExtension(extension.value.name, false, extension.value.config);
+      // Если расширение отключено, удаляем его workspace
+      desktop.removeWorkspace(extension.value.name);
+
       SuccessAlert('Расширение обновлено');
     } catch (e: unknown) {
       FailAlert(`Ошибка отключения расширения: ${extractGraphQLErrorMessages(e)}`);
@@ -143,6 +164,10 @@ const enable = async () => {
   if (extension.value) {
     try {
       await updateExtension(extension.value.name, true, extension.value.config);
+
+      // Перезагружаем desktop с сервера, чтобы включённое расширение появилось
+      await desktop.loadDesktop();
+
       SuccessAlert('Расширение обновлено');
     } catch (e: any) {
       FailAlert(`Ошибка включения расширения: ${extractGraphQLErrorMessages(e)}`);
@@ -150,12 +175,14 @@ const enable = async () => {
   }
 };
 
+
 const uninstall = async () => {
   const { uninstallExtension } = useUninstallExtension();
   if (extension.value) {
     try {
       await uninstallExtension(extension.value.name);
       router.push({ name: 'one-extension' });
+      desktop.loadDesktop()
       SuccessAlert('Расширение удалено');
     } catch (e: any) {
       FailAlert(`Ошибка удаления расширения: ${extractGraphQLErrorMessages(e)}`);

package/src/pages/{ExtStore → ExtensionStore}/ExtensionsShowcase/ExtensionsShowcase.vue

@@ -1,13 +1,13 @@
 <template lang="pug">
 div.row
-  div(v-for="extension in extStore.extensions" v-bind:key="extension.name").col-md-3.col-xs-12
+  div(v-for="extension in extStore.extensions" v-bind:key="extension.name").col-md-3.col-sm-6.col-xs-12
     ExtensionCard(:extension="extension")
 
 </template>
 <script lang="ts" setup>
 import { useExtensionStore } from 'src/entities/Extension/model';
 import { onMounted } from 'vue';
-import { ExtensionCard } from 'src/widgets/ExtStore/ExtensionCard';
+import { ExtensionCard } from 'src/widgets/ExtensionCard';
 
 const extStore = useExtensionStore()
 

package/src/pages/{ExtStore → ExtensionStore}/InstalledExtensions/InstalledExtensions.vue

@@ -7,12 +7,12 @@
   <script lang="ts" setup>
   import { useExtensionStore } from 'src/entities/Extension/model'
   import { onMounted } from 'vue';
-  import { ExtensionCard } from 'src/widgets/ExtStore/ExtensionCard'
+  import { ExtensionCard } from 'src/widgets/ExtensionCard'
 
   const extStore = useExtensionStore()
 
   onMounted(async () => {
-    extStore.loadExtensions({ installed: true })
+    extStore.loadExtensions({ is_installed: true })
   })
 
   </script>

package/src/pages/Marketplace/OfferPage/ui/OfferPage.vue

@@ -63,7 +63,7 @@ div(v-if="localRequest").row.justify-around.q-pt-lg
 import { computed, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { ImageCarousel } from 'src/shared/ui/ImageCarousel'
-import { CreateChildOrderCard } from 'src/widgets/Request/CreateChildOrderCard'
+import { CreateChildOrderCard } from 'src/widgets/Marketplace/CreateChildOrderCard'
 
 import { PublishRequestButton } from 'src/features/Request/PublishRequest'
 import { UnpublishRequestButton } from 'src/features/Request/UnpublishRequest'

package/src/pages/Marketplace/Showcase/ui/ShowcasePage.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useRequestStore } from 'src/entities/Request/model/stores'
-import { RequestCard } from 'src/widgets/Request/RequestCard'
+import { RequestCard } from 'src/widgets/Marketplace/RequestCard'
 import { OfferPage } from 'src/pages/Marketplace/OfferPage'
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'

package/src/pages/Marketplace/SuppliesList/ui/SuppliesListPage.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useRequestStore } from 'src/entities/Request/model/stores'
-import { SupplyOrderRequest } from 'src/widgets/Request/SupplyOrderRequestCard'
+import { SupplyOrderRequest } from 'src/widgets/Marketplace/SupplyOrderRequestCard'
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 const requestsStore = useRequestStore()

package/src/pages/Marketplace/UserParentOffers/ui/UserParentOffersPage.vue

@@ -2,7 +2,7 @@
 import { useRequestStore } from 'src/entities/Request/model/stores'
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { RequestCard } from 'src/widgets/Request/RequestCard'
+import { RequestCard } from 'src/widgets/Marketplace/RequestCard'
 import { OfferPage } from 'src/pages/Marketplace/OfferPage'
 
 import type { IRequestData } from 'src/entities/Request'

package/src/pages/Marketplace/UserSuppliesList/ui/UserSuppliesListPage.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useRequestStore } from 'src/entities/Request/model/stores'
-import { SupplyOrderRequest } from 'src/widgets/Request/SupplyOrderRequestCard'
+import { SupplyOrderRequest } from 'src/widgets/Marketplace/SupplyOrderRequestCard'
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 

package/src/pages/PermissionDenied/index.ts

@@ -0,0 +1 @@
+export { default as PermissionDenied} from './PermissionDenied.vue'

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

@@ -1,7 +1,7 @@
 <template lang='pug'>
 div
   q-step(:name="store.steps.EmailInput", title='Введите электронную почту', :done="store.isStepDone('EmailInput')")
-    p Добро пожаловать в {{ COOP_SHORT_NAME }}! Для начала регистрации, пожалуйста, введите вашу электронную почту:
+    p Добро пожаловать в {{ coopTitle }}! Для начала регистрации, пожалуйста, введите вашу электронную почту:
 
     q-input.q-mt-lg(
       v-model.trim='email',
@@ -27,14 +27,15 @@ div
 import { ref, computed, watch } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
 import { debounce } from 'quasar'
-import { COOP_SHORT_NAME } from 'src/shared/config'
 import { useRegistratorStore } from 'src/entities/Registrator'
+import { env } from 'src/shared/config'
+
 const store = useRegistratorStore()
 
 const api = useCreateUser()
 
 watch(() => store.state.email, () => email.value = store.state.email)
-
+const coopTitle = computed(() => env.COOP_SHORT_NAME)
 const email = ref(store.state.email)
 
 const inLoading = ref(false)

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

@@ -9,9 +9,8 @@ div
 
     q-input.q-mt-lg(
       v-if='account.private_key',
-      v-model='account.private_key',
-      label='Приватный ключ',
-      :readonly='true'
+      :model-value='account.private_key',
+      label='Приватный ключ'
     )
 
     q-checkbox(v-model="i_save", label="Я сохранил имя и ключ в надёжном месте")

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

@@ -5,7 +5,7 @@ div(v-if="store?.state?.payment?.details?.amount_without_fee")
       p Пожалуйста, совершите оплату регистрационного взноса {{ formatAssetToReadable(store.state.payment.details.amount_without_fee) }}. Комиссия провайдера {{ store.state.payment.details.fact_fee_percent }}%, всего к оплате: {{ store.state.payment.details.amount_plus_fee }}.
       div.q-mt-md
         span.text-bold Внимание!
-        span.q-ml-xs Оплату необходимо произвести с банковского счета, который принадлежит именно Вам. При поступлении средств с другого счета, оплата будет аннулирована, а вступление в кооператив приостановлено.
+        span.q-ml-xs Оплату необходимо произвести с банковского счета пайщика, который вступает в кооператив. При поступлении средств с другого счета, оплата будет аннулирована, а вступление в кооператив приостановлено.
       PayWithProvider(:payment-order="store.state.payment" @payment-fail="paymentFail" @payment-success="paymentSuccess")
 
 </template>

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

@@ -43,7 +43,7 @@ div
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
-import { failAlert } from 'src/shared/api';
+import { FailAlert } from 'src/shared/api';
 import { Loader } from 'src/shared/ui/Loader';
 import { ReadAgreementDialog } from 'src/features/Agreementer/ReadAgreementDialog';
 import { useAgreementStore } from 'src/entities/Agreement'
@@ -70,7 +70,7 @@ const loadStatement = async (): Promise<void> => {
     isLoading.value = false
   } catch (e: any) {
     isLoading.value = false
-    failAlert(e.message)
+    FailAlert(e.message)
   }
 }
 const back = () => {

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

@@ -21,7 +21,7 @@ div(v-if="store")
 <script lang="ts" setup>
 import { useBranchStore } from 'src/entities/Branch/model'
 import { useRegistratorStore } from 'src/entities/Registrator'
-import { failAlert } from 'src/shared/api';
+import { FailAlert } from 'src/shared/api';
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
@@ -36,7 +36,7 @@ const load = async () => {
     try{
       await branchStore.loadPublicBranches({ coopname: info.coopname })
     } catch(e: any){
-      failAlert(e)
+      FailAlert(e)
     }
 }
 

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

@@ -28,7 +28,7 @@
   <script lang="ts" setup>
   import { ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
   import { Notify } from 'quasar'
-  import { failAlert, FailAlert } from 'src/shared/api'
+  import { FailAlert } from 'src/shared/api'
   import { Loader } from 'src/shared/ui/Loader'
   import { useRegistratorStore } from 'src/entities/Registrator'
   import { useCreateUser } from 'src/features/User/CreateUser'
@@ -151,7 +151,7 @@ import { client } from 'src/shared/api/client'
       store.next()
     } catch (err: any) {
       onSign.value = false
-      failAlert(err)
+      FailAlert(err)
     }
   }
   </script>

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

@@ -20,7 +20,6 @@
 
         WaitingRegistration
 
-        Welcome
     q-btn(@click="out" dense size="sm" flat) начать с начала
 
 
@@ -35,7 +34,6 @@ import SignStatement from './SignStatement.vue'
 import ReadStatement from './ReadStatement.vue'
 import PayInitial from './PayInitial.vue'
 import WaitingRegistration from './WaitingRegistration.vue'
-import Welcome from './Welcome.vue'
 import SelectBranch from './SelectBranch.vue'
 
 import { useSystemStore } from 'src/entities/System/model';
@@ -47,18 +45,15 @@ import { useRegistratorStore } from 'src/entities/Registrator'
 import { useLogoutUser } from 'src/features/User/Logout'
 import { useSessionStore } from 'src/entities/Session'
 import { useAgreementStore } from 'src/entities/Agreement'
-import { useWalletStore } from 'src/entities/Wallet'
 
 import { useRouter } from 'vue-router';
+import { useInitWalletProcess } from 'src/processes/init-wallet'
 
 const currentUser = useCurrentUserStore()
 const router = useRouter()
 const { state, clearUserData, steps } = useRegistratorStore()
-const session = useSessionStore()
 const store = state
-const username = computed(() => session.username)
 const agreementer = useAgreementStore()
-const wallet = useWalletStore()
 
 onMounted(() => {
   agreementer.loadCooperativeAgreements(info.coopname)
@@ -75,9 +70,6 @@ onMounted(() => {
 const out = async () => {
   const { logout } = await useLogoutUser()
   await logout()
-
-  clearUserData()
-
   window.location.reload()
 }
 
@@ -90,7 +82,7 @@ onBeforeUnmount(() => {
 watch(() => currentUser.participantAccount, (newValue) => {
   if (newValue) {
     clearUserData()
-    store.step = steps.Welcome
+    router.push({name: 'index'})
   }
 })
 
@@ -98,8 +90,9 @@ watch(
   () => [store.step, store.email, store.account, store.userData],
   () => {
     if (store.step >= steps.GenerateAccount && store.step < steps.WaitingRegistration) {
-      currentUser.loadProfile(username.value, info.coopname)
-      wallet.loadUserWalet({coopname: info.coopname, username: username.value})
+      useInitWalletProcess().run()
+      // currentUser.loadProfile(username.value, info.coopname)
+      // wallet.loadUserWallet({coopname: info.coopname, username: username.value})
     }
   }
 )

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

@@ -22,6 +22,7 @@ const { info } = useSystemStore()
 
 import { Loader } from 'src/shared/ui/Loader';
 import { useRegistratorStore } from 'src/entities/Registrator'
+
 const store = useRegistratorStore()
 
 const currentStep = store.steps.WaitingRegistration
@@ -63,9 +64,4 @@ const update = async () => {
   }
 }
 
-watch(() => participantAccount, (newValue) => {
-  if (newValue) store.next()
-})
-
-
 </script>

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

@@ -2,11 +2,11 @@
 div
   q-step(
     :name="store.steps.Welcome"
-    :title="'Добро пожаловать в ' + COOP_SHORT_NAME"
+    :title="'Добро пожаловать в ' + coopTitle"
     :done="store.isStepDone('Welcome')"
   )
 
-    p Совет кооператива {{ COOP_SHORT_NAME }} принял положительное решение о приёме Вас в пайщики, выдал удостоверение и создал цифровой кошелёк для Вас.
+    p Совет кооператива {{ coopTitle }} принял положительное решение о приёме Вас в пайщики, выдал удостоверение и создал цифровой кошелёк для Вас.
 
     div.q-mt-lg
       q-btn(
@@ -17,11 +17,14 @@ div
   </template>
 
 <script lang="ts" setup>
-import { COOP_SHORT_NAME } from 'src/shared/config'
+import { computed } from 'vue'
 import { useRouter } from 'vue-router';
 import { useRegistratorStore } from 'src/entities/Registrator';
+import { env } from 'src/shared/config';
+
 const router = useRouter()
 const store = useRegistratorStore()
+const coopTitle = computed(() => env.COOP_SHORT_NAME)
 
 const next = () => {
   router.push({ name: 'index' })