final fixes before release

resources/js/components/layout/navigation/MainMenu.vue

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import NavMenu from './NavMenu';
 
 export default {
@@ -14,13 +15,6 @@ export default {
 		NavMenu,
 	},
 
-	props: {
-		userFiat: {
-			type: Boolean,
-			required: true,
-		},
-	},
-
 	data() {
 		return {
 			items: [
@@ -101,12 +95,20 @@ export default {
 	},
 
 	computed: {
+    ...mapState('trading', ['all_currencies','allCurrencyListInit']),
 		filteredNavItems() {
-			if (this.userFiat) return this.items;
+			if ((this.all_currencies?.filter(c => c.type === 'fiat')?.length || 0) > 0) return this.items;
 			else {
 				return this.items.filter(item => item.key !== 'menu.fiat_transactions');
 			}
 		},
+    hasCurrencies() {
+      return this.allCurrencyListInit;
+    }
 	},
+  mounted() {
+    if(!this.hasCurrencies)
+      this.$store.dispatch('trading/getAllCurrencyListFromServer');
+  },
 };
 </script>

resources/js/components/layout/toolbar/ToolbarNotifications.vue

@@ -13,7 +13,7 @@
 				<div v-if="unreadQuantity > 0">
 					<v-list three-line dense max-width="400">
 						<v-subheader class="pa-2 font-weight-bold">
-							Notifications
+              {{ $t('menu.notifications') }}
 						</v-subheader>
 						<div v-for="(item, index) in toolbarNotifications" :key="item.id">
 							<v-divider v-if="index > 0 && index < toolbarNotifications.length" inset />

resources/js/components/notifications/list/NotificationsList.vue

@@ -52,9 +52,6 @@
 				@click="readNotification(item)"
 			>
 				<v-list-item-action class="d-flex flex-row align-center">
-					<!--					TODO: no backend read selected / delete selected-->
-					<!--					<v-checkbox v-model="selected" :value="item.id" @click.stop />-->
-
 					<CommonTooltip :value="$t('common.delete')">
 						<v-btn color="error" icon @click.prevent="deleteNotificationStore(item.id)">
 							<v-icon>mdi-delete</v-icon>

resources/js/layouts/DefaultLayout.vue

@@ -26,7 +26,7 @@
 				<v-divider />
 			</template>
 
-			<MainMenu :user-fiat="isUserFiat" />
+			<MainMenu />
 		</v-navigation-drawer>
 
 		<v-app-bar
@@ -185,9 +185,6 @@ export default {
 			isLogged: 'app/isLogged',
 		}),
 
-		isUserFiat() {
-			return config.product.type === 'full';
-		},
 		calculateFooterHeight() {
 			const width = this.$vuetify.breakpoint.width;
 			const isMediumBreakpoint = width < 1264 && width > 960;

resources/js/mixins/centrifugo-overview.js

@@ -105,13 +105,6 @@ export default {
 				this.sub_order_book.on('error', this.channelErrorHandler);
 				this.sub_order_book.on('unsubscribe', this.channelUnsubscribeHandler);
 			});
-			this.$store.dispatch('trading/getAllCurrencyListFromServer').then(resp => {
-				this.sub_currencies = this.centrifuge.subscribe('public:currencies');
-				this.sub_currencies.on('subscribe', this.channelSubscribeHandler);
-				this.sub_currencies.on('publish', this.currenciesPubHandler);
-				this.sub_currencies.on('error', this.channelErrorHandler);
-				this.sub_currencies.on('unsubscribe', this.channelUnsubscribeHandler);
-			});
 		},
 		unsubscribePublic(currency, market) {
 			currency = currency.toLowerCase();

resources/js/mixins/centrifugo-trading.js

@@ -156,14 +156,6 @@ export default {
 				this.sub_graph.on('error', this.channelErrorHandler);
 				this.sub_graph.on('unsubscribe', this.channelUnsubscribeHandler);
 			});
-			this.$store.dispatch('trading/getAllCurrencyListFromServer').then(resp => {
-				this.sub_currencies = this.centrifuge.subscribe('public:currencies');
-				this.sub_currencies.on('subscribe', this.channelSubscribeHandler);
-				this.sub_currencies.on('publish', this.currenciesPubHandler);
-				this.sub_currencies.on('error', this.channelErrorHandler);
-				this.sub_currencies.on('unsubscribe', this.channelUnsubscribeHandler);
-			});
-
 			this.sub_chat = this.centrifuge.subscribe('chat:ru');
 			this.sub_chat.on('subscribe', this.channelSubscribeHandler);
 			this.sub_chat.on('publish', this.chatPubHandler);

resources/js/pages/info/Contacts.vue

@@ -1,6 +1,6 @@
 <template>
 	<v-card class="info-page contacts-page flex-grow-1">
-		<CommonPageTitle>{{ $t('contacts.title') }}</CommonPageTitle>
+		<CommonPageTitle>{{ $t('menu.contacts') }}</CommonPageTitle>
 	</v-card>
 </template>