Skip to content

Commit

Permalink
Fix ui
Browse files Browse the repository at this point in the history
  • Loading branch information
OKendigelyan committed Oct 18, 2024
1 parent 7efd3aa commit 67cebbd
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 17 deletions.
8 changes: 3 additions & 5 deletions apps/web/src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { Card, Icon, SlideFade, useBreakpointValue, useColorMode } from "@chakra-ui/react";
import { mode } from "@chakra-ui/theme-tools";
import { Card, Icon, SlideFade, useBreakpointValue } from "@chakra-ui/react";
import { useDynamicModalContext } from "@umami/components";
import { useCurrentAccount } from "@umami/state";
import { useEffect, useState } from "react";

import { Actions } from "./Actions";
import { LogoDarkIcon, LogoLightIcon } from "../../assets/icons";
import { LogoLightIcon } from "../../assets/icons";
import { useColor } from "../../styles/useColor";
import { AccountSelectorModal } from "../AccountSelectorModal";
import { AccountTile } from "../AccountTile";

export const Header = () => {
const color = useColor();
const colorMode = useColorMode();
const currentAccount = useCurrentAccount()!;
const { openWith } = useDynamicModalContext();

Expand Down Expand Up @@ -59,7 +57,7 @@ export const Header = () => {
md: "2px 4px 12px 0px rgba(45, 55, 72, 0.05)",
}}
>
{mode(<Icon as={LogoLightIcon} {...size} />, <Icon as={LogoDarkIcon} {...size} />)(colorMode)}
<Icon as={LogoLightIcon} {...size} />
<SlideFade in={isVisible} offsetY="20px" unmountOnExit>
<AccountTile
background={color("100")}
Expand Down
7 changes: 6 additions & 1 deletion apps/web/src/components/Menu/DrawerContentWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ export const DrawerContentWrapper = ({
<>
<DrawerBackButton />
<DrawerCloseButton />
<DrawerBody as={Flex} flexDirection="column" paddingTop={{ base: "78px", md: "90px" }}>
<DrawerBody
as={Flex}
flexDirection="column"
paddingTop={{ base: "66px", md: "90px" }}
paddingX={{ base: "24px", md: "40px" }}
>
{title && (
<Heading color={color("900")} size="2xl">
{title}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/Menu/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const MenuItem = ({ label, icon, onClick, rightElement, hasArrow }: TMenu
color={color("400")}
data-group
onClick={onClick}
variant="ghost"
variant="dropdownOption"
>
{icon}
<Text marginRight="auto" color="gray.900" fontWeight="600" size="lg">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ export const ImportBackupTab = () => {
width="full"
height="72px"
borderRadius="0"
_hover={{
bg: color("100"),
}}
onClick={() => inputRef.current?.click()}
rightIcon={<Icon as={FileUploadIcon} color={color("400")} />}
variant="ghost"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ export const SecretKeyTab = () => {
required: "Secret Key is required",
onChange: event => setIsEncrypted(isEncryptedSecretKeyPrefix(event.target.value)),
})}
_focusVisible={{
outline: "none",
borderColor: "gray.400",
boxShadow: "none",
}}
placeholder="Type here..."
/>
{errors.secretKey && <FormErrorMessage>{errors.secretKey.message}</FormErrorMessage>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ export const SeedPhraseTab = () => {
gap="10px"
color={color("900")}
borderBottom="1px solid"
borderBottomColor={color("300")}
borderBottomColor={color("100")}
_expanded={{ borderBottomColor: "transparent" }}
>
<Heading size="md">{mnemonicSize} word seed phrase</Heading>
<AccordionIcon />
</AccordionButton>

<AccordionPanel borderBottom="1px solid" borderBottomColor={color("300")}>
<AccordionPanel borderBottom="1px solid" borderBottomColor={color("100")}>
<Flex gap="8px">
<RadioButtons
inputName="mnemonicSize"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ export const OnboardOptions = ({ children }: PropsWithChildren) => {
trackButtonClick("onboarding", "use_existing_wallet");
return openWith(<ImportWallet />, {
size: "xl",
variant: "onboarding",
});
}}
size="lg"
Expand Down
12 changes: 5 additions & 7 deletions apps/web/src/styles/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const theme = extendTheme({
},
},
container: {
borderColor: "gray.100",
_last: {
borderBottomWidth: 0,
},
Expand Down Expand Up @@ -536,6 +537,10 @@ const theme = extendTheme({
paddingBottom: "20px",
paddingX: { base: "12px", md: "30px" },
},
overlay: {
background: "rgba(22, 22, 43, 0.80)",
backdropFilter: "blur(5px)",
},
},
},
Modal: {
Expand Down Expand Up @@ -603,13 +608,6 @@ const theme = extendTheme({
marginTop: "30px",
},
},
variants: {
onboarding: {
dialog: {
marginBottom: { base: 0, md: "100px" },
},
},
},
},
Checkbox: {
baseStyle: {
Expand Down

1 comment on commit 67cebbd

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Title Lines Statements Branches Functions
apps/desktop Coverage: 83%
83.6% (1765/2111) 78.81% (837/1062) 78.14% (447/572)
apps/web Coverage: 83%
83.6% (1765/2111) 78.81% (837/1062) 78.14% (447/572)
packages/components Coverage: 97%
97.31% (181/186) 95.23% (80/84) 87.03% (47/54)
packages/core Coverage: 81%
82.22% (222/270) 71.73% (99/138) 81.96% (50/61)
packages/crypto Coverage: 100%
100% (28/28) 100% (3/3) 100% (5/5)
packages/data-polling Coverage: 97%
95.27% (141/148) 87.5% (21/24) 92.85% (39/42)
packages/multisig Coverage: 98%
98.47% (129/131) 85.71% (18/21) 100% (35/35)
packages/social-auth Coverage: 100%
100% (21/21) 100% (11/11) 100% (3/3)
packages/state Coverage: 85%
84.71% (798/942) 81.33% (170/209) 78.77% (297/377)
packages/tezos Coverage: 86%
85.57% (89/104) 89.47% (17/19) 82.75% (24/29)
packages/tzkt Coverage: 86%
84.05% (58/69) 81.25% (13/16) 76.92% (30/39)

Please sign in to comment.