patch merge issues

components/account/AccountActions.tsx

@@ -151,7 +151,8 @@ const AccountActions = () => {
         <RepayModal
           isOpen={showRepayModal}
           onClose={() => setShowRepayModal(false)}
-        /> 
+        />
+      ) : null}
       {showDelegateModal ? (
         <DelegateModal
           isOpen={showDelegateModal}

components/shared/SwapTradeBalances.tsx

@@ -93,7 +93,14 @@ const SwapTradeBalances = () => {
                   </div>
                 </td>
                 <td className="text-right">
-                  <Balance bank={bank} />
+                  <p>
+                    {mangoAccount
+                      ? formatDecimal(
+                          mangoAccount.getTokenBalanceUi(bank),
+                          bank.mintDecimals
+                        )
+                      : 0}
+                  </p>
                   <p className="text-sm text-th-fgd-4">
                     {mangoAccount
                       ? `${formatFixedDecimals(
@@ -214,7 +221,7 @@ const Balance = ({ bank }: { bank: Bank }) => {
         (balance > 0 && type === 'quote') || (balance < 0 && type === 'base')
           ? 'buy'
           : 'sell'
-      price = calculateMarketPrice(orderbook, balance, side, type)
+      price = calculateMarketPrice(orderbook, balance, side)
     } else price = new Decimal(tradeForm.price).toNumber()
 
     if (balance > 0) {

components/trade/AdvancedTradeForm.tsx

@@ -229,12 +229,7 @@ const AdvancedTradeForm = () => {
       let price = new Decimal(tradeForm.price).toNumber()
       if (tradeForm.tradeType === 'Market') {
         const orderbook = mangoStore.getState().selectedMarket.orderbook
-        price = calculateMarketPrice(
-          orderbook,
-          baseSize,
-          tradeForm.side,
-          'base'
-        )
+        price = calculateMarketPrice(orderbook, baseSize, tradeForm.side)
       }
 
       if (selectedMarket instanceof Serum3Market) {

utils/tradeForm.ts

@@ -3,8 +3,7 @@ import { Orderbook } from 'types'
 export const calculateMarketPrice = (
   orderBook: Orderbook,
   size: number,
-  side: 'buy' | 'sell',
-  baseOrQuote: 'base' | 'quote'
+  side: 'buy' | 'sell'
 ): number => {
   const orders = side === 'buy' ? orderBook.asks : orderBook.bids
   let acc = 0
@@ -12,9 +11,6 @@ export const calculateMarketPrice = (
   let orderSize = size
   for (const order of orders) {
     acc += order[1]
-    if (baseOrQuote === 'quote') {
-      orderSize = size / acc
-    }
     if (acc >= orderSize) {
       selectedOrder = order
       break