LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Revert "skip rewards validation on future sign ins if user clicks 'skip' button"

Browse source 
This reverts commit 8a73cdbc0b.
This commit is contained in:
Sean Yesmunt 2020-03-13 21:16:19 -04:00
parent 02a3a02947
commit 80f24edcb3
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/component/userSignIn/view.jsx
View file

@ -62,7 +62,6 @@ function UserSignIn(props: Props) {
const shouldRedirectImmediately = urlParams.get('immediate'); const shouldRedirectImmediately = urlParams.get('immediate');
const [initialSignInStep, setInitialSignInStep] = React.useState(); const [initialSignInStep, setInitialSignInStep] = React.useState();
const [hasSeenFollowList, setHasSeenFollowList] = usePersistedState('channel-follow-intro', false); const [hasSeenFollowList, setHasSeenFollowList] = usePersistedState('channel-follow-intro', false);
const [hasSkippedRewards, setHasSkippedRewards] = usePersistedState('skip-rewards-intro', false);
const hasVerifiedEmail = user && user.has_verified_email; const hasVerifiedEmail = user && user.has_verified_email;
const rewardsApproved = user && user.is_reward_approved; const rewardsApproved = user && user.is_reward_approved;
const isIdentityVerified = user && user.is_identity_verified; const isIdentityVerified = user && user.is_identity_verified;
@ -82,7 +81,7 @@ function UserSignIn(props: Props) {
// The possible screens for the sign in flow // The possible screens for the sign in flow
const showEmail = !emailToVerify && !hasVerifiedEmail; const showEmail = !emailToVerify && !hasVerifiedEmail;
const showEmailVerification = emailToVerify && !hasVerifiedEmail; const showEmailVerification = emailToVerify && !hasVerifiedEmail;
const showUserVerification = hasVerifiedEmail && !rewardsApproved && !isIdentityVerified && !hasSkippedRewards; const showUserVerification = hasVerifiedEmail && !rewardsApproved && !isIdentityVerified;
const showSyncPassword = syncEnabled && getSyncError; const showSyncPassword = syncEnabled && getSyncError;
const showChannelCreation = const showChannelCreation =
hasVerifiedEmail && hasVerifiedEmail &&
@ -120,7 +119,7 @@ function UserSignIn(props: Props) {
const SIGN_IN_FLOW = [ const SIGN_IN_FLOW = [
showEmail && <UserEmailNew />, showEmail && <UserEmailNew />,
showEmailVerification && <UserEmailVerify />, showEmailVerification && <UserEmailVerify />,
showUserVerification && <UserVerify skipLink={redirect} onSkip={() => setHasSkippedRewards(true)} />, showUserVerification && <UserVerify skipLink={redirect} />,
showChannelCreation && <UserFirstChannel />, showChannelCreation && <UserFirstChannel />,
showFollowIntro && ( showFollowIntro && (
<UserChannelFollowIntro <UserChannelFollowIntro

12
ui/component/userVerify/view.jsx
View file

@ -14,7 +14,6 @@ type Props = {
verifyPhone: () => void, verifyPhone: () => void,
fetchUser: () => void, fetchUser: () => void,
skipLink?: string, skipLink?: string,
onSkip: () => void,
}; };
class UserVerify extends React.PureComponent<Props> { class UserVerify extends React.PureComponent<Props> {
@ -29,12 +28,7 @@ class UserVerify extends React.PureComponent<Props> {
} }
render() { render() {
const { errorMessage, isPending, verifyPhone, fetchUser, skipLink, onSkip } = this.props; const { errorMessage, isPending, verifyPhone, fetchUser, skipLink } = this.props;
const skipButtonProps = {
onClick: onSkip,
navigate: skipLink || '/',
};
return ( return (
<React.Fragment> <React.Fragment>
<section className="section__header"> <section className="section__header">
@ -51,7 +45,7 @@ class UserVerify extends React.PureComponent<Props> {
to be validated. to be validated.
</I18nMessage>{' '} </I18nMessage>{' '}
<Button onClick={() => fetchUser()} button="link" label={__('Refresh')} /> {'or'}{' '} <Button onClick={() => fetchUser()} button="link" label={__('Refresh')} /> {'or'}{' '}
<Button {...skipButtonProps} button="link" label={__('Skip')} />. <Button navigate={skipLink || '/'} button="link" label={__('Skip')} />.
</p> </p>
<p>{__('This step is not required to use LBRY, and not all users or regions may qualify.')}</p> <p>{__('This step is not required to use LBRY, and not all users or regions may qualify.')}</p>
</section> </section>
@ -138,7 +132,7 @@ class UserVerify extends React.PureComponent<Props> {
subtitle={__('Rewards validation is optional.')} subtitle={__('Rewards validation is optional.')}
actions={ actions={
<Fragment> <Fragment>
<Button {...skipButtonProps} button="primary" label={__('Continue Without Rewards')} /> <Button navigate={skipLink || '/'} button="primary" label={__('Continue Without Rewards')} />
</Fragment> </Fragment>
} }
/> />

14
ui/effects/use-persisted-state.js
View file

@ -1,4 +1,4 @@
import { useState } from 'react'; import { useState, useEffect } from 'react';
export default function usePersistedState(key, firstTimeDefault) { export default function usePersistedState(key, firstTimeDefault) {
// If no key is passed in, act as a normal `useState` // If no key is passed in, act as a normal `useState`
@ -32,13 +32,11 @@ export default function usePersistedState(key, firstTimeDefault) {
const [value, setValue] = useState(defaultValue); const [value, setValue] = useState(defaultValue);
function setValueAndLocalStorage(newValue) { useEffect(() => {
if (key && localStorageAvailable && value !== newValue) { if (key && localStorageAvailable) {
localStorage.setItem(key, typeof newValue === 'object' ? JSON.stringify(newValue) : newValue); localStorage.setItem(key, typeof value === 'object' ? JSON.stringify(value) : value);
} }
}, [key, value]);
setValue(newValue); return [value, setValue];
}
return [value, setValueAndLocalStorage];
} }