Fixed Bug 66907: Added option for show info bar inside js-sdk frame

This commit is contained in:
Ilya Oleshko 2024-08-13 11:42:06 +03:00
parent d6c490be53
commit e5bbb84f04
2 changed files with 7 additions and 5 deletions

View File

@ -88,6 +88,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
version,
pagesWithoutNavMenu,
isFrame,
barTypeInFrame,
} = rest;
const theme = useTheme();
@ -457,7 +458,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
<DialogsWrapper t={t} />
<Main isDesktop={isDesktop}>
{!isFrame && <MainBar />}
{barTypeInFrame !== "none" && <MainBar />}
<div className="main-container">
<Outlet />
</div>
@ -565,6 +566,7 @@ const ShellWrapper = inject(
version,
pagesWithoutNavMenu,
isFrame,
barTypeInFrame: frameConfig?.showHeaderBanner,
};
},
)(observer(Shell));

View File

@ -63,7 +63,7 @@ const MainBar = ({
snackbarExist,
setMaintenanceExist,
isNotPaidPeriod,
isFrame,
barTypeInFrame,
}) => {
const { pathname } = useLocation();
@ -72,7 +72,7 @@ const MainBar = ({
}, []);
const isVisibleBar =
!isFrame &&
barTypeInFrame !== "none" &&
!isNotPaidPeriod &&
!pathname.includes("error") &&
!pathname.includes("confirm") &&
@ -95,7 +95,7 @@ export default inject(
filesStore,
currentTariffStatusStore,
}) => {
const { checkedMaintenance, setMaintenanceExist, snackbarExist, isFrame } =
const { checkedMaintenance, setMaintenanceExist, snackbarExist, frameConfig } =
settingsStore;
const { isNotPaidPeriod } = currentTariffStatusStore;
const { firstLoad } = clientLoadingStore;
@ -107,7 +107,7 @@ export default inject(
snackbarExist,
setMaintenanceExist,
isNotPaidPeriod,
isFrame,
barTypeInFrame: frameConfig?.showHeaderBanner
};
},
)(observer(MainBar));