diff --git a/src/components/UserInfoTable/WalletBalancesTable.jsx b/src/components/UserInfoTable/WalletBalancesTable.jsx index bef2114..cdf757f 100644 --- a/src/components/UserInfoTable/WalletBalancesTable.jsx +++ b/src/components/UserInfoTable/WalletBalancesTable.jsx @@ -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', diff --git a/src/utils/markets.js b/src/utils/markets.js index 7c4fa66..688d4a0 100644 --- a/src/utils/markets.js +++ b/src/utils/markets.js @@ -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,