Move the additional risk calculation status fields into RiskCalculati…

…onStatus

... to avoid duplication of the `message` field

changes.proto

@@ -717,19 +717,6 @@ message GetChangeRisksResponse {
   // The status of the risk calculation
   RiskCalculationStatus riskCalculationStatus = 1;
 
-  // The description of the current step within the STATUS_INPROGRESS status.
-  // This will only be populated when the status is STATUS_INPROGRESS
-  string stepDescription = 2;
-
-  // The current step within the STATUS_INPROGRESS status. These give more
-  // granularity and should be shown to the user so they can see that the
-  // calculation is progressing
-  int32 currentStep = 3;
-
-  // The total num,ber of steps within the STATUS_INPROGRESS status
-  int32 totalSteps = 4;
-
-
   // The risks that are related to this change
   repeated Risk risks = 5;
 
@@ -973,6 +960,14 @@ message RiskCalculationStatus {
   // status could show this message e.g. if a calculation was skipped because
   // the user opted out or didn't have enough credits
   string message = 2;
+
+  // The total number of steps within the STATUS_INPROGRESS status
+  int32 numSteps = 3;
+
+  // The current step within the STATUS_INPROGRESS status. These give more
+  // granularity and should be shown to the user so they can see that the
+  // calculation is progressing
+  int32 currentStep = 4;
 }
 
 ////////////////