Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/add chain name to orderbook #203

Merged
merged 2 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ interface GenericTableLayoutProps {
bg?: string;
children: React.ReactNode;
isMobile?: boolean;
isMerchant?: boolean;
}

export function GenericTableLayout({
Expand All @@ -20,13 +21,14 @@ export function GenericTableLayout({
children,
bg = 'background.container.01',
isMobile = false,
isMerchant = false,
}: GenericTableLayoutProps): React.JSX.Element {
return (
<VStack
w={isMobile ? '100%' : width}
h={height}
minH={'100px'}
padding={isMobile ? '0px' : padding}
padding={isMobile ? (isMerchant ? '10px' : '0px') : padding}
alignItems={alignItems}
borderRadius={borderRadius}
bg={bg}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,33 @@ export function MerchantTableItem({
gap={isMobile ? '10px' : '0px'}
>
<HStack>
<HStack w={isMobile ? 'auto' : '280px'}>
<HStack w={isMobile ? 'auto' : 'auto'}>
<Image src={merchant.logo} alt={merchant.name} width={'150px'} />
</HStack>
<HStack w={'150px'} h={'35px'} alignItems={'center'}>
<HStack w={'140px'} h={'35px'} alignItems={'center'}>
<Image src={'/images/logos/dlc-btc-logo.svg'} alt={'dlcBTC Logo'} boxSize={'25px'} />
<Skeleton isLoaded={dlcBTCAmount !== undefined} h={'auto'} w={'150px'}>
<Text color={'white'} fontSize={'2xl'} fontWeight={800} h={'35px'}>
<Text
color={'white'}
fontSize={'xl'}
fontWeight={800}
h={'35px'}
display={'flex'}
alignItems={'center'}
>
{Number(dlcBTCAmount?.toFixed(4))}
</Text>
</Skeleton>
</HStack>
</HStack>

<Button
w={isMobile ? '100%' : '150px'}
w={isMobile ? '100%' : '100px'}
variant={'merchantTableItem'}
onClick={() => navigate(`/merchant-details/${merchant.name}`)}
>
<Text color={'white.01'} fontSize={'xs'}>
Mint/Withdraw History
History
</Text>
</Button>
</Stack>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { 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';
import { GenericTableLayout } from '@components/generic-table/components/generic-table-layout';

import { MerchantTableItem } from './components/merchant-table-item';

interface MerchantTableProps {
items?: any[];
}

export function MerchantTable({ items }: MerchantTableProps): React.JSX.Element {
const dynamicHeight = items ? items.length * 75 + 20 : 20;
const isMobile = useBreakpointValue({ base: true, md: false });
return (
<GenericTableLayout
height={isMobile ? 'auto' : `${dynamicHeight}px`}
width={isMobile ? '100%' : '30%'}
padding={isMobile ? '10px' : '15px'}
isMobile={isMobile}
isMerchant={true}
>
<GenericTableHeader>
<GenericTableHeaderText w={'50%'}>Merchant</GenericTableHeaderText>
<GenericTableHeaderText w={'100%'}>dlcBTC Minted</GenericTableHeaderText>
</GenericTableHeader>

<GenericTableBody>
{items?.map(item => <MerchantTableItem key={item.merchant.name} {...item} />)}
</GenericTableBody>
</GenericTableLayout>
);
}
11 changes: 2 additions & 9 deletions src/app/components/proof-of-reserve/proof-of-reserve.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import { ProofOfReserveContext } from '@providers/proof-of-reserve-context-provi

import { titleTextSize } from '@shared/utils';

import { MerchantTableHeader } from './components/merchant-table/components/merchant-table-header';
import { MerchantTableItem } from './components/merchant-table/components/merchant-table-item';
import { MerchantTableLayout } from './components/merchant-table/merchant-table-layout';
import { MerchantTable } from './components/merchant-table/merchant-table';
import { ProofOfReserveLayout } from './components/proof-of-reserve-layout';
import { TokenStatsBoardToken } from './components/token-stats-board/components/token-stats-board-token';
import { TokenStatsBoardTVL } from './components/token-stats-board/components/token-stats-board-tvl';
Expand Down Expand Up @@ -68,12 +66,7 @@ export function ProofOfReserve(): React.JSX.Element {
direction={isMobile ? 'column' : 'row'}
gap={isMobile ? '40px' : '20px'}
>
<MerchantTableLayout>
<MerchantTableHeader />
{merchantProofOfReserves.map(item => (
<MerchantTableItem key={item.merchant.name} {...item} />
))}
</MerchantTableLayout>
<MerchantTable items={merchantProofOfReserves}></MerchantTable>
<ProtocolHistoryTable items={allMintBurnEvents} />
</Stack>
</ProofOfReserveLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,23 @@ export function ProtocolHistoryTableItem(
</>
) : (
<>
<HStack w={'25%'}>
<HStack w={'20%'}>
<Image src={'/images/logos/dlc-btc-logo.svg'} alt={'dlcBTC Logo'} boxSize={'20px'} />
<Text color={'white'} fontWeight={800}>
{unshiftValue(dlcBTCAmount)}
</Text>
</HStack>
<HStack w={'25%'}>
<HStack w={'20%'}>
<Text color={'white'} fontSize={'sm'} fontWeight={800}>
{truncateAddress(merchant)}
</Text>
</HStack>
<HStack w={'25%'}>
<HStack w={'20%'}>
<Text color={'white'} fontSize={'sm'} fontWeight={800}>
{ethereumNetwork.name}
</Text>
</HStack>
<HStack w={'20%'}>
<Text
color={'accent.lightBlue.01'}
fontSize={'sm'}
Expand All @@ -84,7 +89,7 @@ export function ProtocolHistoryTableItem(
{truncateAddress(txHash)}
</Text>
</HStack>
<HStack w={'25%'}>
<HStack w={'20%'}>
<Text color={'white'} fontSize={'sm'}>
{date}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function ProtocolHistoryTable({ items }: ProtocolHistoryTableProps): Reac
const isMobile = useBreakpointValue({ base: true, md: false });

return (
<GenericTableLayout height={`${dynamicHeight}px`} width={'50%'} isMobile={isMobile}>
<GenericTableLayout height={`${dynamicHeight}px`} width={'70%'} isMobile={isMobile}>
<GenericTableHeader>
{isMobile ? (
<>
Expand All @@ -23,10 +23,11 @@ export function ProtocolHistoryTable({ items }: ProtocolHistoryTableProps): Reac
</>
) : (
<>
<GenericTableHeaderText w={'25%'}>Order Book</GenericTableHeaderText>
<GenericTableHeaderText w={'25%'}>Merchant</GenericTableHeaderText>
<GenericTableHeaderText w={'25%'}>Transaction</GenericTableHeaderText>
<GenericTableHeaderText w={'25%'}>Date</GenericTableHeaderText>
<GenericTableHeaderText w={'20%'}>Order Book</GenericTableHeaderText>
<GenericTableHeaderText w={'20%'}>Merchant</GenericTableHeaderText>
<GenericTableHeaderText w={'20%'}>Chain</GenericTableHeaderText>
<GenericTableHeaderText w={'20%'}>Transaction</GenericTableHeaderText>
<GenericTableHeaderText w={'20%'}>Date</GenericTableHeaderText>
</>
)}
</GenericTableHeader>
Expand Down
Loading