Merge branch 'master' into prod

RTM - SP-119 Ladder settings NullRef

Approved-by: John Colvin <john.colvin@bluetradesys.com>
Approved-by: Pedro Pinto <pedro.pinto+atlassian@bluetradesys.com>

doc/user/content/release_notes/_index.md

@@ -4,6 +4,11 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+
+## 2.6.1
+### User Visible Changes
+  - Fixed an issue in the ladder where an error could occur when trying to change ladder settings for the first time
+  
 ## 2.6.0
 ### User Visible Changes
   - In the ladder made last trade more distinctive when overlayed on the volumn column

src/client/spark/Modules/Trading/Ladder/LadderSettings.cs

@@ -339,6 +339,7 @@ namespace mbts.spark {
                zoom_slider_visible = false,
                zoom_factor = _default_zoom_factor,
                net_change = NetChangeTerms.None,
+               mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general),
             };
             rv.row_height = LadderRender.measure_row_height(rv);
             return rv;

src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs

@@ -113,7 +113,7 @@ namespace bts.shell {
                });
             });
             // vm
-            vm = LadderVM.create(_bus, model, last_value ?? _settings_hub.current.ladder, settings_source);
+            vm = LadderVM.create(_bus, model, LadderSettings.sanitize(last_value ?? _settings_hub.current.ladder), settings_source);
             vm.settings_invalidated += on_settings_invalidated;
             vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select;
             vm.order_properties_vm.use_algo_param_grid = _ladder_conf.use_algo_param_grid;

src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs

@@ -363,7 +363,9 @@ namespace mbts.spark {
          } else {
             clone = SparkUtils.clone_proto(_current);
 #pragma warning disable CS0612 // Type or member is obsolete
-            clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion));
+            clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ? 
+               mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) :
+               mini_ob.create());
 #pragma warning restore CS0612 // Type or member is obsolete
          }
          clone.badge_style = badge_style;

src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs

@@ -51,7 +51,7 @@ namespace mbts.spark {
                LadderVM.create_readonly(_bus,
                   new LadderModel(security_md.Value, _model, _model.mbo_service,
                   new Func<OrderSecurity, bool>(osec => _selected_order_tree.Contains(osec.order.Key))),
-                  Observable.Return(LadderSettings.Default)) : null);
+                  Observable.Return(LadderSettings.sanitize(LadderSettings.Default))) : null);
          RaisePropertyChanged(nameof(value));
       }
    }