address comments

public/configs/cctp.json

@@ -1,9 +1,29 @@
 [
+    {
+        "chainId": "42161",
+        "tokenAddress": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
+        "name": "Arbitrum"
+    },
+    {
+        "chainId": "43114",
+        "tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+        "name": "Avalanche"
+    },
+    {
+        "chainId": "8453",
+        "tokenAddress": "0x66627F389ae46D881773B7131139b2411980E09E",
+        "name": "Base"
+    },
     {
         "chainId": "1",
         "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
         "name": "Ethereum"
     },
+    {
+        "chainId": "10",
+        "tokenAddress": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
+        "name": "OP Mainnet"
+    },
     {
         "chainId": "421613",
         "tokenAddress": "0xfd064a18f3bf249cf1f87fc203e90d8f650f2d63",

public/configs/env.json

@@ -71,7 +71,7 @@
                "https://validator.v4dev.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4dev.dydx.exchange"
          },
          "links": {
@@ -145,7 +145,7 @@
                "http://54.92.118.111"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -218,7 +218,7 @@
                "http://validator.v4dev4.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -291,7 +291,7 @@
                "http://18.223.78.50"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -365,7 +365,7 @@
                "https://validator.v4staging.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -440,7 +440,7 @@
                "https://validator.v4staging.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -513,7 +513,7 @@
                "https://validator-uswest1.v4staging.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+            "nobleValidator": "https://rpc.testnet.noble.strange.love"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -591,7 +591,7 @@
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -666,7 +666,7 @@
                "https://validator.v4testnet.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -742,7 +742,7 @@
                "https://dydx-testnet.nodefleet.org"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -818,7 +818,7 @@
                "https://test-dydx.kingnodes.com"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -894,7 +894,7 @@
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -970,7 +970,7 @@
                "https://dydx-testnet-rpc.polkachu.com/"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -1037,7 +1037,7 @@
                "https://dydx-testnet-full-rpc.public.blastapi.io/"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "nobleValidator": "https://rpc.testnet.noble.strange.love",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {

src/components/CollapsibleTabs.tsx

@@ -31,12 +31,10 @@ type ElementProps<TabItemsValue> = {
 };
 
 type StyleProps = {
-  className?: string;
   fullWidthTabs?: boolean;
+  className?: string;
 };
 
-export type CollapsibleTabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
-
 export const CollapsibleTabs = <TabItemsValue extends string>({
   defaultValue,
   items,
@@ -45,9 +43,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
   onOpenChange,
 
   fullWidthTabs,
-
   className,
-}: CollapsibleTabsProps<TabItemsValue>) => {
+}: ElementProps<TabItemsValue> & StyleProps) => {
   const [value, setValue] = useState(defaultValue);
 
   const currentItem = items.find((item) => item.value === value);
@@ -89,8 +86,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
         </Styled.Header>
 
         <Styled.CollapsibleContent>
-          {items.map(({ asChild, value, content }) => (
-            <Styled.TabsContent key={value} asChild={asChild} value={value}>
+          {items.map(({ value, content }) => (
+            <Styled.TabsContent key={value} value={value}>
               {content}
             </Styled.TabsContent>
           ))}
@@ -222,6 +219,7 @@ Styled.Header = styled.header`
 
 Styled.CollapsibleContent = styled(CollapsibleContent)`
   ${layoutMixins.stack}
+  ${layoutMixins.perspectiveArea}
 
   box-shadow: none;
 `;

src/components/Input.tsx

@@ -198,6 +198,7 @@ Styled.InputContainer = styled.div`
   border-radius: inherit;
 
   input {
+    user-select: all;
     flex: 1;
     width: 100%;
   }

src/components/Tabs.tsx

@@ -21,7 +21,6 @@ export type TabItem<TabItemsValue> = {
   content?: React.ReactNode;
   subitems?: TabItem<TabItemsValue>[];
   customTrigger?: ReactNode;
-  asChild?: boolean;
 };
 
 type ElementProps<TabItemsValue> = {
@@ -42,8 +41,6 @@ type StyleProps = {
   className?: string;
 };
 
-export type TabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
-
 export const Tabs = <TabItemsValue extends string>({
   defaultValue,
   value,
@@ -110,10 +107,9 @@ export const Tabs = <TabItemsValue extends string>({
         sharedContent
       ) : (
         <Styled.Stack>
-          {items.map(({ asChild, value, content, forceMount }) => (
+          {items.map(({ value, content, forceMount }) => (
             <Styled.Content
               key={value}
-              asChild={asChild}
               value={value}
               forceMount={forceMount}
               $hide={forceMount && currentItem?.value !== value}
@@ -246,6 +242,7 @@ Styled.Trigger = styled(Trigger)<{ $withBorders?: boolean }>`
 
 Styled.Stack = styled.div`
   ${layoutMixins.stack}
+  ${layoutMixins.perspectiveArea}
 
   box-shadow: none;
 `;

src/lib/abacus/dydxChainTransactions.ts

@@ -65,13 +65,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
   }
 
   setNobleWallet(nobleWallet: LocalWallet) {
-    try {
-      this.nobleWallet = nobleWallet;
-      if (this.nobleClient) {
-        this.nobleClient.connect(nobleWallet);
-      }
-    } catch (e) {
-      log('DydxChainTransactions/setNobleWallet', e);
+    this.nobleWallet = nobleWallet;
+    if (this.nobleClient) {
+      this.nobleClient.connect(nobleWallet);
     }
   }
 
@@ -118,15 +114,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
 
       this.compositeClient = compositeClient;
 
-      try {
-        if (nobleValidatorUrl) {
-          this.nobleClient = new NobleClient(nobleValidatorUrl);
-          if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
-        }
-      } catch (e) {
-        log('DydxChainTransactions/connectNetwork/NobleClient', e);
+      if (nobleValidatorUrl) {
+        this.nobleClient = new NobleClient(nobleValidatorUrl);
+        if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
       }
-
       // Dispatch custom event to notify other parts of the app that the network has been connected
       const customEvent = new CustomEvent('abacus:connectNetwork', {
         detail: parsedParams,

src/pages/trade/HorizontalPanel.tsx

@@ -1,7 +1,8 @@
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 
+import { AbacusOrderStatus } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
 
 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -27,6 +28,7 @@ import {
   getCurrentMarketTradeInfoNumbers,
   getHasUnseenFillUpdates,
   getHasUnseenOrderUpdates,
+  getLatestOrderStatus,
   getTradeInfoNumbers,
 } from '@/state/accountSelectors';
 
@@ -80,142 +82,125 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
     showCurrentMarket ? numOpenOrders : numTotalOpenOrders
   );
 
-  const tabItems = useMemo(
-    () => [
-      {
-        asChild: true,
-        value: InfoSection.Position,
-        label: stringGetter({
-          key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
-        }),
+  const tabItems = [
+    {
+      value: InfoSection.Position,
+      label: stringGetter({
+        key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
+      }),
 
-        tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
+      tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
 
-        content: showCurrentMarket ? (
-          <PositionInfo showNarrowVariation={isTablet} />
-        ) : (
-          <PositionsTable
-            columnKeys={
-              isTablet
-                ? [
-                    PositionsTableColumnKey.Details,
-                    PositionsTableColumnKey.IndexEntry,
-                    PositionsTableColumnKey.PnL,
-                  ]
-                : [
-                    PositionsTableColumnKey.Market,
-                    PositionsTableColumnKey.Side,
-                    PositionsTableColumnKey.Size,
-                    PositionsTableColumnKey.Leverage,
-                    PositionsTableColumnKey.LiquidationAndOraclePrice,
-                    PositionsTableColumnKey.UnrealizedPnl,
-                    PositionsTableColumnKey.RealizedPnl,
-                    PositionsTableColumnKey.AverageOpenAndClose,
-                  ]
-            }
-            onNavigate={() => setView(PanelView.CurrentMarket)}
-          />
-        ),
-      },
-      {
-        asChild: true,
-        value: InfoSection.Orders,
-        label: stringGetter({ key: STRING_KEYS.ORDERS }),
+      content: showCurrentMarket ? (
+        <PositionInfo showNarrowVariation={isTablet} />
+      ) : (
+        <PositionsTable
+          columnKeys={
+            isTablet
+              ? [
+                  PositionsTableColumnKey.Details,
+                  PositionsTableColumnKey.IndexEntry,
+                  PositionsTableColumnKey.PnL,
+                ]
+              : [
+                  PositionsTableColumnKey.Market,
+                  PositionsTableColumnKey.Side,
+                  PositionsTableColumnKey.Size,
+                  PositionsTableColumnKey.Leverage,
+                  PositionsTableColumnKey.LiquidationAndOraclePrice,
+                  PositionsTableColumnKey.UnrealizedPnl,
+                  PositionsTableColumnKey.RealizedPnl,
+                  PositionsTableColumnKey.AverageOpenAndClose,
+                ]
+          }
+          onNavigate={() => setView(PanelView.CurrentMarket)}
+        />
+      ),
+    },
+    {
+      value: InfoSection.Orders,
+      label: stringGetter({ key: STRING_KEYS.ORDERS }),
 
-        slotRight: isWaitingForOrderToIndex ? (
-          <Styled.LoadingSpinner />
-        ) : (
-          ordersTagNumber && (
-            <Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
-              {ordersTagNumber}
-            </Tag>
-          )
-        ),
-
-        content: (
-          <OrdersTable
-            currentMarket={showCurrentMarket ? currentMarketId : undefined}
-            columnKeys={
-              isTablet
-                ? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
-                : [
-                    !showCurrentMarket && OrdersTableColumnKey.Market,
-                    OrdersTableColumnKey.Status,
-                    OrdersTableColumnKey.Side,
-                    OrdersTableColumnKey.AmountFill,
-                    OrdersTableColumnKey.Price,
-                    OrdersTableColumnKey.Trigger,
-                    OrdersTableColumnKey.GoodTil,
-                    !isAccountViewOnly && OrdersTableColumnKey.Actions,
-                  ].filter(isTruthy)
-            }
-          />
-        ),
-      },
-      {
-        asChild: true,
-        value: InfoSection.Fills,
-        label: stringGetter({ key: STRING_KEYS.FILLS }),
-
-        slotRight: fillsTagNumber && (
-          <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
-            {fillsTagNumber}
+      slotRight: isWaitingForOrderToIndex ? (
+        <Styled.LoadingSpinner />
+      ) : (
+        ordersTagNumber && (
+          <Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
+            {ordersTagNumber}
           </Tag>
-        ),
+        )
+      ),
 
-        content: (
-          <FillsTable
-            currentMarket={showCurrentMarket ? currentMarketId : undefined}
-            columnKeys={
-              isTablet
-                ? [
-                    FillsTableColumnKey.Time,
-                    FillsTableColumnKey.TypeAmount,
-                    FillsTableColumnKey.PriceFee,
-                  ]
-                : [
-                    !showCurrentMarket && FillsTableColumnKey.Market,
-                    FillsTableColumnKey.Time,
-                    FillsTableColumnKey.Type,
-                    FillsTableColumnKey.Side,
-                    FillsTableColumnKey.AmountTag,
-                    FillsTableColumnKey.Price,
-                    FillsTableColumnKey.TotalFee,
-                    FillsTableColumnKey.Liquidity,
-                  ].filter(isTruthy)
-            }
-            columnWidths={{
-              [FillsTableColumnKey.TypeAmount]: '100%',
-            }}
-          />
-        ),
-      },
-      // TODO - TRCL-1693 - re-enable when funding payments are supported
-      // {
-      //   value: InfoSection.Payments,
-      //   label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
+      content: (
+        <OrdersTable
+          currentMarket={showCurrentMarket ? currentMarketId : undefined}
+          columnKeys={
+            isTablet
+              ? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
+              : [
+                  !showCurrentMarket && OrdersTableColumnKey.Market,
+                  OrdersTableColumnKey.Status,
+                  OrdersTableColumnKey.Side,
+                  OrdersTableColumnKey.AmountFill,
+                  OrdersTableColumnKey.Price,
+                  OrdersTableColumnKey.Trigger,
+                  OrdersTableColumnKey.GoodTil,
+                  !isAccountViewOnly && OrdersTableColumnKey.Actions,
+                ].filter(isTruthy)
+          }
+        />
+      ),
+    },
+    {
+      value: InfoSection.Fills,
+      label: stringGetter({ key: STRING_KEYS.FILLS }),
 
-      //   tag: shortenNumberForDisplay(
-      //     showCurrentMarket ? numFundingPayments : numTotalFundingPayments
-      //   ),
-      //   content: (
-      //     <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
-      //   ),
-      // },
-    ],
-    [
-      stringGetter,
-      currentMarketId,
-      showCurrentMarket,
-      isTablet,
-      isWaitingForOrderToIndex,
-      isAccountViewOnly,
-      ordersTagNumber,
-      fillsTagNumber,
-      hasUnseenFillUpdates,
-      hasUnseenOrderUpdates,
-    ]
-  );
+      slotRight: fillsTagNumber && (
+        <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
+          {fillsTagNumber}
+        </Tag>
+      ),
+
+      content: (
+        <FillsTable
+          currentMarket={showCurrentMarket ? currentMarketId : undefined}
+          columnKeys={
+            isTablet
+              ? [
+                  FillsTableColumnKey.Time,
+                  FillsTableColumnKey.TypeAmount,
+                  FillsTableColumnKey.PriceFee,
+                ]
+              : [
+                  !showCurrentMarket && FillsTableColumnKey.Market,
+                  FillsTableColumnKey.Time,
+                  FillsTableColumnKey.Type,
+                  FillsTableColumnKey.Side,
+                  FillsTableColumnKey.AmountTag,
+                  FillsTableColumnKey.Price,
+                  FillsTableColumnKey.TotalFee,
+                  FillsTableColumnKey.Liquidity,
+                ].filter(isTruthy)
+          }
+          columnWidths={{
+            [FillsTableColumnKey.TypeAmount]: '100%',
+          }}
+        />
+      ),
+    },
+    // TODO - TRCL-1693 - re-enable when funding payments are supported
+    // {
+    //   value: InfoSection.Payments,
+    //   label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
+
+    //   tag: shortenNumberForDisplay(
+    //     showCurrentMarket ? numFundingPayments : numTotalFundingPayments
+    //   ),
+    //   content: (
+    //     <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
+    //   ),
+    // },
+  ];
 
   return isTablet ? (
     <MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} />

src/styles/layoutMixins.ts

@@ -877,6 +877,11 @@ export const layoutMixins: Record<
     }
   `,
 
+  perspectiveArea: css`
+    perspective: 100rem;
+    transform-style: preserve-3d;
+  `,
+
   absolute: css`
     position: absolute;
     top: 0;

src/views/AccountInfo.tsx

@@ -63,6 +63,7 @@ Styled.AccountInfoSectionContainer = styled.div<{ showAccountInfo?: boolean }>`
   ${layoutMixins.column}
   height: var(--account-info-section-height);
   min-height: var(--account-info-section-height);
+  overflow-x: clip;
 
   ${({ showAccountInfo }) =>
     !showAccountInfo &&

src/views/AccountInfo/AccountInfoConnectedState.tsx

@@ -203,6 +203,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Stack = styled.div`
   ${layoutMixins.stack}
+  ${layoutMixins.perspectiveArea}
 `;
 
 Styled.CornerButton = styled(Button)`
@@ -292,14 +293,7 @@ Styled.TransferButtons = styled.div`
 
 Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>`
   ${layoutMixins.column}
-
-  @media ${breakpoints.notTablet} {
-    ${layoutMixins.withOuterAndInnerBorders}
-  }
-
-  @media ${breakpoints.tablet} {
-    ${layoutMixins.withInnerBorder}
-  }
+  ${layoutMixins.withOuterAndInnerBorders}
 
   ${({ $showHeader }) =>
     $showHeader &&

src/views/MarketDetails.tsx

@@ -213,8 +213,13 @@ Styled.MarketDetails = styled.div`
 `;
 
 Styled.Header = styled.header`
+  /* max-width: fit-content; */
+
   ${layoutMixins.column}
   gap: 1.25rem;
+
+  position: sticky;
+  bottom: 3rem;
 `;
 
 Styled.WrapRow = styled.div`

src/views/PositionInfo.tsx

@@ -453,6 +453,13 @@ Styled.Actions = styled.footer`
   > :last-child {
     flex: 2;
   }
+
+  position: sticky;
+  bottom: clamp(0.5rem, 7.5%, 2rem);
+
+  @media ${breakpoints.tablet} {
+    bottom: 0;
+  }
 `;
 
 Styled.Output = styled(Output)<{ sign: NumberSign; smallText?: boolean; margin?: string }>`
@@ -507,7 +514,6 @@ Styled.PositionInfo = styled.div`
 
 Styled.DetachedSection = styled(DetachedSection)`
   padding: 0 1.5rem;
-  position: relative;
 `;
 
 Styled.DetachedScrollableSection = styled(DetachedScrollableSection)`

src/views/charts/TvChart.tsx

@@ -82,6 +82,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.PriceChart = styled.div<{ isChartReady?: boolean }>`
   ${layoutMixins.stack}
+  ${layoutMixins.perspectiveArea}
 
   height: 100%;
 

src/views/forms/AccountManagementForms/TokenSelectMenu.tsx

@@ -57,6 +57,7 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps)
               <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
             </>
           ),
+          tooltip: 'swap',
         },
       ]}
     >

src/views/tables/OrdersTable.tsx

@@ -230,7 +230,14 @@ const getOrdersTableColumnDef = ({
         label: `${stringGetter({ key: STRING_KEYS.STATUS })} / ${stringGetter({
           key: STRING_KEYS.FILL,
         })}`,
-        renderCell: ({ asset, createdAtMilliseconds, size, status, totalFilled, resources }) => {
+        renderCell: ({
+          asset,
+          createdAtMilliseconds,
+          size,
+          status,
+          totalFilled,
+          resources,
+        }) => {
           const { statusIconColor, statusStringKey } = getStatusIconInfo({
             status,
             totalFilled,
@@ -338,7 +345,9 @@ export const OrdersTable = ({
     if (hasUnseenOrderUpdates) dispatch(viewedOrders());
   }, [hasUnseenOrderUpdates]);
 
-  const symbol = currentMarket ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.id : null;
+  const symbol = currentMarket
+    ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.symbol
+    : null;
 
   const ordersData = orders.map((order: SubaccountOrder) =>
     getHydratedTradingData({