diff --git a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcDerivativesApi.ts b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcDerivativesApi.ts
index e2a09f8eb..7e45b2080 100644
--- a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcDerivativesApi.ts
+++ b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcDerivativesApi.ts
@@ -472,7 +472,9 @@ export class ExchangeGrpcDerivativesApi extends BaseConsumer {
         typeof InjectiveDerivativeExchangeRPC.SubaccountTradesList
       >(request, InjectiveDerivativeExchangeRPC.SubaccountTradesList)
 
-      return ExchangeGrpcDerivativeTransformer.tradesResponseToTrades(response)
+      return ExchangeGrpcDerivativeTransformer.subaccountTradesListResponseToTrades(
+        response,
+      )
     } catch (e: any) {
       throw new Error(e.message)
     }
diff --git a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts
index 5b0047f3f..b46711a4f 100644
--- a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts
+++ b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts
@@ -289,7 +289,9 @@ export class ExchangeGrpcSpotApi extends BaseConsumer {
         typeof InjectiveSpotExchangeRPC.SubaccountTradesList
       >(request, InjectiveSpotExchangeRPC.SubaccountTradesList)
 
-      return ExchangeGrpcSpotTransformer.tradesResponseToTrades(response)
+      return ExchangeGrpcSpotTransformer.subaccountTradesListResponseToTrades(
+        response,
+      )
     } catch (e: any) {
       throw new Error(e.message)
     }
diff --git a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts
index 678118943..264a17ae0 100644
--- a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts
+++ b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcTransactionApi.ts
@@ -29,7 +29,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
     feeDenom = DEFAULT_BRIDGE_FEE_DENOM,
     feePrice = DEFAULT_BRIDGE_FEE_PRICE,
     timeoutHeight,
-    useCorrectEIP712Hash,
   }: {
     address: AccountAddress
     chainId: EthereumChainId
@@ -40,7 +39,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
     timeoutHeight?: number
     feeDenom?: string
     feePrice?: string
-    useCorrectEIP712Hash?: boolean
   }) {
     const txFeeAmount = new Coin()
     txFeeAmount.setDenom(feeDenom)
@@ -71,10 +69,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
       prepareTxRequest.setMemo(memo)
     }
 
-    if (useCorrectEIP712Hash !== undefined) {
-      prepareTxRequest.setUseCorrectHash(useCorrectEIP712Hash)
-    }
-
     try {
       const response = await this.request<
         PrepareTxRequest,
@@ -99,7 +93,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
     feePrice = DEFAULT_BRIDGE_FEE_PRICE,
     timeoutHeight,
     delegatedFee,
-    useCorrectEIP712Hash,
   }: {
     address: AccountAddress
     chainId: EthereumChainId
@@ -111,7 +104,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
     feePrice?: string
     timeoutHeight?: number
     delegatedFee?: boolean
-    useCorrectEIP712Hash?: boolean
   }) {
     const txFeeAmount = new Coin()
     txFeeAmount.setDenom(feeDenom)
@@ -146,10 +138,6 @@ export class ExchangeGrpcTransactionApi extends BaseConsumer {
       prepareTxRequest.setMemo(memo)
     }
 
-    if (useCorrectEIP712Hash !== undefined) {
-      prepareTxRequest.setUseCorrectHash(useCorrectEIP712Hash)
-    }
-
     try {
       const response = await this.request<
         PrepareTxRequest,
diff --git a/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcDerivativeTransformer.ts b/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcDerivativeTransformer.ts
index e2c2fe744..f5ba5438a 100644
--- a/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcDerivativeTransformer.ts
+++ b/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcDerivativeTransformer.ts
@@ -43,6 +43,7 @@ import {
   TradesResponse as DerivativeTradesResponse,
   PositionsResponse as DerivativePositionsResponse,
   OrderbooksResponse as DerivativeOrderbooksResponse,
+  SubaccountTradesListResponse as DerivativeSubaccountTradesListResponse,
 } from '@injectivelabs/exchange-api/injective_derivative_exchange_rpc_pb'
 import {
   BinaryOptionsMarketsResponse as BinaryOptionsMarketsResponse,
@@ -147,6 +148,14 @@ export class ExchangeGrpcDerivativeTransformer {
     return ExchangeGrpcDerivativeTransformer.grpcTradesToTrades(trades)
   }
 
+  static subaccountTradesListResponseToTrades(
+    response: DerivativeSubaccountTradesListResponse,
+  ) {
+    const trades = response.getTradesList()
+
+    return ExchangeGrpcDerivativeTransformer.grpcTradesToTrades(trades)
+  }
+
   static fundingPaymentsResponseToFundingPayments(
     response: FundingPaymentsResponse,
   ) {
diff --git a/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcSpotTransformer.ts b/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcSpotTransformer.ts
index 17198c8c3..8e1a34154 100644
--- a/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcSpotTransformer.ts
+++ b/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcSpotTransformer.ts
@@ -24,6 +24,7 @@ import {
   OrdersResponse as SpotOrdersResponse,
   TradesResponse as SpotTradesResponse,
   OrderbooksResponse as SpotOrderbooksResponse,
+  SubaccountTradesListResponse as SpotSubaccountTradesListResponse,
 } from '@injectivelabs/exchange-api/injective_spot_exchange_rpc_pb'
 
 const zeroPriceLevel = () => ({
@@ -75,6 +76,14 @@ export class ExchangeGrpcSpotTransformer {
     return ExchangeGrpcSpotTransformer.grpcTradesToTrades(trades)
   }
 
+  static subaccountTradesListResponseToTrades(
+    response: SpotSubaccountTradesListResponse,
+  ) {
+    const trades = response.getTradesList()
+
+    return ExchangeGrpcSpotTransformer.grpcTradesToTrades(trades)
+  }
+
   static orderbookResponseToOrderbook(response: SpotOrderbookResponse) {
     const orderbook = response.getOrderbook()!
 
diff --git a/packages/sdk-ui-ts/src/client/transformers/UiAccountTransformer.ts b/packages/sdk-ui-ts/src/client/transformers/UiAccountTransformer.ts
index 2aad72b70..b026e381b 100644
--- a/packages/sdk-ui-ts/src/client/transformers/UiAccountTransformer.ts
+++ b/packages/sdk-ui-ts/src/client/transformers/UiAccountTransformer.ts
@@ -1,7 +1,7 @@
 import {
   SubaccountBalance,
   SubaccountTransfer,
-} from '@injectivelabs/sdk-ts/dist/client/exchange/types/account'
+} from '@injectivelabs/sdk-ts/dist/client/indexer/types/account'
 import { UiSubaccountBalance } from '../types/account'
 
 export class UiAccountTransformer {
diff --git a/packages/sdk-ui-ts/src/client/types/account.ts b/packages/sdk-ui-ts/src/client/types/account.ts
index d1ac99517..8dcb0afe0 100644
--- a/packages/sdk-ui-ts/src/client/types/account.ts
+++ b/packages/sdk-ui-ts/src/client/types/account.ts
@@ -1,4 +1,4 @@
-import { SubaccountTransfer } from '@injectivelabs/sdk-ts/dist/client/exchange/types/account'
+import { SubaccountTransfer } from '@injectivelabs/sdk-ts/dist/client/indexer/types/account'
 import { Token } from '@injectivelabs/token-metadata'
 
 export interface UiSubaccountBalance {
diff --git a/packages/sdk-ui-ts/src/client/types/derivatives.ts b/packages/sdk-ui-ts/src/client/types/derivatives.ts
index 5402be490..3ec975ab1 100644
--- a/packages/sdk-ui-ts/src/client/types/derivatives.ts
+++ b/packages/sdk-ui-ts/src/client/types/derivatives.ts
@@ -7,12 +7,12 @@ import {
   Position as UiPosition,
   DerivativeLimitOrder as UiDerivativeLimitOrder,
   DerivativeOrderSide,
-} from '@injectivelabs/sdk-ts/dist/client/exchange/types/derivatives'
-import { Orderbook as UiDerivativeOrderbook } from '@injectivelabs/sdk-ts/dist/client/exchange/types/exchange'
+} from '@injectivelabs/sdk-ts/dist/client/indexer/types/derivatives'
+import { Orderbook as UiDerivativeOrderbook } from '@injectivelabs/sdk-ts/dist/client/indexer/types/exchange'
 import {
   ChronosDerivativeMarketSummary,
   AllChronosDerivativeMarketSummary,
-} from '@injectivelabs/sdk-ts/dist/client/exchange/types/derivatives-rest'
+} from '@injectivelabs/sdk-ts/dist/client/indexer/types/derivatives-rest'
 import { Token } from '@injectivelabs/token-metadata'
 import { Change, MarketBase, MarketType } from './common'
 
diff --git a/packages/sdk-ui-ts/src/client/types/spot.ts b/packages/sdk-ui-ts/src/client/types/spot.ts
index e1aff9b2d..54800ab45 100644
--- a/packages/sdk-ui-ts/src/client/types/spot.ts
+++ b/packages/sdk-ui-ts/src/client/types/spot.ts
@@ -3,12 +3,12 @@ import {
   SpotTrade,
   SpotLimitOrder as UiSpotLimitOrder,
   SpotOrderSide,
-} from '@injectivelabs/sdk-ts/dist/client/exchange/types/spot'
-import { Orderbook as UiSpotOrderbook } from '@injectivelabs/sdk-ts/dist/client/exchange/types/exchange'
+} from '@injectivelabs/sdk-ts/dist/client/indexer/types/spot'
+import { Orderbook as UiSpotOrderbook } from '@injectivelabs/sdk-ts/dist/client/indexer/types/exchange'
 import {
   ChronosSpotMarketSummary,
   AllChronosSpotMarketSummary,
-} from '@injectivelabs/sdk-ts/dist/client/exchange/types/spot-rest'
+} from '@injectivelabs/sdk-ts/dist/client/indexer/types/spot-rest'
 import { Token } from '@injectivelabs/token-metadata'
 import { Change, MarketBase, MarketType } from './common'