diff --git a/apps/web/src/assets/icons/reddit.svg b/apps/web/src/assets/icons/reddit.svg index ef4ad88d5..3f9f9b675 100644 --- a/apps/web/src/assets/icons/reddit.svg +++ b/apps/web/src/assets/icons/reddit.svg @@ -1,4 +1,5 @@ - + + + fill="black" /> diff --git a/apps/web/src/components/AccountCard/AccountBalance.test.tsx b/apps/web/src/components/AccountCard/AccountBalance.test.tsx index 1f089ab23..49635fb96 100644 --- a/apps/web/src/components/AccountCard/AccountBalance.test.tsx +++ b/apps/web/src/components/AccountCard/AccountBalance.test.tsx @@ -91,8 +91,8 @@ describe("", () => { it("doesn't render balance if it's not available", () => { render(, { store }); - expect(screen.queryByTestId("tez-balance")).not.toBeInTheDocument(); - expect(screen.queryByTestId("usd-balance")).not.toBeInTheDocument(); + expect(screen.getByTestId("tez-balance")).toHaveTextContent("0 ęś©"); + expect(screen.getByTestId("usd-balance")).toHaveTextContent("$0.00"); }); }); diff --git a/apps/web/src/components/AccountCard/AccountBalance.tsx b/apps/web/src/components/AccountCard/AccountBalance.tsx index 1a6caa071..25e4f5bef 100644 --- a/apps/web/src/components/AccountCard/AccountBalance.tsx +++ b/apps/web/src/components/AccountCard/AccountBalance.tsx @@ -1,7 +1,7 @@ import { Box, Flex, Link, Text } from "@chakra-ui/react"; import { useDynamicModalContext } from "@umami/components"; import { useCurrentAccount, useGetAccountBalance, useGetDollarBalance } from "@umami/state"; -import { prettyTezAmount } from "@umami/tezos"; +import { TEZ, prettyTezAmount } from "@umami/tezos"; import { SendTezButton } from "./SendTezButton"; import { ArrowDownLeftIcon, WalletIcon } from "../../assets/icons"; @@ -21,6 +21,15 @@ export const AccountBalance = () => { const buyTezUrl = `https://widget.wert.io/default/widget/?commodity=XTZ&address=${address}&network=tezos&commodity_id=xtz.simple.tezos`; + const getUsdBalance = () => { + if (balance === undefined) { + return "$0.00"; + } else if (usdBalance === undefined) { + return; + } + return `$${usdBalance}`; + }; + return ( @@ -35,14 +44,12 @@ export const AccountBalance = () => { > Tez Balance - {balance !== undefined && ( - - {prettyTezAmount(balance)} - - )} - {usdBalance !== undefined && ( + + {balance ? prettyTezAmount(balance) : `0 ${TEZ}`} + + {getUsdBalance() && ( - {`$${usdBalance}`} + {getUsdBalance()} )} diff --git a/apps/web/src/components/AccountSelectorModal/RenameAccountModal.tsx b/apps/web/src/components/AccountSelectorModal/RenameAccountModal.tsx index 3830b0ad5..8cbb5ce8b 100644 --- a/apps/web/src/components/AccountSelectorModal/RenameAccountModal.tsx +++ b/apps/web/src/components/AccountSelectorModal/RenameAccountModal.tsx @@ -56,7 +56,7 @@ export const RenameAccountPage = ({ account }: RenameAccountPageProps) => {
- + Edit name diff --git a/apps/web/src/components/AccountTile/AccountTileWrapper.tsx b/apps/web/src/components/AccountTile/AccountTileWrapper.tsx index 980172cd9..e9ed3f4bc 100644 --- a/apps/web/src/components/AccountTile/AccountTileWrapper.tsx +++ b/apps/web/src/components/AccountTile/AccountTileWrapper.tsx @@ -8,12 +8,13 @@ export const AccountTileWrapper = ({ children, ...props }: PropsWithChildren> & { - size?: "xs" | "sm"; + size?: "xs" | "sm" | "md"; }) => { const color = useColor(); const sizes = { xs: "30px", sm: "48px", + md: "60px", }; return ( diff --git a/apps/web/src/components/ColorSchemeModeToggle/ColorSchemeModeToggle.tsx b/apps/web/src/components/ColorSchemeModeToggle/ColorSchemeModeToggle.tsx index 60aca752e..13668fb45 100644 --- a/apps/web/src/components/ColorSchemeModeToggle/ColorSchemeModeToggle.tsx +++ b/apps/web/src/components/ColorSchemeModeToggle/ColorSchemeModeToggle.tsx @@ -1,7 +1,10 @@ import { Flex, Switch, useColorMode } from "@chakra-ui/react"; +import { useColor } from "../../styles/useColor"; + export const ColorSchemeModeToggle = () => { const { colorMode, toggleColorMode } = useColorMode(); + const color = useColor(); const switchText = colorMode === "light" ? "Light mode" : "Dark mode"; @@ -13,6 +16,7 @@ export const ColorSchemeModeToggle = () => { base: "none", md: "flex", }} + color={color("500")} > {switchText} diff --git a/apps/web/src/components/CustomToast/CustomToast.tsx b/apps/web/src/components/CustomToast/CustomToast.tsx index 260ea994b..d26aed6eb 100644 --- a/apps/web/src/components/CustomToast/CustomToast.tsx +++ b/apps/web/src/components/CustomToast/CustomToast.tsx @@ -51,9 +51,9 @@ export const CustomToast = (props: CustomToastProps): ReactNode => { }; return ( - + - + {title && {title}} {description && ( diff --git a/apps/web/src/components/MasterPasswordModal/MasterPasswordModal.tsx b/apps/web/src/components/MasterPasswordModal/MasterPasswordModal.tsx index ea8f64642..02e8db2e8 100644 --- a/apps/web/src/components/MasterPasswordModal/MasterPasswordModal.tsx +++ b/apps/web/src/components/MasterPasswordModal/MasterPasswordModal.tsx @@ -37,7 +37,7 @@ export const MasterPasswordModal = ({ onSubmit }: MasterPasswordModalProps) => {
- + Confirm password Enter your master password diff --git a/apps/web/src/components/NameAccountModal/NameAccountModal.tsx b/apps/web/src/components/NameAccountModal/NameAccountModal.tsx index 86b736554..db631f98e 100644 --- a/apps/web/src/components/NameAccountModal/NameAccountModal.tsx +++ b/apps/web/src/components/NameAccountModal/NameAccountModal.tsx @@ -58,7 +58,7 @@ export const NameAccountModal = ({
- + {title} {subtitle && ( {
- + Import Wallet
diff --git a/apps/web/src/components/Onboarding/OnboardOptions/OnboardOptions.tsx b/apps/web/src/components/Onboarding/OnboardOptions/OnboardOptions.tsx index 118b0c35f..c9c40164f 100644 --- a/apps/web/src/components/Onboarding/OnboardOptions/OnboardOptions.tsx +++ b/apps/web/src/components/Onboarding/OnboardOptions/OnboardOptions.tsx @@ -43,19 +43,19 @@ export const OnboardOptions = ({ children }: PropsWithChildren) => {
- + - + - + - + diff --git a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithFacebookButton.tsx b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithFacebookButton.tsx index 7a137bfcc..3c30565fe 100644 --- a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithFacebookButton.tsx +++ b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithFacebookButton.tsx @@ -11,9 +11,10 @@ export const OnboardWithFacebookButton = ({ return ( } + icon={} isLoading={isLoading} onClick={onboard} variant="socialLogin" diff --git a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithGoogleButton.tsx b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithGoogleButton.tsx index 83ac5249d..1ea73800d 100644 --- a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithGoogleButton.tsx +++ b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithGoogleButton.tsx @@ -11,9 +11,10 @@ export const OnboardWithGoogleButton = ({ return ( } + icon={} isLoading={isLoading} onClick={onboard} variant="socialLogin" diff --git a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithRedditButton.tsx b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithRedditButton.tsx index ef982d17b..587eedf62 100644 --- a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithRedditButton.tsx +++ b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithRedditButton.tsx @@ -11,9 +11,10 @@ export const OnboardWithRedditButton = ({ return ( } + icon={} isLoading={isLoading} onClick={onboard} variant="socialLogin" diff --git a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithTwitterButton.tsx b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithTwitterButton.tsx index d2c16f97b..aa9f5a14b 100644 --- a/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithTwitterButton.tsx +++ b/apps/web/src/components/Onboarding/OnboardOptions/OnboardWithTwitterButton.tsx @@ -11,10 +11,11 @@ export const OnboardWithTwitterButton = ({ return ( } + icon={} isLoading={isLoading} onClick={onboard} variant="socialLogin" diff --git a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx index d448d6473..67e809c50 100644 --- a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx +++ b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx @@ -42,7 +42,8 @@ const getModeConfig = (mode: Mode) => { icon: UserIcon, title: "Create Password", buttonLabel: "Create Account", - subtitle: "Set a password to unlock your wallet. Make sure to store your password safely.", + subtitle: + "Set a password to unlock your wallet.\n Make sure to store your password safely.", }; case "save_backup": return { @@ -92,9 +93,11 @@ export const SetupPassword = ({ mode }: SetupPasswordProps) => { -
- - {title} +
+ + + {title} + {subtitle && ( {subtitle} diff --git a/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx index c9dafcd95..06d7a56b4 100644 --- a/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx +++ b/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx @@ -57,7 +57,7 @@ export const ImportantNoticeModal = ({ mnemonic }: ImportantNoticeModalProps) =>
- + Important Notice Please read the following before you continue to see your secret Seed Phrase. diff --git a/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx index d0504bdf5..c1053b301 100644 --- a/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx +++ b/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx @@ -36,7 +36,7 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
- + Record Seed Phrase Record these 24 words in order to restore your wallet in the future diff --git a/apps/web/src/components/Onboarding/VerificationFlow/VerificationInfoModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/VerificationInfoModal.tsx index 3f23f4242..e5c6e0404 100644 --- a/apps/web/src/components/Onboarding/VerificationFlow/VerificationInfoModal.tsx +++ b/apps/web/src/components/Onboarding/VerificationFlow/VerificationInfoModal.tsx @@ -45,7 +45,7 @@ export const VerificationInfoModal = () => { - + How does Verification Work? diff --git a/apps/web/src/components/Onboarding/VerificationFlow/VerifyMessage.tsx b/apps/web/src/components/Onboarding/VerificationFlow/VerifyMessage.tsx index ed5cdc6fb..7ee12c1c1 100644 --- a/apps/web/src/components/Onboarding/VerificationFlow/VerifyMessage.tsx +++ b/apps/web/src/components/Onboarding/VerificationFlow/VerifyMessage.tsx @@ -24,7 +24,7 @@ export const VerifyMessage = ({ ...props }: Omit) => /> openWith()} textDecor="underline" diff --git a/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx index 4af70142d..ee8ba9107 100644 --- a/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx +++ b/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx @@ -69,7 +69,7 @@ export const VerifySeedphraseModal = ({ seedPhrase }: VerifySeedphraseModalProps
- + Verify Seed Phrase To verify, please type in the word that corresponds to each sequence number. diff --git a/apps/web/src/components/PasswordInput/PasswordInput.tsx b/apps/web/src/components/PasswordInput/PasswordInput.tsx index 4f4283e0c..5bd4f972d 100644 --- a/apps/web/src/components/PasswordInput/PasswordInput.tsx +++ b/apps/web/src/components/PasswordInput/PasswordInput.tsx @@ -79,6 +79,11 @@ export const PasswordInput = >({ {label} { } }; - const currentColor = color("50"); + const currentColor = color("400"); return ( { overflow="hidden" width="100%" height="100%" + color={currentColor} + opacity="0.1" z-index="0" > - - - + + + ); }; diff --git a/apps/web/src/styles/theme.ts b/apps/web/src/styles/theme.ts index 19fce1f1a..8f39889ac 100644 --- a/apps/web/src/styles/theme.ts +++ b/apps/web/src/styles/theme.ts @@ -224,6 +224,9 @@ const theme = extendTheme({ }, Tabs: { baseStyle: (props: StyleFunctionProps) => ({ + tablist: { + color: "gray.500", + }, tab: { color: "gray.500", _selected: { @@ -323,7 +326,6 @@ const theme = extendTheme({ }, Link: { baseStyle: { - color: "gray.600", textUnderlineOffset: "2px", }, variants: { @@ -418,10 +420,10 @@ const theme = extendTheme({ }, }, primary: { - bg: light.blue, + bg: light.blueDark, color: dark.grey.black, _hover: { - bg: light.blueDark, + bg: light.blue, }, }, alert: { @@ -544,6 +546,10 @@ const theme = extendTheme({ }, }, baseStyle: { + overlay: { + background: "rgba(22, 22, 43, 0.80)", + backdropFilter: "blur(5px)", + }, closeButton: { bg: "transparent", color: "gray.400", @@ -629,6 +635,9 @@ const theme = extendTheme({ "#root": { bg: mode(light.bgGradient, dark.bgGradient)(props), }, + "#root:has(.welcome-view)": { + bg: "radial-gradient(123.02% 70.68% at 50% 49.96%, rgba(22, 22, 43, 0.00) 0%, #10121B 100%)", + }, body: { color: mode(light.grey[600], dark.grey[600])(props), bg: mode(light.bg, dark.bg)(props), diff --git a/apps/web/src/views/Welcome/Welcome.tsx b/apps/web/src/views/Welcome/Welcome.tsx index efb4b4819..d5aca1ec6 100644 --- a/apps/web/src/views/Welcome/Welcome.tsx +++ b/apps/web/src/views/Welcome/Welcome.tsx @@ -26,6 +26,7 @@ export const Welcome = () => { return ( { flexDirection="column" width="full" height="full" - padding={{ base: "36px 12px", md: "36px 42px" }} + padding={{ base: "36px", md: "36px 42px" }} + color={color("700")} + fontSize="14px" border="1px solid" borderColor={color("100")} borderTopRadius="30px" @@ -78,7 +81,15 @@ export const Welcome = () => { By proceeding, you agree to Umami's{" "} - + Terms of Use @@ -86,13 +97,12 @@ export const Welcome = () => { <> - + - + - + - @@ -113,18 +123,18 @@ export const Welcome = () => { display="flex" marginBottom="5px" color={color("700")} + fontSize="14px" > - + - + { display="flex" marginBottom="5px" color={color("700")} + fontSize="14px" > - + - +