v1.3.52

.drone.yml

@@ -379,4 +379,4 @@ kind: secret
 name: github_api_token
 ---
 kind: signature
-hmac: 9cc2cc2db01455d34768577047f8069d19c0573b6a05dd26c88b9deb3af3a0c9
+hmac: b9e499a424faecd9a8f41552cc307bd3431cb0e3fac77f3ee99ce19258fc0fec

CHANGELOG.md

@@ -7,12 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v1.3.52 (2023-11-02)
+
+### Fixed
+
+- Address `TypeError` that occurs under some scenarios on the Alert Group detail page
+
+### Changed
+
+- Change wording for push notifications timing choices @Ferril ([#3253](https://github.com/grafana/oncall/pull/3253))
+
 ## v1.3.51 (2023-11-02)
 
 ### Fixed
 
 - Postpone Legacy AlertManager and Grafana Alerting integration auto-migration date ([3250])(<https://github.com/grafana/oncall/pull/3250>)
-- Address `TypeError` that occurs under some scenarios on the Alert Group detail page ([3252](https://github.com/grafana/oncall/pull/3252))
 
 ## v1.3.50 (2023-11-02)
 

engine/apps/mobile_app/models.py

@@ -171,11 +171,11 @@ class MobileAppUserSettings(models.Model):
     ONE_DAY_IN_SECONDS = TWELVE_HOURS_IN_SECONDS * 2
 
     NOTIFICATION_TIMING_CHOICES = (
-        (FIFTEEN_MINUTES_IN_SECONDS, "fifteen minutes before"),
-        (ONE_HOUR_IN_SECONDS, "one hour before"),
-        (SIX_HOURS_IN_SECONDS, "six hours before"),
-        (TWELVE_HOURS_IN_SECONDS, "twelve hours before"),
-        (ONE_DAY_IN_SECONDS, "one day before"),
+        (FIFTEEN_MINUTES_IN_SECONDS, "15 minutes before"),
+        (ONE_HOUR_IN_SECONDS, "1 hour before"),
+        (SIX_HOURS_IN_SECONDS, "6 hours before"),
+        (TWELVE_HOURS_IN_SECONDS, "12 hours before"),
+        (ONE_DAY_IN_SECONDS, "1 day before"),
     )
     going_oncall_notification_timing = JSONField(default=default_notification_timing_options)
 

grafana-plugin/src/pages/incident/Incident.tsx

@@ -177,7 +177,7 @@ class IncidentPage extends React.Component<IncidentPageProps, IncidentPageState>
                   </div>
                   <div className={cx('column')}>
                     <VerticalGroup style={{ display: 'block' }}>
-                      {(!incident.resolved || incident?.paged_users.length > 0) && (
+                      {(!incident.resolved || incident?.paged_users?.length > 0) && (
                         <AddResponders
                           mode="update"
                           hideAddResponderButton={incident.resolved}