Fix merge
This commit is contained in:
parent
438a815ca5
commit
24b68ab062
|
@ -8,13 +8,8 @@ export default function WalletBalancesTable({
|
|||
const columns = [
|
||||
{
|
||||
title: 'Coin',
|
||||
<<<<<<< HEAD
|
||||
dataIndex: 'coin',
|
||||
key: 'coin',
|
||||
=======
|
||||
dataIndex: 'key',
|
||||
key: 'key',
|
||||
>>>>>>> Fix balance page settle
|
||||
},
|
||||
{
|
||||
title: 'Wallet Balance',
|
||||
|
|
|
@ -731,8 +731,8 @@ export function useOpenOrderAccountBalancesForAllMarkets() {
|
|||
openOrdersAccount?.quoteTokenFree &&
|
||||
market.baseSplSizeToNumber(openOrdersAccount.quoteTokenFree);
|
||||
openOrderAccountBalances.push({
|
||||
market: marketName,
|
||||
coin: baseCurrency,
|
||||
key: baseCurrency,
|
||||
orders: inOrdersBase,
|
||||
unsettled: unsettledBase,
|
||||
market: market,
|
||||
|
@ -744,6 +744,7 @@ export function useOpenOrderAccountBalancesForAllMarkets() {
|
|||
openOrderAccountBalances.push({
|
||||
market: marketName,
|
||||
coin: quoteCurrency,
|
||||
key: quoteCurrency,
|
||||
orders: inOrdersQuote,
|
||||
unsettled: unsettledQuote,
|
||||
market: market,
|
||||
|
|
Loading…
Reference in New Issue