Skip to content

Commit 20f0f59

Browse files
authored
Merge pull request #927 from makerdao/dark-mode-first-load
Dark mode first load fix
2 parents 9acc937 + adc39ff commit 20f0f59

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

modules/app/components/layout/Header.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ const Header = (): JSX.Element => {
134134
const { network } = useWeb3();
135135
const { data: gas } = useGasPrice({ network });
136136
const [mode, setMode] = useColorMode();
137+
const [renderedMode, setRenderedMode] = useState('light');
137138

138139
const onToggleTheme = () => {
139140
const next = mode === 'dark' ? 'light' : 'dark';
@@ -142,6 +143,10 @@ const Header = (): JSX.Element => {
142143
setMode(next);
143144
};
144145

146+
useEffect(() => {
147+
setRenderedMode(mode);
148+
}, [mode]);
149+
145150
return (
146151
<Box
147152
as="header"
@@ -164,7 +169,7 @@ const Header = (): JSX.Element => {
164169
<InternalLink href={'/'} title="View homepage">
165170
<IconButton aria-label="Sky home" sx={{ width: '70px', height: 4, p: 0 }}>
166171
<Icon
167-
name={mode === 'dark' ? 'sky_white' : 'sky'}
172+
name={renderedMode === 'dark' ? 'sky_white' : 'sky'}
168173
size="auto"
169174
sx={{ width: '70px', cursor: 'pointer' }}
170175
/>

modules/home/components/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export default function Footer({ locale = 'en' }: { locale?: string }): React.Re
144144
>
145145
<ContactSection
146146
heading="Official Community Channels"
147-
icon={mode === 'dark' ? 'sky_white' : 'sky'}
147+
icon={renderedMode === 'dark' ? 'sky_white' : 'sky'}
148148
logos={logos.sky}
149149
/>
150150
<Flex

0 commit comments

Comments
 (0)