From dca3f8a2363de7173cf5779d0a7b344efbb7b4c5 Mon Sep 17 00:00:00 2001 From: Yusuf Seyrek Date: Tue, 8 Aug 2023 12:12:52 +0300 Subject: [PATCH] feat(Trade page): account details card (#348) * feat(Trade page): account details card * feat(account details): dont display the card when account has no deposits --- .../Account/AccountBalancesTable.tsx | 3 +- src/components/Trade/AccountDetailsCard.tsx | 38 +++++++++++++++++++ src/components/Trade/OrderBook.tsx | 33 ---------------- src/pages/TradePage.tsx | 4 +- tailwind.config.js | 3 ++ 5 files changed, 45 insertions(+), 36 deletions(-) create mode 100644 src/components/Trade/AccountDetailsCard.tsx delete mode 100644 src/components/Trade/OrderBook.tsx diff --git a/src/components/Account/AccountBalancesTable.tsx b/src/components/Account/AccountBalancesTable.tsx index 82bb465c..470c11af 100644 --- a/src/components/Account/AccountBalancesTable.tsx +++ b/src/components/Account/AccountBalancesTable.tsx @@ -29,6 +29,7 @@ interface Props { account: Account lendingData: LendingMarketTableData[] borrowingData: BorrowMarketTableData[] + tableBodyClassName?: string } function calculatePositionValues( @@ -215,7 +216,7 @@ export default function AccountBalancesTable(props: Props) { ))} - + {table.getRowModel().rows.map((row) => { return ( diff --git a/src/components/Trade/AccountDetailsCard.tsx b/src/components/Trade/AccountDetailsCard.tsx new file mode 100644 index 00000000..6099b98e --- /dev/null +++ b/src/components/Trade/AccountDetailsCard.tsx @@ -0,0 +1,38 @@ +import Card from 'components/Card' +import useCurrentAccount from 'hooks/useCurrentAccount' +import AccountBalancesTable from 'components/Account/AccountBalancesTable' +import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' +import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' + +export default function AccountDetailsCard() { + const account = useCurrentAccount() + const { availableAssets: borrowAvailableAssets, accountBorrowedAssets } = + useBorrowMarketAssetsTableData() + const { availableAssets: lendingAvailableAssets, accountLentAssets } = + useLendingMarketAssetsTableData() + const borrowAssetsData = [...borrowAvailableAssets, ...accountBorrowedAssets] + const lendingAssetsData = [...lendingAvailableAssets, ...accountLentAssets] + + const tabs = ( +
+
Balances
+
+ ) + + if (account && account.deposits.length) + return ( + + + + ) +} + +const className = { + tabWrapper: 'flex w-full items-center bg-white/10 pt-4 pl-4 font-semibold', + tab: 'mr-4 pb-3 cursor-pointer select-none flex flex-row border-b-2 border-pink border-solid', +} diff --git a/src/components/Trade/OrderBook.tsx b/src/components/Trade/OrderBook.tsx deleted file mode 100644 index eb668bec..00000000 --- a/src/components/Trade/OrderBook.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { Suspense } from 'react' -import { useParams } from 'react-router-dom' - -import Card from 'components/Card' -import Loading from 'components/Loading' -import Text from 'components/Text' - -function Content() { - const params = useParams() - const address = params.address - - return address ? ( - {`Order book for ${address}`} - ) : ( - - You need to be connected to see the order book - - ) -} - -function Fallback() { - return -} - -export default function OrderBook() { - return ( - - }> - - - - ) -} diff --git a/src/pages/TradePage.tsx b/src/pages/TradePage.tsx index 4dad0428..71fcdab5 100644 --- a/src/pages/TradePage.tsx +++ b/src/pages/TradePage.tsx @@ -1,9 +1,9 @@ import { useState } from 'react' -import OrderBook from 'components/Trade/OrderBook' import TradeChart from 'components/Trade/TradeChart' import TradeModule from 'components/Trade/TradeModule' import { getEnabledMarketAssets } from 'utils/assets' +import AccountDetailsCard from 'components/Trade/AccountDetailsCard' export default function TradePage() { const enabledMarketAssets = getEnabledMarketAssets() @@ -19,7 +19,7 @@ export default function TradePage() { onChangeSellAsset={setSellAsset} /> - + ) } diff --git a/tailwind.config.js b/tailwind.config.js index 6c3244da..15b3ed14 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -260,6 +260,9 @@ module.exports = { background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), linear-gradient(0deg, rgba(255, 255, 255, 0.05), rgba(255, 255, 255, 0.05))', }, + '.gradient-card-content': { + backgroundImage: 'linear-gradient(to right, transparent, rgba(255, 255, 255, 0.05))', + }, '.gradient-hatched': { backgroundImage: 'linear-gradient(135deg,transparent 33.33%,#826d6b 33.33%,#826d6b 50%,transparent 50%,transparent 83.33%,#826d6b 83.33%,#826d6b 100%)',