chore(trading): merge main back in develop (#5597)

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Edd <edd@vega.xyz>
This commit is contained in:
m.ray 2024-01-10 12:31:15 +02:00 committed by GitHub
parent d238c37d0c
commit 77ca101781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View File

@ -54,3 +54,5 @@ To run the UI automation tests with a mocked API, run:
```bash ```bash
yarn nx run trading-e2e:e2e yarn nx run trading-e2e:e2e
``` ```
To run tests with market sim please read [the readme](e2e/README.md).

View File

@ -262,6 +262,7 @@ export const MarketInfoAccordion = ({
<PriceMonitoringBoundsInfoPanel <PriceMonitoringBoundsInfoPanel
market={market} market={market}
triggerIndex={triggerIndex} triggerIndex={triggerIndex}
key={id}
/> />
} }
/> />

View File

@ -698,17 +698,13 @@ export const PriceMonitoringBoundsInfoPanel = ({
const quoteUnit = getQuoteName(market); const quoteUnit = getQuoteName(market);
const trigger =
market.priceMonitoringSettings?.parameters?.triggers?.[triggerIndex];
const bounds = data?.priceMonitoringBounds?.[triggerIndex]; const bounds = data?.priceMonitoringBounds?.[triggerIndex];
const trigger = bounds?.trigger;
if (!trigger) { if (!trigger) {
console.error(
`Could not find data for trigger ${triggerIndex} (market id: ${market.id})`
);
return null; return null;
} }
return ( return (
<> <>
<div className="mb-2 grid grid-cols-2 text-sm"> <div className="mb-2 grid grid-cols-2 text-sm">