diff --git a/apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx b/apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx index 59010b4dd8..fac276a3fd 100644 --- a/apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx +++ b/apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx @@ -1,4 +1,5 @@ import { + Box, Button, Center, Divider, @@ -129,7 +130,7 @@ export const AccountSelectorModal = () => { } spacing="18px" > @@ -188,26 +189,43 @@ export const AccountSelectorModal = () => { ))} {/* This is a hack to toggle the shadow on the footer button*/} -
+ {isVerified && ( - + + + )} diff --git a/apps/web/src/components/AddressTile/AddressTile.tsx b/apps/web/src/components/AddressTile/AddressTile.tsx index bbc110e275..1930219d1b 100644 --- a/apps/web/src/components/AddressTile/AddressTile.tsx +++ b/apps/web/src/components/AddressTile/AddressTile.tsx @@ -21,8 +21,9 @@ import { CopyAddressButton } from "../CopyAddressButton"; export const AddressTile = ({ size = "sm", address, + hideBalance = false, ...flexProps -}: { address: Address; size?: "xs" | "sm" } & FlexProps) => { +}: { address: Address; size?: "xs" | "sm"; hideBalance?: boolean } & FlexProps) => { const addressKind = useAddressKind(address); const color = useColor(); @@ -71,7 +72,9 @@ export const AddressTile = ({ isLong={addressKind.type === "unknown"} variant={isSmall ? "unstyled" : "ghost"} /> - {balance !== undefined && prettyTezAmount(balance)} + {!hideBalance && ( + {balance !== undefined && prettyTezAmount(balance)} + )} diff --git a/apps/web/src/components/SendFlow/NFT/FormPage.test.tsx b/apps/web/src/components/SendFlow/NFT/FormPage.test.tsx index eb2377e3ab..9b52bb8c24 100644 --- a/apps/web/src/components/SendFlow/NFT/FormPage.test.tsx +++ b/apps/web/src/components/SendFlow/NFT/FormPage.test.tsx @@ -26,6 +26,11 @@ jest.mock("@umami/core", () => ({ estimate: jest.fn(), })); +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + const sender = mockImplicitAccount(0); const nft = mockNFTBalance(1, { balance: "1" }); diff --git a/apps/web/src/components/SendFlow/NFT/SignPage.test.tsx b/apps/web/src/components/SendFlow/NFT/SignPage.test.tsx index 7f6b43d078..bbccf6012b 100644 --- a/apps/web/src/components/SendFlow/NFT/SignPage.test.tsx +++ b/apps/web/src/components/SendFlow/NFT/SignPage.test.tsx @@ -11,6 +11,11 @@ import { TEZ, parseContractPkh } from "@umami/tezos"; import { SignPage } from "./SignPage"; import { renderInModal, screen, waitFor } from "../../../testUtils"; +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + let store: UmamiStore; beforeEach(() => { diff --git a/apps/web/src/components/SendFlow/NFT/SignPage.tsx b/apps/web/src/components/SendFlow/NFT/SignPage.tsx index 9713824020..ee66cc86aa 100644 --- a/apps/web/src/components/SendFlow/NFT/SignPage.tsx +++ b/apps/web/src/components/SendFlow/NFT/SignPage.tsx @@ -9,6 +9,7 @@ import { ModalFooter, Text, VStack, + useBreakpointValue, } from "@chakra-ui/react"; import { type EstimatedAccountOperations, type FA2Transfer, type NFTBalance } from "@umami/core"; import { FormProvider } from "react-hook-form"; @@ -27,6 +28,7 @@ export const SignPage = (props: { nft: NFTBalance; operations: EstimatedAccountO const { fee, operations, estimationFailed, isLoading, form, signer, onSign } = useSignPageHelpers(initialOperations); const color = useColor(); + const hideBalance = useBreakpointValue({ base: true, md: false }); const { recipient, amount } = operations.operations[0] as FA2Transfer; @@ -52,11 +54,11 @@ export const SignPage = (props: { nft: NFTBalance; operations: EstimatedAccountO From - + To - + diff --git a/apps/web/src/components/SendFlow/Tez/FormPage.test.tsx b/apps/web/src/components/SendFlow/Tez/FormPage.test.tsx index 182a36d5b3..61b9e7ab53 100644 --- a/apps/web/src/components/SendFlow/Tez/FormPage.test.tsx +++ b/apps/web/src/components/SendFlow/Tez/FormPage.test.tsx @@ -26,6 +26,11 @@ jest.mock("@umami/core", () => ({ estimate: jest.fn(), })); +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + let store: UmamiStore; beforeEach(() => { diff --git a/apps/web/src/components/SendFlow/Tez/SignPage.test.tsx b/apps/web/src/components/SendFlow/Tez/SignPage.test.tsx index bfa0c8f6e0..04e15a667d 100644 --- a/apps/web/src/components/SendFlow/Tez/SignPage.test.tsx +++ b/apps/web/src/components/SendFlow/Tez/SignPage.test.tsx @@ -8,6 +8,11 @@ import { SignPage } from "./SignPage"; import { render, screen, waitFor } from "../../../testUtils"; import { type SignPageProps } from "../utils"; +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + const fixture = (props: SignPageProps) => ( {}}> diff --git a/apps/web/src/components/SendFlow/Tez/SignPage.tsx b/apps/web/src/components/SendFlow/Tez/SignPage.tsx index 5af9d0ce8c..444dc7e666 100644 --- a/apps/web/src/components/SendFlow/Tez/SignPage.tsx +++ b/apps/web/src/components/SendFlow/Tez/SignPage.tsx @@ -5,6 +5,7 @@ import { ModalBody, ModalContent, ModalFooter, + useBreakpointValue, } from "@chakra-ui/react"; import { type TezTransfer } from "@umami/core"; import { FormProvider } from "react-hook-form"; @@ -21,6 +22,7 @@ export const SignPage = (props: SignPageProps) => { const { operations: initialOperations } = props; const { fee, operations, estimationFailed, isLoading, form, signer, onSign } = useSignPageHelpers(initialOperations); + const hideBalance = useBreakpointValue({ base: true, md: false }); const { amount: mutezAmount, recipient } = operations.operations[0] as TezTransfer; @@ -39,11 +41,11 @@ export const SignPage = (props: SignPageProps) => { From - + To - + diff --git a/apps/web/src/components/SendFlow/Token/FormPage.test.tsx b/apps/web/src/components/SendFlow/Token/FormPage.test.tsx index 8a8c217b23..11eba0205f 100644 --- a/apps/web/src/components/SendFlow/Token/FormPage.test.tsx +++ b/apps/web/src/components/SendFlow/Token/FormPage.test.tsx @@ -30,6 +30,11 @@ jest.mock("@umami/core", () => ({ estimate: jest.fn(), })); +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + const mockAccount = mockMnemonicAccount(0); const mockTokenRaw = mockFA2TokenRaw(0, mockAccount.address.pkh); const mockToken = mockFA2Token(0, mockAccount); diff --git a/apps/web/src/components/SendFlow/Token/SignPage.test.tsx b/apps/web/src/components/SendFlow/Token/SignPage.test.tsx index 6cf0200e2a..cf7ff64b66 100644 --- a/apps/web/src/components/SendFlow/Token/SignPage.test.tsx +++ b/apps/web/src/components/SendFlow/Token/SignPage.test.tsx @@ -15,6 +15,11 @@ import { SignPage } from "./SignPage"; import { render, screen, waitFor } from "../../../testUtils"; import { type SignPageProps } from "../utils"; +jest.mock("@chakra-ui/react", () => ({ + ...jest.requireActual("@chakra-ui/react"), + useBreakpointValue: jest.fn(), +})); + const fixture = (props: SignPageProps<{ token: FA12TokenBalance | FA2TokenBalance }>) => ( {}}> diff --git a/apps/web/src/components/SendFlow/Token/SignPage.tsx b/apps/web/src/components/SendFlow/Token/SignPage.tsx index 27b2dcef84..cae07bbcb6 100644 --- a/apps/web/src/components/SendFlow/Token/SignPage.tsx +++ b/apps/web/src/components/SendFlow/Token/SignPage.tsx @@ -5,6 +5,7 @@ import { ModalBody, ModalContent, ModalFooter, + useBreakpointValue, } from "@chakra-ui/react"; import { type FA12TokenBalance, type FA2TokenBalance, type TokenTransfer } from "@umami/core"; import { FormProvider } from "react-hook-form"; @@ -24,7 +25,7 @@ export const SignPage = (props: SignPageProps<{ token: FA12TokenBalance | FA2Tok } = props; const { fee, operations, estimationFailed, isLoading, form, signer, onSign } = useSignPageHelpers(initialOperations); - + const hideBalance = useBreakpointValue({ base: true, md: false }); const { amount, recipient } = operations.operations[0] as TokenTransfer; return ( @@ -42,11 +43,11 @@ export const SignPage = (props: SignPageProps<{ token: FA12TokenBalance | FA2Tok From - + To - +