fix BooleanSetting and ChoiceSetting not working properly on initial

launch as anon visitor (would show all as changed, empty selects)

2 files changed, 6 insertions, 3 deletions

diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index 1dda49f2..dea77e10 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -18,8 +18,11 @@ export default {
     state () {
       return get(this.$parent, this.path)
     },
+    defaultState () {
+      return get(this.$parent, this.pathDefault)
+    },
     isChanged () {
-      return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+      return this.state !== undefined && this.state !== this.defaultState
     }
   },
   methods: {
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index 042e8106..f4387e62 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -17,13 +17,13 @@ export default {
       return [firstSegment + 'DefaultValue', ...rest].join('.')
     },
     state () {
-      return get(this.$parent, this.path)
+      return get(this.$parent, this.path) || get(this.$parent, this.pathDefault)
     },
     defaultState () {
       return get(this.$parent, this.pathDefault)
     },
     isChanged () {
-      return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+      return this.state !== undefined && this.state !== this.defaultState
     }
   },
   methods: {