diff --git a/src/app/components/account/account.tsx b/src/app/components/account/account.tsx index 9aa75da3..9ba80508 100644 --- a/src/app/components/account/account.tsx +++ b/src/app/components/account/account.tsx @@ -63,7 +63,7 @@ export function Account(): React.JSX.Element { } return ( - + {isConnected ? ( onConnectWalletClick()} - h={isMobile ? '40px' : '50px'} + h={'50px'} w={isMobile ? '150px' : '275px'} fontSize={isMobile ? 'md' : 'lg'} > diff --git a/src/app/components/account/components/account-menu.tsx b/src/app/components/account/components/account-menu.tsx index f2690cf4..8d4e9c4f 100644 --- a/src/app/components/account/components/account-menu.tsx +++ b/src/app/components/account/components/account-menu.tsx @@ -32,7 +32,7 @@ export function AccountMenu({ if (!address) return false; return ( - + {!isMobile ? ( <> diff --git a/src/app/components/header/components/mobile-header.tsx b/src/app/components/header/components/mobile-header.tsx index 6b1b64ce..73c5e55a 100644 --- a/src/app/components/header/components/mobile-header.tsx +++ b/src/app/components/header/components/mobile-header.tsx @@ -27,17 +27,15 @@ const MobileHeader: React.FC = ({ isNetworkMenuOpen, setIsNet } + icon={} justifyContent={'center'} - p={'3px'} - h={'40px'} - w={'40px'} + h={'50px'} + w={'50px'} bg={'background.content.01'} border={'1.5px solid'} borderColor={'border.white.01'} borderRadius={'md'} color={'white'} - fontSize={'sm'} fontWeight={600} /> { if (networkType === NetworkType.EVM && isConnected && !ethereumNetwork) { diff --git a/src/app/components/network/components/networks-menu.tsx b/src/app/components/network/components/networks-menu.tsx index 959b3abd..e2690f31 100644 --- a/src/app/components/network/components/networks-menu.tsx +++ b/src/app/components/network/components/networks-menu.tsx @@ -57,13 +57,13 @@ export function NetworksMenu({ return ( - setIsMenuOpen(!isMenuOpen)} h={isMobile ? '40px' : '50px'}> + setIsMenuOpen(!isMenuOpen)} h={'50px'}> {isMobile ? ( {'Selected ) : ( //TODO: what to display in case of not connected? diff --git a/src/app/components/network/network.tsx b/src/app/components/network/network.tsx index 1cf85520..125d8851 100644 --- a/src/app/components/network/network.tsx +++ b/src/app/components/network/network.tsx @@ -10,7 +10,7 @@ interface NetworkBoxProps { export function NetworkBox({ isMenuOpen, setIsMenuOpen }: NetworkBoxProps): React.JSX.Element { const isMobile = useBreakpointValue({ base: true, md: false }); return ( - + ); diff --git a/src/app/components/proof-of-reserve/components/merchant-details/merchant-details.tsx b/src/app/components/proof-of-reserve/components/merchant-details/merchant-details.tsx index c8ab69e7..5f4da7af 100644 --- a/src/app/components/proof-of-reserve/components/merchant-details/merchant-details.tsx +++ b/src/app/components/proof-of-reserve/components/merchant-details/merchant-details.tsx @@ -32,6 +32,7 @@ export function MerchantDetails(): React.JSX.Element { const selectedMerchant = proofOfReserve?.[1].find(item => item.merchant.name === name); const mintBurnEvents = merchantMintBurnEvents?.find(item => item.name === name)?.mintBurnEvents; const isMobile = useBreakpointValue({ base: true, md: false }); + const imageWidth = useBreakpointValue({ base: '150px', xl: '200px' }); if (!name) return Error: No merchant name provided; @@ -69,12 +70,8 @@ export function MerchantDetails(): React.JSX.Element { direction={isMobile ? 'column' : 'row'} gap={isMobile ? '20px' : '0px'} > - {'Merchant + {'Merchant + @@ -37,16 +37,25 @@ export function MerchantTableItem({ direction={isMobile ? 'column' : 'row'} gap={isMobile ? '10px' : '0px'} > - - - {merchant.name} + + + {merchant.name} - + {'iBTC - + + {isMobile ? ( <> diff --git a/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx b/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx index f986380f..8115dc64 100644 --- a/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx +++ b/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx @@ -1,4 +1,4 @@ -import { useBreakpointValue } from '@chakra-ui/react'; +import { VStack, useBreakpointValue } from '@chakra-ui/react'; import { GenericTableBody } from '@components/generic-table/components/generic-table-body'; import { GenericTableHeader } from '@components/generic-table/components/generic-table-header'; import { GenericTableHeaderText } from '@components/generic-table/components/generic-table-header-text'; @@ -11,26 +11,34 @@ interface MerchantTableProps { } export function MerchantTable({ items }: MerchantTableProps): React.JSX.Element { + const isMobile = useBreakpointValue({ base: true, xl: false }); const dynamicHeight = items ? items.length * 75 + 20 : 20; - const isMobile = useBreakpointValue({ base: true, md: false }); - return ( - - - Merchant - iBTC Minted - - - {items - ?.sort((a, b) => b.iBTCAmount - a.iBTCAmount) - .map(item => )} - - + const widthValue = useBreakpointValue({ + base: '100%', + md: '50%', + lg: '40%', + xl: 'auto', + }); + return ( + + + + Merchant + iBTC Minted + + + {items + ?.sort((a, b) => b.iBTCAmount - a.iBTCAmount) + .map(item => )} + + + ); } diff --git a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx index 1679a92f..a90b2f5b 100644 --- a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx +++ b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx @@ -1,4 +1,4 @@ -import { HStack, Image, Skeleton, Text, VStack } from '@chakra-ui/react'; +import { HStack, Image, Skeleton, Text, VStack, useBreakpointValue } from '@chakra-ui/react'; import { Token } from '@models/token'; interface TokenStatsBoardTokenProps { @@ -20,6 +20,8 @@ export function TokenStatsBoardToken({ break; } + const amountFontSize = useBreakpointValue({ base: '2xl', md: 'xl', lg: 'xl', xl: '2xl' }); + return ( @@ -28,7 +30,7 @@ export function TokenStatsBoardToken({ {token.logoAlt} - + {Number(totalSupply).toFixed(4)} diff --git a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-tvl.tsx b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-tvl.tsx index 5259c148..b1f66d41 100644 --- a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-tvl.tsx +++ b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-tvl.tsx @@ -1,4 +1,4 @@ -import { Skeleton, Text, VStack } from '@chakra-ui/react'; +import { Skeleton, Text, VStack, useBreakpointValue } from '@chakra-ui/react'; interface TokenStatsBoardTVLProps { totalSupply: number | undefined; @@ -9,13 +9,14 @@ export function TokenStatsBoardTVL({ totalSupply, bitcoinPrice, }: TokenStatsBoardTVLProps): React.JSX.Element { + const amountFontSize = useBreakpointValue({ base: '2xl', md: 'xl', lg: 'xl', xl: '2xl' }); return ( TVL - + $ {totalSupply && bitcoinPrice ? `${Math.floor(totalSupply * bitcoinPrice).toLocaleString('en-US')} USD` diff --git a/src/app/components/proof-of-reserve/proof-of-reserve.tsx b/src/app/components/proof-of-reserve/proof-of-reserve.tsx index c3ef8299..e919d745 100644 --- a/src/app/components/proof-of-reserve/proof-of-reserve.tsx +++ b/src/app/components/proof-of-reserve/proof-of-reserve.tsx @@ -62,7 +62,7 @@ export function ProofOfReserve(): React.JSX.Element { diff --git a/src/app/components/protocol-history-table/components/protocol-history-table-item.tsx b/src/app/components/protocol-history-table/components/protocol-history-table-item.tsx index a1601ffc..9b522993 100644 --- a/src/app/components/protocol-history-table/components/protocol-history-table-item.tsx +++ b/src/app/components/protocol-history-table/components/protocol-history-table-item.tsx @@ -22,7 +22,7 @@ export function ProtocolHistoryTableItem( const ethereumNetwork = findEthereumNetworkByName(eventChain); - const isMobile = useBreakpointValue({ base: true, md: false }); + const isMobile = useBreakpointValue({ base: true, lg: false }); return ( - + + {isMobile ? ( <>