Revert "only show reward intro for non identity_verified users"
This reverts commit 300b0c7c95
.
This commit is contained in:
parent
80f24edcb3
commit
41186cd7cb
2 changed files with 17 additions and 26 deletions
|
@ -64,7 +64,6 @@ function UserSignIn(props: Props) {
|
||||||
const [hasSeenFollowList, setHasSeenFollowList] = usePersistedState('channel-follow-intro', false);
|
const [hasSeenFollowList, setHasSeenFollowList] = usePersistedState('channel-follow-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 hasFetchedReward = useFetched(claimingReward);
|
const hasFetchedReward = useFetched(claimingReward);
|
||||||
const channelCount = channels ? channels.length : 0;
|
const channelCount = channels ? channels.length : 0;
|
||||||
const hasClaimedEmailAward = claimedRewards.some(reward => reward.reward_type === REWARDS.TYPE_CONFIRM_EMAIL);
|
const hasClaimedEmailAward = claimedRewards.some(reward => reward.reward_type === REWARDS.TYPE_CONFIRM_EMAIL);
|
||||||
|
@ -81,7 +80,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;
|
const showUserVerification = hasVerifiedEmail && !rewardsApproved;
|
||||||
const showSyncPassword = syncEnabled && getSyncError;
|
const showSyncPassword = syncEnabled && getSyncError;
|
||||||
const showChannelCreation =
|
const showChannelCreation =
|
||||||
hasVerifiedEmail &&
|
hasVerifiedEmail &&
|
||||||
|
|
|
@ -42,12 +42,8 @@ class RewardsPage extends PureComponent<Props> {
|
||||||
if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
|
if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
|
||||||
return <RewardAuthIntro />;
|
return <RewardAuthIntro />;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card
|
<section className="card card--section">
|
||||||
title={__('Reward Validation Pending')}
|
|
||||||
body={
|
|
||||||
<React.Fragment>
|
|
||||||
<p>
|
<p>
|
||||||
{__('This account must undergo review before you can participate in the rewards program.')}{' '}
|
{__('This account must undergo review before you can participate in the rewards program.')}{' '}
|
||||||
{__('This can take anywhere from several minutes to several days.')}
|
{__('This can take anywhere from several minutes to several days.')}
|
||||||
|
@ -59,15 +55,11 @@ class RewardsPage extends PureComponent<Props> {
|
||||||
'Please enjoy free content in the meantime!'
|
'Please enjoy free content in the meantime!'
|
||||||
)}`}
|
)}`}
|
||||||
</p>
|
</p>
|
||||||
</React.Fragment>
|
<div className="card__actions">
|
||||||
}
|
|
||||||
actions={
|
|
||||||
<div className="section__actions">
|
|
||||||
<Button navigate="/" button="primary" label="Return Home" />
|
<Button navigate="/" button="primary" label="Return Home" />
|
||||||
<Button onClick={() => fetchUser()} button="link" label="Refresh" />
|
<Button onClick={() => fetchUser()} button="link" label="Refresh" />
|
||||||
</div>
|
</div>
|
||||||
}
|
</section>
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue