{ userMid }
- { !editMode &&
+ { !favoriteEditOn &&
diff --git a/src/widgets/navigation/footer.tsx b/src/widgets/navigation/footer.tsx
index 08c97c6..7ddaae5 100644
--- a/src/widgets/navigation/footer.tsx
+++ b/src/widgets/navigation/footer.tsx
@@ -8,17 +8,17 @@ import {
import { useEffect, useState } from 'react';
import { useAppBridge } from '@/hooks';
import { useTranslation } from 'react-i18next';
-import { useStore } from '@/shared/model/store';
import { showAlert } from '../show-alert';
import { checkGrant } from '@/shared/lib/check-grant';
+import { useFavoriteEditOnStore, useMenuOnStore } from '@/shared/model/store';
export const FooterNavigation = ({
- setMenuOn,
footerCurrentPage,
- setFavoriteEdit
}: FooterProps) => {
+ const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore();
const { navigate } = useNavigate();
const { t } = useTranslation();
+ const { menuOn, setMenuOn } = useMenuOnStore();
const [isFooterOn, setIsFooterOn] = useState
(true);
@@ -33,7 +33,7 @@ export const FooterNavigation = ({
}
};
const onClickToOpenMenu = () => {
- setFavoriteEdit(false);
+ setFavoriteEditOn(false);
setMenuOn(true);
};
diff --git a/src/widgets/navigation/header.tsx b/src/widgets/navigation/header.tsx
index 2c12cf5..fa83f90 100644
--- a/src/widgets/navigation/header.tsx
+++ b/src/widgets/navigation/header.tsx
@@ -15,10 +15,7 @@ import { appBridge } from '@/utils/appBridge';
export const HeaderNavigation = ({
onBack,
headerTitle,
- menuOn,
headerType,
- setMenuOn,
- favoriteEdit,
loginSuccess,
mid,
setMid
@@ -95,11 +92,7 @@ export const HeaderNavigation = ({
|| headerType === HeaderType.Alim
|| headerType === HeaderType.LeftArrow
) &&
-
+
}
{
(headerType !== HeaderType.NoHeader) &&
diff --git a/src/widgets/sub-layout/index.tsx b/src/widgets/sub-layout/index.tsx
index dbe5c7c..845a1aa 100644
--- a/src/widgets/sub-layout/index.tsx
+++ b/src/widgets/sub-layout/index.tsx
@@ -66,12 +66,9 @@ export const SubLayout = () => {
const [onBack, setOnBack] = useState(undefined);
const [headerTitle, setHeaderTitle] = useState('');
- const [isPullToRefreshEnabled, setIsPullToRefreshEnabled] = useState(false);
- const [menuOn, setMenuOn] = useState(false);
const [headerType, setHeaderType] = useState(HeaderType.NoHeader);
const [footerMode, setFooterMode] = useState(false);
const [footerCurrentPage, setFooterCurrentPage] = useState(undefined);
- const [favoriteEdit, setFavoriteEdit] = useState(false);
const [headerNavigationKey, setHeaderNavigationKey] = useState(1);
const [loginSuccess, setLoginSuccess] = useState(false);
const [mid, setMid] = useState();
@@ -411,10 +408,7 @@ export const SubLayout = () => {
{
context={{
setOnBack,
setHeaderTitle,
- setIsPullToRefreshEnabled,
- setMenuOn,
setHeaderType,
setFooterMode,
setFooterCurrentPage,
- setFavoriteEdit
}}
/>
}
{
footerMode &&
}
{ alarmRoutesOn &&
diff --git a/src/widgets/sub-layout/use-sub-layout.ts b/src/widgets/sub-layout/use-sub-layout.ts
index 9a09dac..490f787 100644
--- a/src/widgets/sub-layout/use-sub-layout.ts
+++ b/src/widgets/sub-layout/use-sub-layout.ts
@@ -28,24 +28,6 @@ export const useSetHeaderTitle = (title: string) => {
return { setHeaderTitle };
};
-export const useSetIsPullToRefreshEnabled = (enabled: boolean) => {
- const { setIsPullToRefreshEnabled } = useSubLayoutContext();
- useEffect(() => {
- setIsPullToRefreshEnabled(enabled);
- return () => setIsPullToRefreshEnabled(false);
- }, [enabled, setIsPullToRefreshEnabled]);
- return { setIsPullToRefreshEnabled };
-};
-
-export const useSetMenuOn = (menuOn: boolean) => {
- const { setMenuOn } = useSubLayoutContext();
- useEffect(() => {
- setMenuOn(menuOn);
- return () => setMenuOn(false);
- }, [menuOn, setMenuOn]);
- return { setMenuOn };
-};
-
export const useSetHeaderType = (headerType: HeaderType) => {
const { setHeaderType } = useSubLayoutContext();
useEffect(() => {
@@ -55,15 +37,6 @@ export const useSetHeaderType = (headerType: HeaderType) => {
return { setHeaderType };
};
-export const useSetFavoriteEdit = (favoriteEdit: boolean) => {
- const { setFavoriteEdit } = useSubLayoutContext();
- useEffect(() => {
- setFavoriteEdit(favoriteEdit);
- return () => setFavoriteEdit(false);
- }, [favoriteEdit, setFavoriteEdit]);
- return { setFavoriteEdit }
-};
-
export const useSetFooterMode = (footerMode: boolean) => {
const { setFooterMode } = useSubLayoutContext();
useEffect(() => {