diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index faddf2d25..ad4751ad7 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -200,7 +200,20 @@ namespace mbts.spark { void refresh_custom_state() { current_algo_custom_state.Clear(); - foreach (var p in r.order.dynamic_custom_state()) + var dcs = r.order.dynamic_custom_state(); + // while dcs is not expected to be null, best to play it safe and double check. + if (dcs.is_null_or_empty()) { + var child_rows = _row_collection.get_descendent_rows(r.order_key); + if (_row_collection.filter != null) { + child_rows = child_rows.Where(cr => _row_collection.filter(cr.order_tuple)); + } + foreach (var dr in child_rows) { + dcs = dr.order.dynamic_custom_state(); + if (!dcs.is_null_or_empty()) + break; + } + } + foreach (var p in dcs.empty_if_null()) current_algo_custom_state.Add(new NamedValueVM(p.Key, DynamicOrderHelper.fmt_param(p.Value))); } }),