diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 16e2344f1..f4de61a8c 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -102,7 +102,7 @@ namespace mbts.spark { #region Filters public IDataGridColumnPersistentFilter fill_time_filter { get; } = new TimeFilterVM(r => r.fill_time, nameof(Row.fill_time)); public IDataGridColumnPersistentFilter time_in_force_filter { get; } = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.time_in_force, nameof(Row.time_in_force)); - public IDataGridColumnPersistentFilter order_type_filter { get; } = DiscreteValuesFilterVM.Create(OrderFactory.all_types, r => r.order_type, nameof(Row.order_type)); + public IDataGridColumnPersistentFilter order_type_filter { get; } = DiscreteValuesFilterVM.Create(OrderFactory.all_order_types, r => r.order_type, nameof(Row.order_type)); public IDataGridColumnPersistentFilter account_filter { get; } public IDataGridColumnPersistentFilter user_filter { get; } public IDataGridColumnPersistentFilter exchange_filter { get; } = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.exchange, nameof(Row.exchange)); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 033041f07..074c5219b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -129,7 +129,7 @@ namespace mbts.spark { // order type Add(order_type_column = new OrderBookOrderTypeColumn( DiscreteValuesFilterVM.Create( - utilities.OrderFactory.all_types, + utilities.OrderFactory.all_order_types, r => r.order_type.value, value_path(nameof(OrderBookRowVM.order_type))))); // order sub type diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index 0b8344753..5c16fb4a4 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -47,7 +47,7 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.TimeBox, CustomOrderDefinition.CustomOneofCase.Trigger, }; - public static readonly CustomOrderDefinition.CustomOneofCase[] all_types = _standard_types.Union(_spreader_types).ToArray(); + public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = _standard_types.Union(_spreader_types).ToArray(); readonly AdminModel _admin_model; IDisposable _dispose;