bugfix(TEAMMSBMOB-10267): убрал иконку валюты из чипсов + сброс фильтров после перехода со страницы "мои продукты"
This commit is contained in:
@@ -89,4 +89,7 @@ const formatSize = (byte: number | string, locale: string = 'ru') => {
|
||||
return `${byteSize} ${SIZE_DESIGNATIONS[locale].B}`;
|
||||
};
|
||||
|
||||
export { formatSize };
|
||||
const getFormattedBalanceWithoutIcon = (money: number, maximumFractionDigits = 2, minimumFractionDigits = 2) =>
|
||||
new Intl.NumberFormat('ru-RU', { style: 'decimal', maximumFractionDigits, minimumFractionDigits }).format(money);
|
||||
|
||||
export { formatSize, getFormattedBalanceWithoutIcon };
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { CurrencyCode } from '@msb/http';
|
||||
import { statusFilters } from '@msb/http';
|
||||
import { getFormattedBalance } from 'msb-main-page/src/shared/lib';
|
||||
import { getFormattedBalanceWithoutIcon } from '@msb/shared';
|
||||
import { currencyToNameFormatter, useFiltersContext } from '@/shared/lib';
|
||||
|
||||
const useGetTags = () => {
|
||||
@@ -12,8 +12,8 @@ const useGetTags = () => {
|
||||
if (filters.amountFrom || filters.amountTo) {
|
||||
let label = 'Сумма: ';
|
||||
|
||||
const amountFrom = filters.amountFrom ? getFormattedBalance(Number(filters.amountFrom)) : '';
|
||||
const amountTo = filters.amountTo ? getFormattedBalance(Number(filters.amountTo)) : '';
|
||||
const amountFrom = filters.amountFrom ? getFormattedBalanceWithoutIcon(Number(filters.amountFrom)) : '';
|
||||
const amountTo = filters.amountTo ? getFormattedBalanceWithoutIcon(Number(filters.amountTo)) : '';
|
||||
|
||||
if (amountFrom && amountTo) {
|
||||
label += `от ${amountFrom} до ${amountTo}`;
|
||||
|
||||
@@ -5,6 +5,7 @@ import type { TreasuryDealsFilters } from '@msb/http';
|
||||
import { useProducts, useUserInfoUnion } from '@msb/http';
|
||||
import { LOCALIZATION, PATHS as ROOT_PATHS, useDepositsPermissions, useRedirect } from '@msb/shared';
|
||||
import { useLocation } from 'react-router-dom';
|
||||
import { advancedFilterInitialValues } from '@/entities/filters';
|
||||
import { PATHS } from '@/shared/constants';
|
||||
import { useFiltersContext } from '@/shared/lib';
|
||||
import { PageHeader, PageLayout, SystemResponseWrapper } from '@/shared/ui';
|
||||
@@ -22,7 +23,7 @@ const ProductsPage = (): ReactElement => {
|
||||
|
||||
const { hasDepositPermissions } = useDepositsPermissions();
|
||||
const goToHome = useRedirect(ROOT_PATHS.HOME);
|
||||
const { filters, advancedFilters, updateFilter } = useFiltersContext();
|
||||
const { filters, advancedFilters, updateFilter, updateAdvancedFilters } = useFiltersContext();
|
||||
const { isUserInfoUnionLoading, clientIdsCount, userInfoUnionError } = useUserInfoUnion();
|
||||
const {
|
||||
allProductsData,
|
||||
@@ -46,6 +47,13 @@ const ProductsPage = (): ReactElement => {
|
||||
}
|
||||
}, [location.state]);
|
||||
|
||||
useEffect(
|
||||
() => () => {
|
||||
updateAdvancedFilters(advancedFilterInitialValues);
|
||||
},
|
||||
[updateAdvancedFilters]
|
||||
);
|
||||
|
||||
if (productsDataLoading || isUserInfoUnionLoading) return <SkeletonProductsPage />;
|
||||
|
||||
if (productsFetchError || userInfoUnionError)
|
||||
|
||||
Reference in New Issue
Block a user