diff --git a/src/client/spark/Daemons/OrderTicketDaemon.cs b/src/client/spark/Daemons/OrderTicketDaemon.cs index d35a34afa..5aaa169cc 100644 --- a/src/client/spark/Daemons/OrderTicketDaemon.cs +++ b/src/client/spark/Daemons/OrderTicketDaemon.cs @@ -57,7 +57,8 @@ namespace bts.shell { } void _show_modify_order(uint order_key) { - if (_orders.state.TryGetValue(order_key, out OrderRecordImmutable ori) && _md_map.TryGetValue(ori.Def.SecurityKey, out SecurityMD smd)) + if (_orders.state.TryGetValue(order_key, out OrderRecordImmutable ori) && _md_map.TryGetValue(ori.Def.SecurityKey, out SecurityMD smd) + && (ori.HasDef && ori.Def.HasCustomDef && !(ori.Def.CustomDef.HasStop || ori.Def.CustomDef.HasStopLimit))) _show_order_window(new OrderModificationDialog { DataContext = new ExistingOrderTicketVM(_model, Observable.Return(new OrderRecordTuple(ori, smd)), diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 3829b023e..544af5f98 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -72,10 +72,16 @@ namespace mbts.spark { hoverbackground = mkbrush(dark, _darkbg, completion); border = new SolidColorBrush(color); _real_price = _order.State.Price; - if (_order.Def.HasCustomDef && _order.Def.CustomDef.HasStop) { - // if the stop order has been submitted but hasn't been triggered - // we draw the badge at the stop/trigger price, else the price price - if (_order.State.FilledQuantity == 0) { _real_price = _order.Def.CustomDef.Stop.StopPrice; } + if (_order.Def.HasCustomDef) { + if (_order.Def.CustomDef.HasStop) { + // if the stop order has been submitted but hasn't been triggered + // we draw the badge at the stop/trigger price, else the price price + if (_order.State.FilledQuantity == 0) { _real_price = _order.Def.CustomDef.Stop.StopPrice; } + } + if (_order.Def.CustomDef.HasStopLimit) { + // consistent behavior as Stop order above. + if (_order.State.FilledQuantity == 0) { _real_price = _order.Def.CustomDef.StopLimit.StopPrice; } + } } } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 3a9e80c8d..e634253cb 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -265,8 +265,12 @@ namespace mbts.spark { Disposable.dispose(ref _drag_init); _drag_view = order_view; if (_drag_view.DataContext is LadderOrderVM vm) { - using (new DropIndicatorAdorner(_orders_host)) - DragDrop.DoDragDrop(_orders_host, vm, DragDropEffects.Move); + // for now, don't allow stop or stop limit to be moved in ladder + // bc sparkd will assert + if (vm.order.HasDef && vm.order.Def.HasCustomDef && !(vm.order.Def.CustomDef.HasStop || vm.order.Def.CustomDef.HasStopLimit)) { + using (new DropIndicatorAdorner(_orders_host)) + DragDrop.DoDragDrop(_orders_host, vm, DragDropEffects.Move); + } } } } diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 031c4e69c..048619de3 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -138,8 +138,18 @@ namespace mbts.spark { size_calculator.flash_error(); } else { var order = order_properties_vm.create(args.side.Value); - if (order.CustomDef != null && order.CustomDef.Stop != null) { - order.CustomDef.Stop.StopPrice = args.price; + if (order.CustomDef != null) { + if (order.CustomDef.Stop != null) { + order.CustomDef.Stop.StopPrice = args.price; + } + if (order.CustomDef.StopLimit != null) { + // swap the prices here so that the level clicked + // in the ladder is the StopPrice (trigger) and the Price + // is what was specificed in the extra parameter box + double temp_price = order.CustomDef.StopLimit.StopPrice; + order.CustomDef.StopLimit.StopPrice = args.price; + args.price = temp_price; + } } uint size = (uint)Math.Abs(size_calculator.value.Value); await _model.order_gateway.send_order(order, args.price, size);