From 04774dfe2204d5a9f2c567241fd1c57f62084263 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Thu, 20 Feb 2020 00:57:55 -0500
Subject: [PATCH] sync welcome and 3p analytics pref

---
 dist/bundle.es.js                   | 16 +++++++++++-----
 src/constants/action_types.js       |  2 ++
 src/constants/shared_preferences.js |  1 +
 src/redux/actions/sync.js           | 12 +++++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/dist/bundle.es.js b/dist/bundle.es.js
index c549c41..4f63f2d 100644
--- a/dist/bundle.es.js
+++ b/dist/bundle.es.js
@@ -26,6 +26,8 @@ const DAEMON_READY = 'DAEMON_READY';
 const DAEMON_VERSION_MATCH = 'DAEMON_VERSION_MATCH';
 const DAEMON_VERSION_MISMATCH = 'DAEMON_VERSION_MISMATCH';
 const VOLUME_CHANGED = 'VOLUME_CHANGED';
+const SET_WELCOME_VERSION = 'SET_WELCOME_VERSION';
+const SET_ALLOW_ANALYTICS = 'SET_ALLOW_ANALYTICS';
 
 // Navigation
 const CHANGE_AFTER_AUTH_PATH = 'CHANGE_AFTER_AUTH_PATH';
@@ -295,6 +297,8 @@ var action_types = /*#__PURE__*/Object.freeze({
   DAEMON_VERSION_MATCH: DAEMON_VERSION_MATCH,
   DAEMON_VERSION_MISMATCH: DAEMON_VERSION_MISMATCH,
   VOLUME_CHANGED: VOLUME_CHANGED,
+  SET_WELCOME_VERSION: SET_WELCOME_VERSION,
+  SET_ALLOW_ANALYTICS: SET_ALLOW_ANALYTICS,
   CHANGE_AFTER_AUTH_PATH: CHANGE_AFTER_AUTH_PATH,
   WINDOW_SCROLLED: WINDOW_SCROLLED,
   HISTORY_NAVIGATE: HISTORY_NAVIGATE,
@@ -833,9 +837,11 @@ var daemon_settings = /*#__PURE__*/Object.freeze({
  */
 
 const WALLET_SERVERS = LBRYUM_SERVERS;
+const SHARE_USAGE_DATA$1 = SHARE_USAGE_DATA;
 
 var shared_preferences = /*#__PURE__*/Object.freeze({
-  WALLET_SERVERS: WALLET_SERVERS
+  WALLET_SERVERS: WALLET_SERVERS,
+  SHARE_USAGE_DATA: SHARE_USAGE_DATA$1
 });
 
 const SEARCH_TYPES = {
@@ -1608,9 +1614,9 @@ var _extends$2 = Object.assign || function (target) { for (var i = 1; i < argume
 
 function extractUserState(rawObj) {
   if (rawObj && rawObj.version === '0.1' && rawObj.value) {
-    const { subscriptions, tags, blocked, settings } = rawObj.value;
+    const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value;
 
-    return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, settings ? { settings } : {});
+    return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, tv_welcome_version ? { tv_welcome_version } : {}, sharing_3P ? { sharing_3P } : {});
   }
 
   return {};
@@ -1618,10 +1624,10 @@ function extractUserState(rawObj) {
 
 function doPopulateSharedUserState(sharedSettings) {
   return dispatch => {
-    const { subscriptions, tags, blocked, settings } = extractUserState(sharedSettings);
+    const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings);
     dispatch({
       type: USER_STATE_POPULATE,
-      data: { subscriptions, tags, blocked, settings }
+      data: { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P }
     });
   };
 }
diff --git a/src/constants/action_types.js b/src/constants/action_types.js
index ae74a0d..b66893b 100644
--- a/src/constants/action_types.js
+++ b/src/constants/action_types.js
@@ -3,6 +3,8 @@ export const DAEMON_READY = 'DAEMON_READY';
 export const DAEMON_VERSION_MATCH = 'DAEMON_VERSION_MATCH';
 export const DAEMON_VERSION_MISMATCH = 'DAEMON_VERSION_MISMATCH';
 export const VOLUME_CHANGED = 'VOLUME_CHANGED';
+export const SET_WELCOME_VERSION = 'SET_WELCOME_VERSION';
+export const SET_ALLOW_ANALYTICS = 'SET_ALLOW_ANALYTICS';
 
 // Navigation
 export const CHANGE_AFTER_AUTH_PATH = 'CHANGE_AFTER_AUTH_PATH';
diff --git a/src/constants/shared_preferences.js b/src/constants/shared_preferences.js
index e508e83..58bee93 100644
--- a/src/constants/shared_preferences.js
+++ b/src/constants/shared_preferences.js
@@ -10,3 +10,4 @@
 import * as DAEMON_SETTINGS from './daemon_settings';
 
 export const WALLET_SERVERS = DAEMON_SETTINGS.LBRYUM_SERVERS;
+export const SHARE_USAGE_DATA = DAEMON_SETTINGS.SHARE_USAGE_DATA;
diff --git a/src/redux/actions/sync.js b/src/redux/actions/sync.js
index 7f80d33..9a1854e 100644
--- a/src/redux/actions/sync.js
+++ b/src/redux/actions/sync.js
@@ -9,18 +9,24 @@ type SharedData = {
     tags?: Array<string>,
     blocked?: Array<string>,
     settings?: any,
+    app_welcome_version?: number,
+    tv_welcome_version?: number,
+    sharing_3P?: boolean,
   },
 };
 
 function extractUserState(rawObj: SharedData) {
   if (rawObj && rawObj.version === '0.1' && rawObj.value) {
-    const { subscriptions, tags, blocked, settings } = rawObj.value;
+    const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value;
 
     return {
       ...(subscriptions ? { subscriptions } : {}),
       ...(tags ? { tags } : {}),
       ...(blocked ? { blocked } : {}),
       ...(settings ? { settings } : {}),
+      ...(app_welcome_version ? { app_welcome_version } : {}),
+      ...(tv_welcome_version ? { tv_welcome_version } : {}),
+      ...(sharing_3P ? { sharing_3P} : {}),
     };
   }
 
@@ -29,10 +35,10 @@ function extractUserState(rawObj: SharedData) {
 
 export function doPopulateSharedUserState(sharedSettings: any) {
   return (dispatch: Dispatch) => {
-    const { subscriptions, tags, blocked, settings } = extractUserState(sharedSettings);
+    const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings);
     dispatch({
       type: ACTIONS.USER_STATE_POPULATE,
-      data: { subscriptions, tags, blocked, settings },
+      data: { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P },
     });
   };
 }