Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/perps-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add `resolvePositionTriggerSummaryPrice` to `@metamask/perps-controller/utils`, which resolves the scalar TP/SL summary price a position reports for one direction from its trigger orders ([#9912](https://github.com/MetaMask/core/pull/9912))

### Changed

- Default `DEFAULT_PRO_LAYOUT_PREFERENCES.chartExpanded` to `true` so the chart is visible when a user first enters Pro mode; a persisted `chartExpanded` value still wins, so users who hid the chart keep it hidden ([#9920](https://github.com/MetaMask/core/pull/9920))

### Fixed

- Report the take profit (or stop loss) price on a `Position` when its only trigger for that direction is a partial, quantity-scoped one ([#9912](https://github.com/MetaMask/core/pull/9912))
Expand Down
2 changes: 1 addition & 1 deletion packages/perps-controller/src/constants/perpsConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ export type ProLayoutPreferences = {
*/
export const DEFAULT_PRO_LAYOUT_PREFERENCES: ProLayoutPreferences = {
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -694,10 +694,10 @@ describe('PerpsController', () => {
});

describe('pro layout preferences', () => {
it('defaults to collapsed order book, collapsed chart, reserved positions, and positions/orders sort/filter defaults', () => {
it('defaults to collapsed order book, expanded chart, reserved positions, and positions/orders sort/filter defaults', () => {
expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand All @@ -714,7 +714,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: true,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand Down Expand Up @@ -743,7 +743,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: true,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'right',
orderFormPosition: 'left',
positionsSideFilter: 'long',
Expand All @@ -766,7 +766,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand All @@ -789,7 +789,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand All @@ -807,7 +807,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'long',
Expand All @@ -820,9 +820,9 @@ describe('PerpsController', () => {
});

it('persists the update to controller state', () => {
controller.setProLayoutPreferences({ chartExpanded: true });
controller.setProLayoutPreferences({ chartExpanded: false });

expect(controller.state.proLayoutPreferences.chartExpanded).toBe(true);
expect(controller.state.proLayoutPreferences.chartExpanded).toBe(false);
});

it('fills in defaults for fields missing from persisted state', () => {
Expand All @@ -835,7 +835,7 @@ describe('PerpsController', () => {

expect(controller.getProLayoutPreferences()).toEqual({
orderBookExpanded: true,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand Down
4 changes: 2 additions & 2 deletions packages/perps-controller/tests/src/selectors.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ describe('PerpsController selectors', () => {
describe('selectProLayoutPreferences', () => {
const defaults = {
orderBookExpanded: false,
chartExpanded: false,
chartExpanded: true,
orderBookPosition: 'left',
orderFormPosition: 'right',
positionsSideFilter: 'all',
Expand All @@ -647,7 +647,7 @@ describe('PerpsController selectors', () => {
it('returns the pro-mode layout preferences', () => {
const proLayoutPreferences = {
orderBookExpanded: true,
chartExpanded: true,
chartExpanded: false,
orderBookPosition: 'right' as const,
orderFormPosition: 'left' as const,
positionsSideFilter: 'long' as const,
Expand Down