blockworks-foundation
/
mango-v4-ui
mirror of https://github.com/blockworks-foundation/mango-v4-ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use latest client; fix merge conflicts

This commit is contained in:
tjs 2022-09-14 10:52:18 -04:00
parent b3f46655a7
commit 4270ad8d3b
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/SideNav.tsx
View File

@ -22,6 +22,8 @@ import { HealthType } from '@blockworks-foundation/mango-v4'
import { useWallet } from '@solana/wallet-adapter-react'
import useLocalStorageState from '../hooks/useLocalStorageState'
import { ONBOARDING_TOUR_KEY } from '../utils/constants'
import mangoStore from '@store/mangoStore'
import HealthHeart from './account/HealthHeart'
const SideNav = ({ collapsed }: { collapsed: boolean }) => {
const [, setShowOnboardingTour] = useLocalStorageState(ONBOARDING_TOUR_KEY)
@ -182,7 +184,7 @@ const SideNav = ({ collapsed }: { collapsed: boolean }) => {
hideIconBg
>
<div className="px-4 pb-4 pt-2">
<MangoAccountSummary />
<MangoAccountSummary collapsed={collapsed} />
</div>
</ExpandableMenuItem>
</div>

13
components/account/MangoAccountSummary.tsx
View File

@ -67,18 +67,7 @@ const MangoAccountSummary = ({ collapsed }: { collapsed: boolean }) => {
<ArrowDownTrayIcon className="mr-2 h-5 w-5" />
{t('deposit')}
</Button>
{/* <Button
className="w-full"
onClick={() => setShowWithdrawModal(true)}
secondary
>
{t('withdraw')}
</Button> */}
</div>
</div>
</ExpandableMenuItem>
</div>
) : null}
</div>
{showDepositModal ? (
<DepositModal

13
components/trade/BalanceAndOpenOrders.tsx
View File

@ -13,9 +13,8 @@ import { formatDecimal, formatFixedDecimals } from 'utils/numbers'
const TABS = ['Balances', 'Open Orders']
const BalanceAndOpenOrders = () => {
const [selectedTab, setSelectedTab] = useState('Open Orders')
const [selectedTab, setSelectedTab] = useState('Balances')
const mangoAccount = mangoStore((s) => s.mangoAccount.current)
const openOrders = mangoStore((s) => s.mangoAccount.openOrders)
const selectedMarket = mangoStore((s) => s.selectedMarket.current)
useEffect(() => {
@ -122,18 +121,18 @@ const Balances = () => {
<span>{bank.name}</span>
</div>
</td>
<td className="pt-4 text-right font-mono text-sm">
<p>
<td className="pt-4 text-right font-mono">
<div>
{mangoAccount
? formatDecimal(
mangoAccount.getTokenBalanceUi(bank),
bank.mintDecimals
)
: 0}
</p>
</div>
</td>
<td className="text-right font-mono text-sm">0.00</td>
<td className="text-right font-mono text-sm">0.00</td>
<td className="text-right font-mono">0.00</td>
<td className="text-right font-mono">0.00</td>
</tr>
)
})}

2
yarn.lock
View File

@ -40,7 +40,7 @@
"@blockworks-foundation/mango-v4@git+https://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:x-oauth-basic@github.com/blockworks-foundation/mango-v4.git#main":
version "0.0.1-beta.2"
resolved "git+https://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:x-oauth-basic@github.com/blockworks-foundation/mango-v4.git#2b96965cc564403b64dcc0954aedaf73352d6792"
resolved "git+https://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:x-oauth-basic@github.com/blockworks-foundation/mango-v4.git#899b51e91cbf423c8930b3dabf3d2563541a8504"
dependencies:
"@project-serum/anchor" "^0.25.0"
"@project-serum/serum" "^0.13.65"