diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index ddbe0d9d9..9f3f91928 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -23,8 +23,8 @@ namespace mbts.spark this.selected_child_order_type = new InlineUserProperty(selected_child_order_type, true); this.child_order_types = new InlineUserProperty>(child_order_types, true); - trigger_price_type = new InlineUserProperty(TriggerPriceType.LastTradePrice, false); - order_price = new InlineUserProperty(double.NaN, false); + trigger_price_type = new InlineUserProperty(TriggerPriceType.Bid, false); + order_price = new InlineUserProperty(double.NaN, true); } public readonly InlineUserProperty selected_child_order_type; public readonly InlineUserProperty> child_order_types; @@ -43,7 +43,7 @@ namespace mbts.spark IOrderTypeVM _child_order; IDisposable _dispose, _child_order_errors_sub; - public TriggerPriceType trigger_price_type { get; set; } = TriggerPriceType.LastTradePrice; + public TriggerPriceType trigger_price_type { get; set; } = TriggerPriceType.Bid; public double order_price { get; set; } = double.NaN; public TriggerOrderVM(OrdersModel model, IObservable security_source) @@ -84,7 +84,7 @@ namespace mbts.spark _validate(); } - public IEnumerable trigger_price_types => EnumHelper.get_values(); + public IEnumerable trigger_price_types => EnumHelper.get_values_except(TriggerPriceType.LastTradePrice); public override void assign_to(CustomOrderDefinition value) { @@ -108,6 +108,16 @@ namespace mbts.spark value.Trigger = i; } } + + public double price_tick + { + get { return _security.Value.ContractSpec.LowTick; } + } + + public ContractSpecificationImmutable spec + { + get { return _security.Value.ContractSpec; } + } public ICollection child_order_types { diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 2f5a2572f..0fb815cbe 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -362,7 +362,7 @@ SelectedItem="{Binding trigger_price_type}" /> Order Price - + Child