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