Skip to content

fix(web): improve onClick functionality #1657

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
merged 4 commits into from
Jul 22, 2024
Merged

fix(web): improve onClick functionality #1657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02eed64
refactor(web): clean code
ShubhamParkhi Jul 18, 2024
10939c6
fix(web): improve onClick functionality
ShubhamParkhi Jul 20, 2024
1fd68f0
Merge branch 'kleros:dev' into dev
ShubhamParkhi Jul 20, 2024
d4f28a5
fix(web): correct hook use
ShubhamParkhi Jul 22, 2024
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
17 changes: 12 additions & 5 deletions web/src/layout/Header/DesktopHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ import styled, { css } from "styled-components";

import { useLocation } from "react-router-dom";
import { useToggle } from "react-use";
import { useAccount } from "wagmi";

import KlerosSolutionsIcon from "svgs/menu-icons/kleros-solutions.svg";

import { useLockOverlayScroll } from "hooks/useLockOverlayScroll";

import { DEFAULT_CHAIN } from "consts/chains";

import { landscapeStyle } from "styles/landscapeStyle";
import { responsiveSize } from "styles/responsiveSize";

Expand All @@ -21,7 +24,6 @@ import Explore from "./navbar/Explore";
import Menu from "./navbar/Menu";
import Help from "./navbar/Menu/Help";
import Settings from "./navbar/Menu/Settings";
import { useAccount } from "wagmi";

const Container = styled.div`
display: none;
Expand Down Expand Up @@ -73,13 +75,14 @@ const StyledKlerosSolutionsIcon = styled(KlerosSolutionsIcon)`
fill: ${({ theme }) => theme.white} !important;
`;

const ConnectWalletContainer = styled.div<{ isConnected: boolean }>`
const ConnectWalletContainer = styled.div<{ isConnected: boolean; isDefaultChain: boolean }>`
label {
color: ${({ theme }) => theme.white};
}

${({ isConnected }) =>
${({ isConnected, isDefaultChain }) =>
isConnected &&
isDefaultChain &&
css`
cursor: pointer;
& > * {
Expand All @@ -105,7 +108,8 @@ const DesktopHeader: React.FC = () => {
const [isOnboardingMiniGuidesOpen, toggleIsOnboardingMiniGuidesOpen] = useToggle(false);
const [initialTab, setInitialTab] = useState<number>(0);
const location = useLocation();
const { isConnected } = useAccount();
const { isConnected, chainId } = useAccount();
const isDefaultChain = chainId === DEFAULT_CHAIN;

const initializeFragmentURL = useCallback(() => {
const hash = location.hash;
Expand Down Expand Up @@ -141,7 +145,10 @@ const DesktopHeader: React.FC = () => {
</MiddleSide>

<RightSide>
<ConnectWalletContainer isConnected={isConnected} onClick={isConnected ? toggleIsSettingsOpen : undefined}>
<ConnectWalletContainer
{...{ isConnected, isDefaultChain }}
onClick={isConnected && isDefaultChain ? toggleIsSettingsOpen : undefined}
>
<ConnectWallet />
</ConnectWalletContainer>
<Menu {...{ toggleIsHelpOpen, toggleIsSettingsOpen }} />
Expand Down
2 changes: 1 addition & 1 deletion web/src/layout/Header/navbar/Menu/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const Settings: React.FC<ISettings> = ({ toggleIsSettingsOpen, initialTab }) =>
setCurrentTab(n);
}}
/>
{currentTab === 0 ? <General /> : <NotificationSettings toggleIsSettingsOpen={toggleIsSettingsOpen} />}
{currentTab === 0 ? <General /> : <NotificationSettings {...{ toggleIsSettingsOpen }} />}
</Container>
);
};
Expand Down
Loading