From 92bff6caaa09ed8b35c4e52bd0417a4df091c097 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 25 May 2019 13:21:17 -0700
Subject: [PATCH] fix: minor tweaks to PushNotificationSettings (#1222)

---
 .../settings/instance/PushNotificationSettings.html   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/routes/_components/settings/instance/PushNotificationSettings.html b/src/routes/_components/settings/instance/PushNotificationSettings.html
index 98727f11..058c7b4f 100644
--- a/src/routes/_components/settings/instance/PushNotificationSettings.html
+++ b/src/routes/_components/settings/instance/PushNotificationSettings.html
@@ -9,7 +9,7 @@
     <label for="push-notifications-follow">New followers</label>
     <br>
     <input type="checkbox" id="push-notifications-favourite" name="favourite" disabled="{!pushNotificationsSupport}" on:change="onPushSettingsChange(event)">
-    <label for="push-notifications-favourite">Favourites</label>
+    <label for="push-notifications-favourite">Favorites</label>
     <br>
     <input type="checkbox" id="push-notifications-reblog" name="reblog" disabled="{!pushNotificationsSupport}" on:change="onPushSettingsChange(event)">
     <label for="push-notifications-reblog">Boosts</label>
@@ -40,6 +40,7 @@
   import { logOutOfInstance } from '../../../_actions/instances'
   import { updatePushSubscriptionForInstance, updateAlerts } from '../../../_actions/pushSubscription'
   import { toast } from '../../toast/toast'
+  import { get } from '../../../_utils/lodash-lite'
 
   export default {
     async oncreate () {
@@ -49,10 +50,10 @@
       const form = this.refs.pushNotificationsForm
       const { pushSubscription } = this.store.get()
 
-      form.elements.follow.checked = pushSubscription && pushSubscription.alerts && pushSubscription.alerts.follow
-      form.elements.favourite.checked = pushSubscription && pushSubscription.alerts && pushSubscription.alerts.favourite
-      form.elements.reblog.checked = pushSubscription && pushSubscription.alerts && pushSubscription.alerts.reblog
-      form.elements.mention.checked = pushSubscription && pushSubscription.alerts && pushSubscription.alerts.mention
+      form.elements.follow.checked = get(pushSubscription, ['alerts', 'follow'])
+      form.elements.favourite.checked = get(pushSubscription, ['alerts', 'favourite'])
+      form.elements.reblog.checked = get(pushSubscription, ['alerts', 'reblog'])
+      form.elements.mention.checked = get(pushSubscription, ['alerts', 'mention'])
     },
     store: () => store,
     computed: {