revert change to show true up review when telemetry is enabled, always send true up data to CWS for telemetry capture.

server/channels/api4/license.go

@@ -351,19 +351,12 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Do not send true-up review data if the user has already requested one for the quarter.
+	// True-up is only enabled when telemetry is disabled. When telemetry is enabled, we already have all the data necessary
-	// And only send a true-up review via as a one-time telemetry request if telemetry is disabled.
+	// for true-up reviews to be completed.
-	telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics
+	err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
-	if telemetryEnabled != nil && *telemetryEnabled {
+	if err != nil {
-		// Send telemetry data
+		c.SetJSONEncodingError(err)
-		c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
+		return
-	} else {
-		// Telemetry is disabled, submit true up review profile via CWS.
-		err := c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
-		if err != nil {
-			c.SetJSONEncodingError(err)
-			return
-		}
 	}
 
 	// Update the review status to reflect the completion.

webapp/channels/src/components/analytics/true_up_review.tsx

@@ -223,6 +223,10 @@ const TrueUpReview: React.FC = () => {
         return null;
     }
 
+    if (telemetryEnabled) {
+        return null;
+    }
+
     pageVisited(TELEMETRY_CATEGORIES.TRUE_UP_REVIEW, 'pageview_true_up_review');
 
     return (