fix: fixed merge errors

src/hooks/markets/useMarketAssets.ts

@@ -1,14 +0,0 @@
-import useSWR from 'swr'
-import getMarkets from 'api/markets/getMarkets'
-
-import useChainConfig from 'hooks/useChainConfig'
-
-export default function useMarketAssets() {
-  const chainConfig = useChainConfig()
-  return useSWR(`chains/${chainConfig.id}/markets`, () => getMarkets(chainConfig), {
-    suspense: true,
-    fallbackData: [],
-    revalidateOnFocus: false,
-    keepPreviousData: false,
-  })
-}

src/hooks/markets/useMarketBorrowings.tsx

@@ -1,17 +0,0 @@
-import useSWR from 'swr'
-import getMarketBorrowings from 'api/markets/getMarketBorrowings'
-
-import useChainConfig from 'hooks/useChainConfig'
-
-export default function useMarketBorrowings() {
-  const chainConfig = useChainConfig()
-  return useSWR(
-    `chains/${chainConfig.id}/markets/borrowings`,
-    () => getMarketBorrowings(chainConfig),
-    {
-      fallbackData: [],
-      suspense: false,
-      revalidateOnFocus: false,
-    },
-  )
-}

src/hooks/markets/useMarketLiquidities.ts

@@ -1,17 +0,0 @@
-import useSWR from 'swr'
-import getMarketLiquidities from 'api/markets/getMarketLiquidities'
-
-import useChainConfig from 'hooks/useChainConfig'
-
-export default function useMarketLiquidities() {
-  const chainConfig = useChainConfig()
-  return useSWR(
-    `chains/${chainConfig.id}/markets/liquidities`,
-    () => getMarketLiquidities(chainConfig),
-    {
-      suspense: true,
-      fallbackData: [],
-      revalidateOnFocus: false,
-    },
-  )
-}

src/store/slices/broadcast.ts

@@ -183,9 +183,10 @@ export default function createBroadcastSlice(
       })
 
       if (simulateResult) {
-        const { success, fee } = simulateResult
+        const { success } = simulateResult
 
         if (success) {
+          const fee = simulateResult.fee
           return {
             amount: fee ? fee.amount : [],
             gas: BN(fee ? fee.gas : 0).toFixed(0),