chore: handle timeout error - add unit test, fix ts errors

apps/static/src/assets/mainnet-tranches.json

@@ -2761,7 +2761,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "68975.3330121062666493861",
+    "locked_amount": "69212.7941588870528164928",
     "deposits": [
       {
         "amount": "86666.297",
@@ -2827,7 +2827,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "1421.61410637973125",
+    "locked_amount": "1435.351483007733",
     "deposits": [
       {
         "amount": "2500",
@@ -3215,7 +3215,7 @@
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
     "total_removed": "2836.415649675",
-    "locked_amount": "34080.14646639042375",
+    "locked_amount": "34287.34557243708",
     "deposits": [
       {
         "amount": "7500",
@@ -3326,7 +3326,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "68912.401699541887736445",
+    "locked_amount": "69149.646192904764493335",
     "deposits": [
       {
         "amount": "129999.45",
@@ -3392,7 +3392,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "33871.4891362252656",
+    "locked_amount": "34043.00988077117846",
     "deposits": [
       {
         "amount": "10000",
@@ -3585,7 +3585,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2897.1713280060885",
+    "locked_amount": "2910.871067985794",
     "deposits": [
       {
         "amount": "5000",
@@ -3796,7 +3796,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "10818.8482095714036717828",
+    "locked_amount": "11051.5629572361427967976",
     "deposits": [
       {
         "amount": "97499.58",
@@ -3829,7 +3829,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "14787.49770626082669661645614",
+    "locked_amount": "15105.57858979342307160273426",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -3875,7 +3875,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "4551.302610251424035468",
+    "locked_amount": "4649.201685825244862006",
     "deposits": [
       {
         "amount": "32499.86",
@@ -3908,7 +3908,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "1481.4048348417078526675",
+    "locked_amount": "1513.2700339508446292286",
     "deposits": [
       {
         "amount": "10833.29",
@@ -3941,7 +3941,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "5537.8221384325917571011",
+    "locked_amount": "5656.9413696662315119734",
     "deposits": [
       {
         "amount": "6500",
@@ -4093,7 +4093,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "4373.451408",
-    "locked_amount": "9011.6237914364655",
+    "locked_amount": "9135.943255064457",
     "deposits": [
       {
         "amount": "7500",
@@ -4324,7 +4324,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "555369.642869191387312504",
+    "locked_amount": "560684.945746241749007341",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -7298,15 +7298,10 @@
     "tranche_id": 10,
     "tranche_start": "2021-07-15T23:37:11.000Z",
     "tranche_end": "2021-07-15T23:37:11.000Z",
-    "total_added": "6259302.299000000000000001",
-    "total_removed": "6213483.280000000000000001",
+    "total_added": "6159302.299000000000000001",
+    "total_removed": "6113483.280000000000000001",
     "locked_amount": "0",
     "deposits": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -7829,11 +7824,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "100000",
-        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-        "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8299,12 +8289,6 @@
       {
         "address": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
         "deposits": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8487,12 +8471,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "100000",
-            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
-            "tranche_id": 10,
-            "tx": "0xa4417547c32fb4936e0dd6ee338ba31b2fd622388fe8a3906d9e7020d5e8371b"
-          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -8668,8 +8646,8 @@
             "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc"
           }
         ],
-        "total_tokens": "3056651",
-        "withdrawn_tokens": "3056651",
+        "total_tokens": "2956651",
+        "withdrawn_tokens": "2956651",
         "remaining_tokens": "0"
       },
       {
@@ -36616,7 +36594,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "592998.0503546212334",
-    "locked_amount": "877911.01211975962832293262",
+    "locked_amount": "886078.876576593193858643006",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -37941,8 +37919,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "570447.40018226362274952",
-    "locked_amount": "8412703.667343023478982687330398519288997",
+    "total_removed": "567626.84057226362274952",
+    "locked_amount": "8441666.3902799341022910153716735157718303",
     "deposits": [
       {
         "amount": "16249.93",
@@ -38476,11 +38454,6 @@
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
         "tx": "0x4870598253a2a664d9c96af37904f08ac772ee9620b5975560ef7e7fb51c9a7f"
       },
-      {
-        "amount": "2820.55961",
-        "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
-        "tx": "0x039c7d1eb6b18a13c3fb91589403d43710e12b319e7d40936280a576502f80fe"
-      },
       {
         "amount": "856.08784586478614",
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -41992,12 +41965,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "2820.55961",
-            "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
-            "tranche_id": 2,
-            "tx": "0x039c7d1eb6b18a13c3fb91589403d43710e12b319e7d40936280a576502f80fe"
-          },
           {
             "amount": "1412.763584",
             "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
@@ -42198,8 +42165,8 @@
           }
         ],
         "total_tokens": "200000",
-        "withdrawn_tokens": "93634.576066",
-        "remaining_tokens": "106365.423934"
+        "withdrawn_tokens": "90814.016456",
+        "remaining_tokens": "109185.983544"
       },
       {
         "address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01",
@@ -43552,7 +43519,7 @@
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
     "total_removed": "3926967.723059737571037032",
-    "locked_amount": "2045109.08378068825804623195557898",
+    "locked_amount": "2071847.284667310624156645942280506",
     "deposits": [
       {
         "amount": "129284.449",
@@ -50465,7 +50432,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "2749067.463242913023296295",
-    "locked_amount": "491131.564178330845541202121121822",
+    "locked_amount": "501695.989059927736982047096440314",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -52491,8 +52458,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "33662.0369387672685",
-    "locked_amount": "139110.018223666781876256383155776",
+    "total_removed": "33643.6376997992685",
+    "locked_amount": "140404.26303635577567951130086252",
     "deposits": [
       {
         "amount": "3000",
@@ -59176,11 +59143,6 @@
         "user": "0x4F4A140E9B4a8403792970C6b5535ed0AA32c8A4",
         "tx": "0x181a9afe9b3592427f1ee10f205e01f34ae7be383294e8d93e397766092bf6df"
       },
-      {
-        "amount": "18.399238968",
-        "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
-        "tx": "0xa82e451753cbced76b064af62868d3170dff7afca557680e657c27ebba5c7beb"
-      },
       {
         "amount": "13.1116203702",
         "user": "0x4cBC0C88d8FE503f62823B42f30a4900292C13bE",
@@ -67339,12 +67301,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "18.399238968",
-            "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
-            "tranche_id": 5,
-            "tx": "0xa82e451753cbced76b064af62868d3170dff7afca557680e657c27ebba5c7beb"
-          },
           {
             "amount": "262.76406646",
             "user": "0xD3ec605d078326B0a636ca90d496Ebb5Eb457a27",
@@ -67353,8 +67309,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "281.163305428",
-        "remaining_tokens": "118.836694572"
+        "withdrawn_tokens": "262.76406646",
+        "remaining_tokens": "137.23593354"
       },
       {
         "address": "0x7f6aba7563Cb5d31980D440337D3d1A6e3dB58F3",

apps/trading-e2e/src/integration/markets.cy.ts

@@ -3,8 +3,6 @@ import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/react-helpers';
 
-const dialogCloseBtn = 'dialog-close';
-
 describe('markets table', { tags: '@smoke' }, () => {
   beforeEach(() => {
     cy.clearLocalStorage().then(() => {
@@ -149,7 +147,7 @@ describe('markets table', { tags: '@smoke' }, () => {
     });
     cy.visit('#/markets/market-0');
     cy.url().should('contain', 'market-0');
-    cy.getByTestId(dialogCloseBtn).click();
+    cy.getByTestId('dialog-close').click();
     cy.getByTestId('item-value').contains('Opening auction').realHover();
     cy.getByTestId('opening-auction-sub-status').should(
       'contain.text',
@@ -173,8 +171,7 @@ describe('markets table', { tags: '@smoke' }, () => {
 });
 
 function openMarketDropDown() {
-  cy.getByTestId(dialogCloseBtn).should('be.visible');
-  cy.getByTestId(dialogCloseBtn).click();
+  cy.getByTestId('dialog-close').click();
   cy.getByTestId('popover-trigger').click();
   cy.contains('Loading market data...').should('not.exist');
 }

apps/trading-e2e/src/integration/navbar.cy.ts

@@ -23,7 +23,6 @@ describe('Desktop view', { tags: '@smoke' }, () => {
             cy.wrap(element)
               .get('span.absolute.md\\:h-1.w-full')
               .should('exist');
-            cy.contains('No market').should('not.exist');
             cy.location('hash').should('equal', hashes[index]);
           });
       });
@@ -69,7 +68,6 @@ describe('Mobile view', { tags: '@smoke' }, () => {
       cy.getByTestId('button-menu-drawer').click();
       cy.getByTestId('menu-drawer').within((el) => {
         cy.wrap(el).getByTestId('Trading').click();
-        cy.contains('No market').should('not.exist');
         cy.location('hash').should('equal', '#/markets/market-1');
       });
     });

apps/trading/client-pages/market/market.tsx

@@ -96,15 +96,7 @@ export const MarketPage = () => {
 
   const tradeView = useMemo(() => {
     if (w > 960) {
-      return (
-        <TradeGrid
-          market={data}
-          onSelect={onSelect}
-          pinnedAsset={
-            data?.tradableInstrument.instrument.product.settlementAsset
-          }
-        />
-      );
+      return <TradeGrid market={data} onSelect={onSelect} />;
     }
     return (
       <TradePanels

apps/trading/client-pages/market/trade-grid.tsx

@@ -28,7 +28,6 @@ import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
-import type { PinnedAsset } from '@vegaprotocol/accounts';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
@@ -66,17 +65,14 @@ type TradingView = keyof typeof TradingViews;
 interface TradeGridProps {
   market: Market | null;
   onSelect: (marketId: string) => void;
-  pinnedAsset?: PinnedAsset;
 }
 
 const MainGrid = ({
   marketId,
   onSelect,
-  pinnedAsset,
 }: {
   marketId: string;
   onSelect?: (marketId: string) => void;
-  pinnedAsset?: PinnedAsset;
 }) => {
   const navigate = useNavigate();
   const onMarketClick = (marketId: string) => {
@@ -179,7 +175,7 @@ const MainGrid = ({
             </Tab>
             <Tab id="accounts" name={t('Collateral')}>
               <VegaWalletContainer>
-                <TradingViews.Collateral pinnedAsset={pinnedAsset} />
+                <TradingViews.Collateral />
               </VegaWalletContainer>
             </Tab>
           </Tabs>
@@ -190,19 +186,11 @@ const MainGrid = ({
 };
 const MainGridWrapped = memo(MainGrid);
 
-export const TradeGrid = ({
-  market,
-  onSelect,
-  pinnedAsset,
-}: TradeGridProps) => {
+export const TradeGrid = ({ market, onSelect }: TradeGridProps) => {
   return (
     <div className="h-full grid grid-rows-[min-content_1fr]">
       <TradeMarketHeader market={market} onSelect={onSelect} />
-      <MainGridWrapped
-        marketId={market?.id || ''}
-        onSelect={onSelect}
-        pinnedAsset={pinnedAsset}
-      />
+      <MainGridWrapped marketId={market?.id || ''} onSelect={onSelect} />
     </div>
   );
 };
@@ -226,14 +214,12 @@ interface TradePanelsProps {
   onSelect: (marketId: string) => void;
   onMarketClick?: (marketId: string) => void;
   onClickCollateral: () => void;
-  pinnedAsset?: PinnedAsset;
 }
 
 export const TradePanels = ({
   market,
   onSelect,
   onClickCollateral,
-  pinnedAsset,
 }: TradePanelsProps) => {
   const [view, setView] = useState<TradingView>('Candles');
   const renderView = () => {
@@ -242,7 +228,6 @@ export const TradePanels = ({
       onSelect: (marketId: string) => void;
       onMarketClick?: (marketId: string) => void;
       onClickCollateral: () => void;
-      pinnedAsset?: PinnedAsset;
     }>(TradingViews[view]);
 
     if (!Component) {
@@ -256,7 +241,6 @@ export const TradePanels = ({
         marketId={market?.id}
         onSelect={onSelect}
         onClickCollateral={onClickCollateral}
-        pinnedAsset={pinnedAsset}
       />
     );
   };

apps/trading/components/accounts-container/accounts-container.tsx

@@ -5,15 +5,10 @@ import { useWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { AccountManager, useTransferDialog } from '@vegaprotocol/accounts';
 import { useDepositDialog } from '@vegaprotocol/deposits';
 
-export const AccountsContainer = ({
-  pinnedAsset,
-}: {
-  pinnedAsset?: PinnedAsset;
-}) => {
+export const AccountsContainer = () => {
   const { pubKey, isReadOnly } = useVegaWallet();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
   const openWithdrawalDialog = useWithdrawalDialog((store) => store.open);
@@ -44,7 +39,6 @@ export const AccountsContainer = ({
           onClickWithdraw={openWithdrawalDialog}
           onClickDeposit={openDepositDialog}
           isReadOnly={isReadOnly}
-          pinnedAsset={pinnedAsset}
         />
       </div>
       {!isReadOnly && (

libs/accounts/src/lib/accounts-manager.tsx

@@ -4,7 +4,6 @@ import type { AgGridReact } from 'ag-grid-react';
 import { useRef, useMemo, memo } from 'react';
 import type { AccountFields } from './accounts-data-provider';
 import { aggregatedAccountsDataProvider } from './accounts-data-provider';
-import type { PinnedAsset } from './accounts-table';
 import { AccountTable } from './accounts-table';
 
 interface AccountManagerProps {
@@ -13,7 +12,6 @@ interface AccountManagerProps {
   onClickWithdraw?: (assetId?: string) => void;
   onClickDeposit?: (assetId?: string) => void;
   isReadOnly: boolean;
-  pinnedAsset?: PinnedAsset;
 }
 
 export const AccountManager = ({
@@ -22,7 +20,6 @@ export const AccountManager = ({
   onClickDeposit,
   partyId,
   isReadOnly,
-  pinnedAsset,
 }: AccountManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
   const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -44,7 +41,6 @@ export const AccountManager = ({
         onClickWithdraw={onClickWithdraw}
         isReadOnly={isReadOnly}
         noRowsOverlayComponent={() => null}
-        pinnedAsset={pinnedAsset}
       />
       <div className="pointer-events-none absolute inset-0">
         <AsyncRenderer
@@ -52,7 +48,7 @@ export const AccountManager = ({
           noDataCondition={(data) => !(data && data.length)}
           error={error}
           loading={loading}
-          noDataMessage={pinnedAsset ? ' ' : t('No accounts')}
+          noDataMessage={t('No accounts')}
           reload={reload}
         />
       </div>

libs/accounts/src/lib/accounts-table.spec.tsx

@@ -72,74 +72,52 @@ describe('AccountsTable', () => {
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
     });
-    const rows = await screen.findAllByRole('row');
-    expect(rows.length).toBe(6);
   });
+});
 
-  it('should add first asset as pinned', async () => {
-    await act(async () => {
-      render(
-        <AccountTable
-          rowData={singleRowData}
-          onClickAsset={() => null}
-          isReadOnly={false}
-          pinnedAsset={{
+it('should get correct account data', () => {
+  const result = getAccountData([singleRow]);
+  const expected = [
+    {
+      asset: {
+        __typename: 'Asset',
+        decimals: 5,
+        id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+        symbol: 'tBTC',
+      },
+      available: '0',
+      balance: '0',
+      breakdown: [
+        {
+          __typename: 'AccountBalance',
+          asset: {
+            __typename: 'Asset',
             decimals: 5,
             id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
             symbol: 'tBTC',
-            name: 'tBTC',
-          }}
-        />
-      );
-    });
-    const rows = await screen.findAllByRole('row');
-    expect(rows.length).toBe(9);
-  });
-
-  it('should get correct account data', () => {
-    const result = getAccountData([singleRow]);
-    const expected = [
-      {
-        asset: {
-          __typename: 'Asset',
-          decimals: 5,
-          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-          symbol: 'tBTC',
-        },
-        available: '0',
-        balance: '0',
-        breakdown: [
-          {
-            __typename: 'AccountBalance',
-            asset: {
-              __typename: 'Asset',
-              decimals: 5,
-              id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-              symbol: 'tBTC',
-            },
-            available: '0',
-            balance: '125600000',
-            deposited: '125600000',
-            market: {
-              __typename: 'Market',
-              id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
-              tradableInstrument: {
-                __typename: 'TradableInstrument',
-                instrument: {
-                  __typename: 'Instrument',
-                  name: 'BTCUSD Monthly (30 Jun 2022)',
-                },
+          },
+          available: '0',
+          balance: '125600000',
+          deposited: '125600000',
+          market: {
+            __typename: 'Market',
+            id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
+            tradableInstrument: {
+              __typename: 'TradableInstrument',
+              instrument: {
+                __typename: 'Instrument',
+                name: 'BTCUSD Monthly (30 Jun 2022)',
               },
             },
-            type: 'ACCOUNT_TYPE_MARGIN',
-            used: '125600000',
           },
-        ],
-        deposited: '125600000',
-        type: 'ACCOUNT_TYPE_GENERAL',
-        used: '125600000',
-      },
-    ];
-    expect(result).toEqual(expected);
-  });
+          type: 'ACCOUNT_TYPE_MARGIN',
+          used: '125600000',
+        },
+      ],
+      deposited: '125600000',
+      type: 'ACCOUNT_TYPE_GENERAL',
+      used: '125600000',
+    },
+  ];
+  expect(result).toEqual(expected);
 });

libs/accounts/src/lib/accounts-table.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, useMemo, useState } from 'react';
+import { forwardRef, useState } from 'react';
 import {
   addDecimalsFormatNumber,
   isNumeric,
@@ -14,8 +14,6 @@ import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import BreakdownTable from './breakdown-table';
 import type { AccountFields } from './accounts-data-provider';
-import type { Asset } from '@vegaprotocol/types';
-import BigNumber from 'bignumber.js';
 
 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
   successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
@@ -25,8 +23,6 @@ export interface Datasource extends IDatasource {
   getRows(params: GetRowsParams): void;
 }
 
-export type PinnedAsset = Pick<Asset, 'symbol' | 'name' | 'id' | 'decimals'>;
-
 export interface AccountTableProps extends AgGridReactProps {
   rowData?: AccountFields[] | null;
   datasource?: Datasource;
@@ -34,33 +30,12 @@ export interface AccountTableProps extends AgGridReactProps {
   onClickWithdraw?: (assetId: string) => void;
   onClickDeposit?: (assetId: string) => void;
   isReadOnly: boolean;
-  pinnedAsset?: PinnedAsset;
 }
 
 export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
   ({ onClickAsset, onClickWithdraw, onClickDeposit, ...props }, ref) => {
     const [openBreakdown, setOpenBreakdown] = useState(false);
     const [breakdown, setBreakdown] = useState<AccountFields[] | null>(null);
-    const pinnedAssetId = props.pinnedAsset?.id;
-
-    const pinnedAssetRow = useMemo(() => {
-      const currentPinnedAssetRow = props.rowData?.find(
-        (row) => row.asset.id === pinnedAssetId
-      );
-      if (!currentPinnedAssetRow) {
-        if (props.pinnedAsset) {
-          return {
-            asset: props.pinnedAsset,
-            available: '0',
-            used: '0',
-            deposited: '0',
-            balance: '0',
-          };
-        }
-      }
-      return currentPinnedAssetRow;
-    }, [pinnedAssetId, props.pinnedAsset, props.rowData]);
-
     return (
       <>
         <AgGrid
@@ -76,7 +51,6 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
             sortable: true,
           }}
           {...props}
-          pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined}
         >
           <AgGridColumn
             headerName={t('Asset')}
@@ -164,55 +138,37 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
               cellRenderer={({
                 data,
               }: VegaICellRendererParams<AccountFields>) => {
-                if (!data) return null;
-                else {
-                  if (
-                    data.asset.id === pinnedAssetId &&
-                    new BigNumber(data.deposited).isLessThanOrEqualTo(0)
-                  ) {
-                    return (
-                      <ButtonLink
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
-                      >
-                        {t('Deposit to trade')}
-                      </ButtonLink>
-                    );
-                  }
-                  return (
-                    <>
-                      <ButtonLink
-                        data-testid="breakdown"
-                        onClick={() => {
-                          setOpenBreakdown(!openBreakdown);
-                          setBreakdown(data.breakdown || null);
-                        }}
-                      >
-                        {t('Breakdown')}
-                      </ButtonLink>
-                      <span className="mx-1" />
-                      <ButtonLink
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
-                      >
-                        {t('Deposit')}
-                      </ButtonLink>
-                      <span className="mx-1" />
-                      <ButtonLink
-                        data-testid="withdraw"
-                        onClick={() =>
-                          onClickWithdraw && onClickWithdraw(data.asset.id)
-                        }
-                      >
-                        {t('Withdraw')}
-                      </ButtonLink>
-                    </>
-                  );
-                }
+                return data ? (
+                  <>
+                    <ButtonLink
+                      data-testid="breakdown"
+                      onClick={() => {
+                        setOpenBreakdown(!openBreakdown);
+                        setBreakdown(data.breakdown || null);
+                      }}
+                    >
+                      {t('Breakdown')}
+                    </ButtonLink>
+                    <span className="mx-1" />
+                    <ButtonLink
+                      data-testid="deposit"
+                      onClick={() => {
+                        onClickDeposit && onClickDeposit(data.asset.id);
+                      }}
+                    >
+                      {t('Deposit')}
+                    </ButtonLink>
+                    <span className="mx-1" />
+                    <ButtonLink
+                      data-testid="withdraw"
+                      onClick={() =>
+                        onClickWithdraw && onClickWithdraw(data.asset.id)
+                      }
+                    >
+                      {t('Withdraw')}
+                    </ButtonLink>
+                  </>
+                ) : null;
               }}
             />
           )}