Skip to content

fix: zindex issue #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nijil-deriv merged 2 commits into from
Dec 10, 2025
Merged

fix: zindex issue #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aad0046
fix: zindex issue
mayuran-deriv Dec 10, 2025
ff7b629
fix: observer
mayuran-deriv Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/components/layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { useEffect, useMemo, useState } from 'react';
import clsx from 'clsx';
import Cookies from 'js-cookie';
import { observer } from 'mobx-react-lite';
import { Outlet } from 'react-router-dom';
import PWAUpdateNotification from '@/components/pwa-update-notification';
import { api_base } from '@/external/bot-skeleton';
import { useOfflineDetection } from '@/hooks/useOfflineDetection';
import { useStore } from '@/hooks/useStore';
import useTMB from '@/hooks/useTMB';
import { handleOidcAuthFailure } from '@/utils/auth-utils';
import { requestOidcAuthentication } from '@deriv-com/auth-client';
Expand All @@ -15,9 +17,11 @@ import AppHeader from './header';
import Body from './main-body';
import './layout.scss';

const Layout = () => {
const Layout = observer(() => {
const { isDesktop } = useDevice();
const { isOnline } = useOfflineDetection();
const store = useStore();
const is_quick_strategy_active = store?.quick_strategy?.is_open;

const isCallbackPage = window.location.pathname === '/callback';
const { onRenderTMBCheck, is_tmb_enabled: tmb_enabled_from_hook, isTmbEnabled } = useTMB();
Expand Down Expand Up @@ -230,7 +234,12 @@ const Layout = () => {
}, [isAuthenticating, isInitialAuthCheckComplete]);

return (
<div className={clsx('layout', { responsive: isDesktop })}>
<div
className={clsx('layout', {
responsive: isDesktop,
'quick-strategy-active': is_quick_strategy_active && !isDesktop,
})}
>
{!isCallbackPage && <AppHeader isAuthenticating={isAuthenticating || !isInitialAuthCheckComplete} />}
<Body>
<Outlet />
Expand All @@ -239,6 +248,6 @@ const Layout = () => {
<PWAUpdateNotification />
</div>
);
};
});

export default Layout;
9 changes: 8 additions & 1 deletion src/components/layout/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@

@include mobile-or-tablet-screen {
height: 4rem;
z-index: 10000;
}
}

&.quick-strategy-active {
.deriv-header {
@include mobile-or-tablet-screen {
z-index: 10000;
}
}
}
}
Loading