From b4fbc212ca6008ec05c31116182bf6dfa7a1cbcb Mon Sep 17 00:00:00 2001 From: jessop Date: Fri, 21 Feb 2020 12:20:18 -0500 Subject: [PATCH] remove tvWelcome --- dist/bundle.es.js | 10 +++++----- src/redux/actions/sync.js | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 451bd49..dd87ebe 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1614,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, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value; + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = rawObj.value; - 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 _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, sharing_3P ? { sharing_3P } : {}); } return {}; @@ -1624,10 +1624,10 @@ function extractUserState(rawObj) { function doPopulateSharedUserState(sharedSettings) { return dispatch => { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P } + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, allowAnalytics: sharing_3P } }); }; } @@ -1687,7 +1687,7 @@ const buildSharedStateMiddleware = (actions, sharedStateFilters, sharedStateCb) } const actionResult = next(action); - // Call `getState` after calling `next` to ensure the state has updated in response to the action + // Call `getState` after calling `next` tqo ensure the state has updated in response to the action const nextState = getState(); const shared = {}; diff --git a/src/redux/actions/sync.js b/src/redux/actions/sync.js index 704e0dd..28b8d7a 100644 --- a/src/redux/actions/sync.js +++ b/src/redux/actions/sync.js @@ -10,14 +10,13 @@ type SharedData = { blocked?: Array, 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, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value; + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = rawObj.value; return { ...(subscriptions ? { subscriptions } : {}), @@ -25,7 +24,6 @@ function extractUserState(rawObj: SharedData) { ...(blocked ? { blocked } : {}), ...(settings ? { settings } : {}), ...(app_welcome_version ? { app_welcome_version } : {}), - ...(tv_welcome_version ? { tv_welcome_version } : {}), ...(sharing_3P ? { sharing_3P} : {}), }; } @@ -35,10 +33,10 @@ function extractUserState(rawObj: SharedData) { export function doPopulateSharedUserState(sharedSettings: any) { return (dispatch: Dispatch) => { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: ACTIONS.USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P }, + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, allowAnalytics: sharing_3P }, }); }; }