From deed60bfadfd39ecbf06a62948c05422c73c1fb6 Mon Sep 17 00:00:00 2001
From: zns <have-dream@yandex.ru>
Date: Fri, 27 May 2022 01:18:10 +0300
Subject: [PATCH] final fixes before release

---
 .../FeesDepositAndWithdrawalLimitsTab.vue     | 106 ----------------
 .../info/fees/FeesDepositAndWithdrawalTab.vue | 118 ------------------
 .../components/layout/navigation/MainMenu.vue |  18 +--
 .../layout/toolbar/ToolbarNotifications.vue   |   2 +-
 .../notifications/list/NotificationsList.vue  |   3 -
 resources/js/layouts/DefaultLayout.vue        |   5 +-
 resources/js/mixins/centrifugo-overview.js    |   7 --
 resources/js/mixins/centrifugo-trading.js     |   8 --
 resources/js/pages/info/Contacts.vue          |   2 +-
 resources/js/pages/info/Fees.vue              |  27 ++--
 resources/js/pages/reports/RefPayments.vue    |  12 +-
 resources/js/pages/reports/Transfers.vue      |  12 +-
 12 files changed, 33 insertions(+), 287 deletions(-)
 delete mode 100644 resources/js/components/info/fees/FeesDepositAndWithdrawalLimitsTab.vue
 delete mode 100644 resources/js/components/info/fees/FeesDepositAndWithdrawalTab.vue

diff --git a/resources/js/components/info/fees/FeesDepositAndWithdrawalLimitsTab.vue b/resources/js/components/info/fees/FeesDepositAndWithdrawalLimitsTab.vue
deleted file mode 100644
index 8357fbaa..00000000
--- a/resources/js/components/info/fees/FeesDepositAndWithdrawalLimitsTab.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-	<div class="fees-deposit-and-withdrawal-limits-tab">
-		<v-data-table :headers="headers" :items="crypto" :search="search" dense>
-			<template #top>
-				<v-toolbar flat dense>
-					<div class="component-title">{{ $t('fees.operations_limits') }}</div>
-
-					<v-text-field
-						v-model="search"
-						class="fees-page__search"
-						:label="$t('trading.search')"
-						append-icon="mdi-magnify"
-						single-line
-						hide-details
-					/>
-				</v-toolbar>
-			</template>
-
-			<template #item.minReplenish="{item}"> {{ item.minReplenish }} {{ item.currency }} </template>
-			<template #item.minWithdraw="{item}"> {{ item.minWithdraw }} {{ item.currency }} </template>
-			<template #item.maxWithdraw="{item}"> {{ item.maxWithdraw }} {{ item.currency }} </template>
-			<template #item.maxVerifyWithdraw="{item}"> {{ item.maxVerifyWithdraw }} {{ item.currency }} </template>
-		</v-data-table>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'FeesDepositAndWithdrawalLimitsTab',
-	data() {
-		return {
-			currencies: [],
-			search: '',
-		};
-	},
-	computed: {
-		headers() {
-			return [
-				{
-					text: this.$t('table_header.code'),
-					align: 'center',
-					sortable: true,
-					filterable: true,
-					value: 'currency',
-				},
-				{
-					text: this.$t('table_header.name'),
-					align: 'center',
-					sortable: true,
-					filterable: true,
-					value: 'name',
-				},
-				{
-					text: this.$t('table_header.min_replenish_amount'),
-					align: 'center',
-					sortable: true,
-					filterable: false,
-					value: 'minReplenish',
-				},
-				{
-					text: this.$t('table_header.min_withdrawal_amount'),
-					align: 'center',
-					sortable: true,
-					filterable: false,
-					value: 'minWithdraw',
-				},
-				{
-					text: this.$t('table_header.daily_withdrawal_limit'),
-					align: 'center',
-					sortable: true,
-					filterable: false,
-					value: 'maxWithdraw',
-				},
-				{
-					text: this.$t('table_header.daily_withdrawal_limit_verify'),
-					align: 'center',
-					sortable: true,
-					filterable: false,
-					value: 'maxVerifyWithdraw',
-				},
-			];
-		},
-
-		crypto() {
-			let result = [];
-			_.forEach(this.currencies, function(value, key) {
-				result.push({
-					id: value.id,
-					currency: value.currency,
-					name: value.name,
-					minReplenish: value.minReplenish,
-					minWithdraw: value.minWithdraw,
-					maxWithdraw: value.maxWithdraw,
-					maxVerifyWithdraw: value.maxVerifyWithdraw,
-				});
-			});
-			return result;
-		},
-	},
-	mounted() {
-		axios.get('/trader/ext/crypto_currencies').then(response => {
-			this.currencies = response.data.data;
-		});
-	},
-};
-</script>
diff --git a/resources/js/components/info/fees/FeesDepositAndWithdrawalTab.vue b/resources/js/components/info/fees/FeesDepositAndWithdrawalTab.vue
deleted file mode 100644
index a6e5c703..00000000
--- a/resources/js/components/info/fees/FeesDepositAndWithdrawalTab.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-	<div class="fees-deposit-and-withdrawal-tab">
-		<v-data-table :headers="headers" :items="crypto" :search="search" dense>
-			<template #top>
-				<v-toolbar flat dense>
-					<div class="component-title">{{ $t('fees.operations_fee') }}</div>
-
-					<v-text-field
-						v-model="search"
-						class="fees-page__search"
-						:label="$t('trading.search')"
-						append-icon="mdi-magnify"
-						single-line
-						hide-details
-					/>
-				</v-toolbar>
-			</template>
-
-			<template #header.platforms="{ header }">
-				<div class="text-center">
-					{{ header.text }}
-				</div>
-			</template>
-
-			<template #item.platforms="{ item }">
-				<v-simple-table v-if="item.platforms && item.platforms.length" dense>
-					<thead>
-						<tr>
-							<th>
-								{{ $t('table_header.replenishment_fee') }}
-							</th>
-							<th>
-								{{ $t('table_header.withdrawal_fee') }}
-							</th>
-							<th>
-								{{ $t('table_header.min_number_of_network_confirmation') }}
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="platform in item.platforms" :key="platform.id">
-							<td>
-								{{ platform.feeReplenish || '–' }}
-							</td>
-							<td>
-								{{ platform.feeWithdraw || '–' }}
-							</td>
-							<td>
-								{{ platform.approve || '–' }}
-							</td>
-						</tr>
-					</tbody>
-				</v-simple-table>
-			</template>
-		</v-data-table>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'FeesDepositAndWithdrawalTab',
-
-	data() {
-		return {
-			currencies: [],
-			search: '',
-		};
-	},
-
-	computed: {
-		headers() {
-			return [
-				{
-					text: this.$t('table_header.code'),
-					align: 'center',
-					sortable: true,
-					filterable: true,
-					value: 'currency',
-				},
-				{
-					text: this.$t('table_header.name'),
-					align: 'center',
-					sortable: true,
-					filterable: true,
-					value: 'name',
-				},
-				{
-					text: this.$t('table_header.platform'),
-					sortable: false,
-					filterable: false,
-					value: 'platforms',
-				},
-			];
-		},
-
-		crypto() {
-			let result = [];
-			_.forEach(this.currencies, value => {
-				result.push({
-					id: value.id,
-					currency: value.currency,
-					name: value.name,
-					feeReplenish: '-',
-					feeWithdraw: value.feeWithdraw,
-					confirmations: value.approve,
-					platforms: value.platforms,
-				});
-			});
-			return result;
-		},
-	},
-	mounted() {
-		axios.get('/trader/ext/all_currencies').then(response => {
-			this.currencies = response.data.data;
-		});
-	},
-};
-</script>
diff --git a/resources/js/components/layout/navigation/MainMenu.vue b/resources/js/components/layout/navigation/MainMenu.vue
index d72a792c..74ba7f2c 100644
--- a/resources/js/components/layout/navigation/MainMenu.vue
+++ b/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>
diff --git a/resources/js/components/layout/toolbar/ToolbarNotifications.vue b/resources/js/components/layout/toolbar/ToolbarNotifications.vue
index e4277752..08c729b8 100644
--- a/resources/js/components/layout/toolbar/ToolbarNotifications.vue
+++ b/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 />
diff --git a/resources/js/components/notifications/list/NotificationsList.vue b/resources/js/components/notifications/list/NotificationsList.vue
index 6dd8eb8c..7e7c9f54 100644
--- a/resources/js/components/notifications/list/NotificationsList.vue
+++ b/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>
diff --git a/resources/js/layouts/DefaultLayout.vue b/resources/js/layouts/DefaultLayout.vue
index 0d791a2c..073e6c4e 100644
--- a/resources/js/layouts/DefaultLayout.vue
+++ b/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;
diff --git a/resources/js/mixins/centrifugo-overview.js b/resources/js/mixins/centrifugo-overview.js
index 78ec11a6..0c29a3aa 100644
--- a/resources/js/mixins/centrifugo-overview.js
+++ b/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();
diff --git a/resources/js/mixins/centrifugo-trading.js b/resources/js/mixins/centrifugo-trading.js
index f51e3f4e..e194afec 100644
--- a/resources/js/mixins/centrifugo-trading.js
+++ b/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);
diff --git a/resources/js/pages/info/Contacts.vue b/resources/js/pages/info/Contacts.vue
index 8f93ec49..2e345a8b 100644
--- a/resources/js/pages/info/Contacts.vue
+++ b/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>
 
diff --git a/resources/js/pages/info/Fees.vue b/resources/js/pages/info/Fees.vue
index 6b18891b..ead8b64a 100644
--- a/resources/js/pages/info/Fees.vue
+++ b/resources/js/pages/info/Fees.vue
@@ -10,10 +10,6 @@
 				<v-tab :key="2">
 					{{ $t('status.pairs_tab') }}
 				</v-tab>
-
-				<!--			<v-tab :key="3">
-                {{ $t('fees.operations_limits') }}
-              </v-tab>-->
 			</v-tabs>
 
 			<v-tabs-items v-model="selectedTab" touchless>
@@ -94,27 +90,22 @@
 							</tbody>
 						</v-simple-table>
 					</div>
-					<!--        <FeesDepositAndWithdrawalTab />-->
 				</v-tab-item>
 
 				<v-tab-item :key="2">
 					<FeesTradingTab />
 				</v-tab-item>
 
-				<v-tab-item :key="3">
-					<FeesDepositAndWithdrawalLimitsTab />
-				</v-tab-item>
 			</v-tabs-items>
 		</v-card-text>
 	</v-card>
 </template>
 
 <script>
-import CommonPageTitle from '../../components/common/CommonPageTitle';
+import { mapState } from 'vuex';
 
+import CommonPageTitle from '../../components/common/CommonPageTitle';
 import FeesTradingTab from '../../components/info/fees/FeesTradingTab';
-import FeesDepositAndWithdrawalTab from '../../components/info/fees/FeesDepositAndWithdrawalTab';
-import FeesDepositAndWithdrawalLimitsTab from '../../components/info/fees/FeesDepositAndWithdrawalLimitsTab';
 import CommonCurrency from '../../components/common/CommonCurrency';
 
 export default {
@@ -123,21 +114,19 @@ export default {
 		CommonCurrency,
 		CommonPageTitle,
 		FeesTradingTab,
-		FeesDepositAndWithdrawalTab,
-		FeesDepositAndWithdrawalLimitsTab,
 	},
 
 	data() {
 		return {
 			selectedTab: 0,
-			currencies: [],
 		};
 	},
-	mounted() {
-		axios.get('/trader/ext/all_currencies').then(response => {
-			this.currencies = response.data.data;
-		});
-	},
+  computed: {
+    ...mapState('trading', ['all_currencies','allCurrencyListInit']),
+    currencies() {
+      return this.allCurrencyListInit ? this.all_currencies : []
+    },
+  },
 };
 </script>
 
diff --git a/resources/js/pages/reports/RefPayments.vue b/resources/js/pages/reports/RefPayments.vue
index fe3b274d..dee75ba5 100644
--- a/resources/js/pages/reports/RefPayments.vue
+++ b/resources/js/pages/reports/RefPayments.vue
@@ -55,6 +55,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
+
 import BigNumber from 'bignumber.js';
 import moment from 'moment';
 import randomColor from 'randomcolor';
@@ -83,11 +85,11 @@ export default {
 				'items-per-page-options': [30, 50, 100, 500],
 				'items-per-page-all-text': '500',
 			},
-			currencies: [],
 		};
 	},
 
 	computed: {
+    ...mapState('trading', ['all_currencies','allCurrencyListInit']),
 		headers() {
 			return [
 				{ text: 'ID', value: 'id' },
@@ -98,6 +100,9 @@ export default {
 				{ text: this.$t('table_header.amount'), value: 'amount' },
 			];
 		},
+    currencies() {
+      return this.allCurrencyListInit ? this.all_currencies : []
+    },
 	},
 
 	watch: {
@@ -205,10 +210,5 @@ export default {
 		},
 	},
 
-	mounted() {
-		axios.get('/trader/ext/all_currencies').then(response => {
-			this.currencies = response.data.data;
-		});
-	},
 };
 </script>
diff --git a/resources/js/pages/reports/Transfers.vue b/resources/js/pages/reports/Transfers.vue
index eda5f411..57527a61 100644
--- a/resources/js/pages/reports/Transfers.vue
+++ b/resources/js/pages/reports/Transfers.vue
@@ -60,6 +60,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
+
 import BigNumber from 'bignumber.js';
 import moment from 'moment';
 import randomColor from 'randomcolor';
@@ -92,11 +94,11 @@ export default {
 				{ value: false, name: 'From safe to trade wallet' },
 				{ value: true, name: 'From trade to safe wallet' },
 			],
-			currencies: [],
 		};
 	},
 
 	computed: {
+    ...mapState('trading', ['all_currencies','allCurrencyListInit']),
 		headers() {
 			return [
 				{ text: 'ID', value: 'id' },
@@ -106,6 +108,9 @@ export default {
 				{ text: this.$t('table_header.amount'), value: 'amount' },
 			];
 		},
+    currencies() {
+      return this.allCurrencyListInit ? this.all_currencies : []
+    },
 	},
 
 	watch: {
@@ -220,10 +225,5 @@ export default {
 		},
 	},
 
-	mounted() {
-		axios.get('/trader/ext/all_currencies').then(response => {
-			this.currencies = response.data.data;
-		});
-	},
 };
 </script>