From 1be0aee9b80bd4f71d8dce1aaddbbbaef0e795e1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 21 Mar 2018 15:31:58 -0400 Subject: [PATCH] SPARK-902 Ladder should not allow NaN price orders sends --- .../spark/view/Spark/Ladder/LadderVM.cs | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index d7c82e734..a2981bf1b 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -104,35 +104,35 @@ namespace mbts.spark { } public async Task send_order((double price, Side? side) args) { - if (args.side.HasValue) { - _validate_selected_account(); - _validate_selected_time_in_force(); - _validate_selected_order_type(); - if (HasErrors) return; - else if (!size_calculator.value.HasValue || size_calculator.value.Value == 0) { - size_calculator.flash_error(); - } else { - var order = create(args.side.Value); - uint size = (uint)Math.Abs(size_calculator.value.Value); - var result = await _model.order_gateway.send_order_get_error(order, args.price, size); - string msg = result.key.HasValue ? - OrderUtils.successful_order_description(order, security.ContractSpec, args.price, size, result.key.Value) : - OrderUtils.unsuccessful_order_desecription(order, security.ContractSpec, args.price, size); - update_status(msg, ActivityLogCategory.order); - if (revert) { - size_calculator.value = _settings.size; - if (selected_time_in_force != _settings.default_time_in_force && time_in_forces.Contains(_settings.default_time_in_force)) { - selected_time_in_force = _settings.default_time_in_force; - RaisePropertyChanged(nameof(selected_time_in_force)); - } - foreach (var ot in order_types) { - if (ot.order_type == CustomOrderDefinition.CustomOneofCase.Spreader) //TODO - continue; - ot.load_from(_model.order_gateway.factory.custom_order(ot.order_type)); - if (ot.order_type == _settings.default_order_type) { - selected_order_type = ot; - RaisePropertyChanged(nameof(selected_order_type)); - } + if (DoubleHelper.IsNaNOrInfinity(price) || !args.side.HasValue) + return; + _validate_selected_account(); + _validate_selected_time_in_force(); + _validate_selected_order_type(); + if (HasErrors) return; + else if (!size_calculator.value.HasValue || size_calculator.value.Value == 0) { + size_calculator.flash_error(); + } else { + var order = create(args.side.Value); + uint size = (uint)Math.Abs(size_calculator.value.Value); + var result = await _model.order_gateway.send_order_get_error(order, args.price, size); + string msg = result.key.HasValue ? + OrderUtils.successful_order_description(order, security.ContractSpec, args.price, size, result.key.Value) : + OrderUtils.unsuccessful_order_desecription(order, security.ContractSpec, args.price, size); + update_status(msg, ActivityLogCategory.order); + if (revert) { + size_calculator.value = _settings.size; + if (selected_time_in_force != _settings.default_time_in_force && time_in_forces.Contains(_settings.default_time_in_force)) { + selected_time_in_force = _settings.default_time_in_force; + RaisePropertyChanged(nameof(selected_time_in_force)); + } + foreach (var ot in order_types) { + if (ot.order_type == CustomOrderDefinition.CustomOneofCase.Spreader) //TODO + continue; + ot.load_from(_model.order_gateway.factory.custom_order(ot.order_type)); + if (ot.order_type == _settings.default_order_type) { + selected_order_type = ot; + RaisePropertyChanged(nameof(selected_order_type)); } } }