diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go index 985bada409..358960272f 100644 --- a/server/channels/api4/license.go +++ b/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. - // And only send a true-up review via as a one-time telemetry request if telemetry is disabled. - telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics - if telemetryEnabled != nil && *telemetryEnabled { - // Send telemetry data - c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap) - } 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 - } + // True-up is only enabled when telemetry is disabled. When telemetry is enabled, we already have all the data necessary + // for true-up reviews to be completed. + 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. diff --git a/webapp/channels/src/components/analytics/true_up_review.tsx b/webapp/channels/src/components/analytics/true_up_review.tsx index c5ce7b38b2..5098999d63 100644 --- a/webapp/channels/src/components/analytics/true_up_review.tsx +++ b/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 (