Merge remote-tracking branch 'origin/master' into lens_restructure

# Conflicts:
#	package.json
#	src/main/index.ts
#	src/renderer/api/__test__/parseAPI.test.ts
#	src/renderer/components/chart/bar-chart.tsx
#	src/renderer/components/chart/chart.tsx
#	src/renderer/components/chart/pie-chart.tsx
#	src/renderer/utils/__tests__/arrays.test.ts
#	src/renderer/utils/arrays.ts
#	yarn.lock
This commit is contained in:
Roman committed 2020-06-22 17:09:07 +03:00
commit f4922811cc
38 files changed
+281 -265

No files matched your search

@@ -122,7 +122,6 @@
id="checkbox-allow-telemetry"
switch
v-model="preferences.allowTelemetry"
:disabled="licenceData && licenceData.status === 'valid'"
@input="onSave"
>
Allow telemetry & usage tracking
+5
View File
@@ -47,6 +47,11 @@ export default new Vuex.Store({
this.commit("savePreferences", userStore.getPreferences());
},
savePreferences(state, prefs) {
if (prefs.allowTelemetry) {
tracker.event("telemetry", "enabled")
} else {
tracker.event("telemetry", "disabled")
}
state.preferences = prefs;
userStore.setPreferences(prefs);
this.dispatch("destroyWebviews")