fix(trading): fix formatting on price bounds

apps/explorer/.env.validator-testnet

@@ -1,14 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=VALIDATOR_TESTNET
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
-NX_VEGA_URL=https://api.validators-testnet.vega.xyz/query
-NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-
-NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.xyz
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.xyz/rest
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.validators-testnet.vega.xyz/websocket/

apps/explorer/src/app/app.tsx

@@ -40,9 +40,9 @@ function App() {
       <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
         <AnnouncementBanner>
           <div className="font-alpha calt uppercase text-center text-lg text-white">
-            <span className="pr-4">Mainnet sim 2 coming in March!</span>
+            <span className="pr-4">Mainnet sim 2 is live!</span>
             <ExternalLink href="https://fairground.wtf/">
-              Learn more
+              Come help stress test the network
             </ExternalLink>
           </div>
         </AnnouncementBanner>

apps/static/src/assets/validator-testnet-network.json

@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api.validators-testnet.vega.xyz/graphql"]
-}

apps/token/.env.validator-testnet

@@ -1,10 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=VALIDATOR_TESTNET
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
-NX_VEGA_URL=https://api.validators-testnet.vega.xyz/query
-NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz

apps/token/src/components/page-templates/template-sidebar.tsx

@@ -21,8 +21,10 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
     <>
       <AnnouncementBanner>
         <div className="font-alpha calt uppercase text-center text-lg text-white">
-          <span className="pr-4">Mainnet sim 2 coming in March!</span>
-          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+          <span className="pr-4">Mainnet sim 2 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">
+            Come help stress test the network
+          </ExternalLink>
         </div>
       </AnnouncementBanner>
       <Nav navbarTheme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />

apps/token/src/config/env.ts

@@ -48,10 +48,6 @@ export const ContractAddresses: {
     claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
     lockedAddress: '0x0', // TODO not deployed to this env
   },
-  VALIDATOR_TESTNET: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
   MAINNET: {
     claimAddress: '0x0ee1fb382caf98e86e97e51f9f42f8b4654020f3',
     lockedAddress: '0x78344c7305d73a7a0ac3c94cd9960f4449a1814e',

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

@@ -40,7 +40,6 @@ const newPrice = '200';
 const completeWithdrawalBtn = 'complete-withdrawal';
 const submitTransferBtn = '[type="submit"]';
 const transferForm = 'transfer-form';
-const depositSubmit = 'deposit-submit';
 
 // Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
 describe('capsule - without MultiSign', { tags: '@slow' }, () => {
@@ -77,11 +76,11 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
       'contain.text',
       `Deposits of ${btcSymbol} not approved`
     );
-    cy.getByTestId(depositSubmit).click();
+    cy.getByTestId('deposit-submit').click();
     cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
     cy.get('[data-testid="Return to deposit"]').click();
     cy.get(amountField).clear().type('10');
-    cy.getByTestId(depositSubmit).click();
+    cy.getByTestId('deposit-submit').click();
     cy.getByTestId(toastContent, txTimeout).should(
       'contain.text',
       `Transaction confirmedYour transaction has been confirmed.View on EtherscanDeposit 10.00 ${btcSymbol}`,
@@ -180,14 +179,14 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
 
 describe('capsule', { tags: '@slow' }, () => {
   before(() => {
-    cy.updateCapsuleMultiSig();
-  });
-
-  beforeEach(() => {
     cy.createMarket();
     cy.get('@markets').then((markets) => {
       cy.wrap(markets[0]).as('market');
     });
+    cy.updateCapsuleMultiSig();
+  });
+
+  beforeEach(() => {
     cy.setVegaWallet();
   });
 
@@ -221,6 +220,7 @@ describe('capsule', { tags: '@slow' }, () => {
       timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
     };
     const rawPrice = removeDecimal(order.price, market.decimalPlaces);
+    const rawSize = removeDecimal(order.size, market.positionDecimalPlaces);
 
     cy.getByTestId('Collateral').click();
     cy.getByTestId('asset', txTimeout).should('contain.text', usdcSymbol);
@@ -238,7 +238,7 @@ describe('capsule', { tags: '@slow' }, () => {
       .get(`[data-testid="price-${rawPrice}"]`)
       .should('contain.text', order.price)
       .get(`[data-testid="bid-vol-${rawPrice}"]`)
-      .should('contain.text', order.size);
+      .should('contain.text', rawSize);
 
     cy.getByTestId(ordersTab).click();
     cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
@@ -410,18 +410,12 @@ describe('capsule', { tags: '@slow' }, () => {
 
   it('approved amount is less than deposit', function () {
     // 1001-DEPO-006
+
     cy.getByTestId(depositsTab).click();
     cy.getByTestId('deposit-button').click();
     cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
-    cy.contains('Deposits of tBTC not approved').should('not.exist');
-    cy.contains('Use maximum').should('be.visible');
     cy.get(amountField).clear().type('20000000');
-    cy.getByTestId(depositSubmit).should('be.visible');
-    cy.getByTestId(depositSubmit).click();
-    cy.getByTestId('input-error-text').should(
-      'contain.text',
-      'Amount is above approved amount.Update approve amount'
-    );
+    cy.getByTestId('deposit-approve-submit').should('be.visible');
   });
 
   it('withdraw - delay verification', function () {

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -125,9 +125,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     validateMarketDataRow(1, 'Long', '0.008508132993273576');
   });
 
-  it('price monitoring trigger displayed', () => {
+  it('price monitoring bounds displayed', () => {
     cy.getByTestId(marketTitle).contains('Price monitoring bounds 1').click();
-    cy.get('p.col-span-1').contains('100% probability of trading');
+    cy.get('p.col-span-1').contains('99.99999% probability price bounds');
     cy.get('p.col-span-1').contains('Within 43,200 seconds');
     validateMarketDataRow(0, 'Highest Price', '7.97323 ');
     validateMarketDataRow(1, 'Lowest Price', '6.54701 ');

apps/trading/components/banner/banner.tsx

@@ -29,7 +29,7 @@ export const Banner = () => {
           <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
         </button>
         <div>
-          <span className="pr-4">Mainnet sim 2 coming in March!</span>
+          <span className="pr-4">Mainnet sim 2 is live!</span>
           <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
         </div>
       </div>

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

@@ -68,6 +68,32 @@ describe('AccountsTable', () => {
       '1,256.00',
       'Breakdown',
       'Deposit',
+      'Withdraw',
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+    const rows = await screen.findAllByRole('row');
+    expect(rows.length).toBe(6);
+  });
+
+  it('should apply correct formatting in view as user mode', async () => {
+    await act(async () => {
+      render(
+        <AccountTable
+          rowData={singleRowData}
+          onClickAsset={() => null}
+          isReadOnly={true}
+        />
+      );
+    });
+    const cells = await screen.findAllByRole('gridcell');
+    const expectedValues = [
+      'tBTC',
+      '1,256.00',
+      '1,256.00',
+      '1,256.00',
+      'Breakdown',
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);

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

@@ -154,7 +154,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
             }
             maxWidth={300}
           />
-          {!props.isReadOnly && (
+          {
             <AgGridColumn
               colId="breakdown"
               headerName=""
@@ -193,29 +193,33 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                         {t('Breakdown')}
                       </ButtonLink>
                       <span className="mx-1" />
-                      <ButtonLink
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
-                      >
-                        {t('Deposit')}
-                      </ButtonLink>
+                      {!props.isReadOnly && (
+                        <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>
+                      {!props.isReadOnly && (
+                        <ButtonLink
+                          data-testid="withdraw"
+                          onClick={() =>
+                            onClickWithdraw && onClickWithdraw(data.asset.id)
+                          }
+                        >
+                          {t('Withdraw')}
+                        </ButtonLink>
+                      )}
                     </>
                   );
                 }
               }}
             />
-          )}
+          }
         </AgGrid>
         <Dialog size="medium" open={openBreakdown} onChange={setOpenBreakdown}>
           <div className="h-[35vh] w-full m-auto flex flex-col">

libs/environment/src/components/network-switcher/network-switcher.spec.tsx

@@ -136,7 +136,6 @@ describe('Network switcher', () => {
       [Networks.CUSTOM]: undefined,
       [Networks.MAINNET]: 'https://main.net',
       [Networks.TESTNET]: 'https://test.net',
-      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
       [Networks.STAGNET3]: 'https://stag3.net',
       [Networks.DEVNET]: 'https://dev.net',
       [Networks.STAGNET1]: 'https://stag1.net',
@@ -176,7 +175,6 @@ describe('Network switcher', () => {
     const VEGA_NETWORKS: Record<Networks, string | undefined> = {
       [Networks.CUSTOM]: undefined,
       [Networks.MAINNET]: 'https://main.net',
-      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
       [Networks.TESTNET]: 'https://test.net',
       [Networks.STAGNET3]: 'https://stag3.net',
       [Networks.DEVNET]: 'https://dev.net',
@@ -210,7 +208,6 @@ describe('Network switcher', () => {
     const VEGA_NETWORKS: Record<Networks, string | undefined> = {
       [Networks.CUSTOM]: undefined,
       [Networks.MAINNET]: undefined,
-      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
       [Networks.TESTNET]: 'https://test.net',
       [Networks.STAGNET3]: 'https://stag3.net',
       [Networks.DEVNET]: 'https://dev.net',

libs/environment/src/components/network-switcher/network-switcher.tsx

@@ -13,7 +13,6 @@ import { Networks } from '../../types';
 import { DApp, TOKEN_NEW_NETWORK_PARAM_PROPOSAL, useLinks } from '../../hooks';
 
 export const envNameMapping: Record<Networks, string> = {
-  [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
   [Networks.CUSTOM]: t('Custom'),
   [Networks.DEVNET]: t('Devnet'),
   [Networks.SANDBOX]: t('Sandbox'),
@@ -32,7 +31,6 @@ export const envTriggerMapping: Record<Networks, string> = {
 export const envDescriptionMapping: Record<Networks, string> = {
   [Networks.CUSTOM]: '',
   [Networks.SANDBOX]: t('A playground test environment'),
-  [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'),
   [Networks.DEVNET]: t('The latest Vega code auto-deployed'),
   [Networks.STAGNET1]: t('A release candidate for the staging environment'),
   [Networks.STAGNET3]: t('A staging environment with trading'),

libs/environment/src/hooks/use-links.ts

@@ -15,7 +15,6 @@ type DAppLinks = {
 };
 
 const EmptyLinks: DAppLinks = {
-  [Networks.VALIDATOR_TESTNET]: '',
   [Networks.DEVNET]: '',
   [Networks.STAGNET1]: '',
   [Networks.STAGNET3]: '',
@@ -27,7 +26,6 @@ const EmptyLinks: DAppLinks = {
 const ExplorerLinks = {
   ...EmptyLinks,
   [Networks.TESTNET]: 'https://explorer.fairground.wtf',
-  [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.explorer.vega.xyz',
   [Networks.MAINNET]: 'https://explorer.vega.xyz',
 };
 
@@ -43,7 +41,6 @@ const TokenLinks = {
   [Networks.DEVNET]: 'https://dev.token.vega.xyz',
   [Networks.STAGNET3]: 'https://stagnet3.token.vega.xyz',
   [Networks.TESTNET]: 'https://token.fairground.wtf',
-  [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.governance.vega.xyz',
   [Networks.MAINNET]: 'https://token.vega.xyz',
 };
 

libs/environment/src/types.ts

@@ -3,7 +3,6 @@ import type { configSchema } from './utils/validate-configuration';
 import type { envSchema } from './utils/validate-environment';
 
 export enum Networks {
-  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
   CUSTOM = 'CUSTOM',
   SANDBOX = 'SANDBOX',
   TESTNET = 'TESTNET',

libs/environment/src/utils/validate-environment.ts

@@ -1,16 +1,5 @@
 import z from 'zod';
-
-export enum Networks {
-  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
-  CUSTOM = 'CUSTOM',
-  SANDBOX = 'SANDBOX',
-  TESTNET = 'TESTNET',
-  STAGNET1 = 'STAGNET1',
-  STAGNET3 = 'STAGNET3',
-  DEVNET = 'DEVNET',
-  MAINNET = 'MAINNET',
-  MIRROR = 'MIRROR',
-}
+import { Networks } from '../types';
 
 const schemaObject = {
   VEGA_URL: z.optional(z.string()),

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

@@ -267,24 +267,24 @@ const FeesBreakdownTooltip = ({
       data-testid="fee-breakdown-tooltip"
       className="max-w-sm border border-neutral-600 bg-neutral-100 dark:bg-neutral-800 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
     >
-      <dl className="grid grid-cols-2 gap-x-2">
-        <dt>{t('Infrastructure fee')}</dt>
-        <dd className="text-right">
+      <dl className="grid grid-cols-3 gap-x-1">
+        <dt className="col-span-1">{t('Infrastructure fee')}</dt>
+        <dd className="text-right col-span-2">
           {addDecimalsFormatNumber(feesObj.infrastructureFee, asset.decimals)}{' '}
           {asset.symbol}
         </dd>
-        <dt>{t('Liquidity fee')}</dt>
-        <dd className="text-right">
+        <dt className="col-span-1">{t('Liquidity fee')}</dt>
+        <dd className="text-right col-span-2">
           {addDecimalsFormatNumber(feesObj.liquidityFee, asset.decimals)}{' '}
           {asset.symbol}
         </dd>
-        <dt>{t('Maker fee')}</dt>
-        <dd className="text-right">
+        <dt className="col-span-1">{t('Maker fee')}</dt>
+        <dd className="text-right col-span-2">
           {addDecimalsFormatNumber(feesObj.makerFee, asset.decimals)}{' '}
           {asset.symbol}
         </dd>
-        <dt>{t('Total fees')}</dt>
-        <dd className="text-right">{valueFormatted}</dd>
+        <dt className="col-span-1">{t('Total fees')}</dt>
+        <dd className="text-right col-span-2">{valueFormatted}</dd>
       </dl>
     </div>
   );

libs/market-info/src/components/market-info/info-market.tsx

@@ -317,8 +317,10 @@ export const Info = ({ market, onSelect }: InfoProps) => {
             <div className="text-xs">
               <div className="grid grid-cols-2 text-xs mb-4">
                 <p className="col-span-1">
-                  {t('%s% probability of trading', [
-                    formatNumber(trigger.probability * 100),
+                  {t('%s probability price bounds', [
+                    formatNumberPercentage(
+                      new BigNumber(trigger.probability).times(100)
+                    ),
                   ])}
                 </p>
                 <p className="col-span-1 text-right">
@@ -338,6 +340,11 @@ export const Info = ({ market, onSelect }: InfoProps) => {
                   />
                 )}
               </div>
+              <p className="mt-4">
+                {t('Results in %s seconds auction if breached', [
+                  trigger.auctionExtensionSecs.toString(),
+                ])}
+              </p>
             </div>
           ),
         };

libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx

@@ -166,7 +166,7 @@ export const OrderListManager = ({
             />
           </div>
         </div>
-        {hasActiveOrder && (
+        {!isReadOnly && hasActiveOrder && (
           <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
             <Button
               size="sm"

libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx

@@ -73,7 +73,7 @@ export const DropdownMenuContent = forwardRef<
   <DropdownMenuPrimitive.Content
     {...contentProps}
     ref={forwardedRef}
-    className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded"
+    className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded text-black"
     align="start"
     sideOffset={10}
   />