diff --git a/.env.defaults b/.env.defaults index 6ebb9fad7..91b4fc779 100644 --- a/.env.defaults +++ b/.env.defaults @@ -16,7 +16,7 @@ COMMENT_SERVER_NAME=Odysee SEARCH_SERVER_API=https://lighthouse.odysee.com/search SOCKETY_SERVER_API=wss://sockety.odysee.com/ws THUMBNAIL_CDN_URL=https://image-processor.vanwanet.com/optimize/ -WELCOME_VERSION=1.3 +WELCOME_VERSION=1.2 # STRIPE # STRIPE_PUBLIC_KEY='pk_test_NoL1JWL7i1ipfhVId5KfDZgo' diff --git a/ui/component/privacyAgreement/index.js b/ui/component/privacyAgreement/index.js index f7b4e3082..08cb6e7d6 100644 --- a/ui/component/privacyAgreement/index.js +++ b/ui/component/privacyAgreement/index.js @@ -1,9 +1,8 @@ import { DOMAIN } from 'config'; import { connect } from 'react-redux'; import { doSetDaemonSetting } from 'redux/actions/settings'; -import { doSetWelcomeVersion, doToggle3PAnalytics, doSignOut } from 'redux/actions/app'; +import { doSignOut } from 'redux/actions/app'; import * as DAEMON_SETTINGS from 'constants/daemon_settings'; -import { WELCOME_VERSION } from 'config.js'; import { selectUserVerifiedEmail } from 'redux/selectors/user'; import { doAuthenticate } from 'redux/actions/user'; import { version as appVersion } from 'package.json'; @@ -15,9 +14,7 @@ const select = (state) => ({ }); const perform = (dispatch) => ({ - setWelcomeVersion: (version) => dispatch(doSetWelcomeVersion(version || WELCOME_VERSION)), setShareDataInternal: (share) => dispatch(doSetDaemonSetting(DAEMON_SETTINGS.SHARE_USAGE_DATA, share)), - setShareDataThirdParty: (share) => dispatch(doToggle3PAnalytics(share)), signOut: () => dispatch(doSignOut()), authenticateIfSharingData: () => dispatch(doAuthenticate(appVersion, undefined, undefined, true, undefined, undefined, DOMAIN)), diff --git a/ui/component/privacyAgreement/view.jsx b/ui/component/privacyAgreement/view.jsx index d3350d861..b0d0715c8 100644 --- a/ui/component/privacyAgreement/view.jsx +++ b/ui/component/privacyAgreement/view.jsx @@ -12,42 +12,29 @@ const LIMITED = 'limited'; const NONE = 'none'; type Props = { - setWelcomeVersion: (number) => void, signOut: () => void, setShareDataInternal: (boolean) => void, - setShareDataThirdParty: (boolean) => void, authenticated: boolean, authenticateIfSharingData: () => void, handleNextPage: () => void, }; function PrivacyAgreement(props: Props) { - const { - setShareDataInternal, - setShareDataThirdParty, - authenticated, - signOut, - authenticateIfSharingData, - handleNextPage, - } = props; + const { setShareDataInternal, authenticated, signOut, authenticateIfSharingData, handleNextPage } = props; const [share, setShare] = useState(undefined); // preload function handleSubmit() { if (share === LIMITED) { setShareDataInternal(true); - setShareDataThirdParty(false); } else { setShareDataInternal(false); - setShareDataThirdParty(false); } if (share === LIMITED) { authenticateIfSharingData(); } - // setWelcomeVersion(WELCOME_VERSION); handleNextPage(); - // history.replace(`/`); } return (