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:
parent
d238c37d0c
commit
77ca101781
@ -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).
|
||||||
|
@ -262,6 +262,7 @@ export const MarketInfoAccordion = ({
|
|||||||
<PriceMonitoringBoundsInfoPanel
|
<PriceMonitoringBoundsInfoPanel
|
||||||
market={market}
|
market={market}
|
||||||
triggerIndex={triggerIndex}
|
triggerIndex={triggerIndex}
|
||||||
|
key={id}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
@ -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">
|
||||||
|
Loading…
Reference in New Issue
Block a user