From 41186cd7cbe589e7423ec42ba73c328c4bfe6b48 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 13 Mar 2020 21:16:19 -0400 Subject: [PATCH] Revert "only show reward intro for non identity_verified users" This reverts commit 300b0c7c955e34d647b29ac9ff16813bf50c76bb. --- ui/component/userSignIn/view.jsx | 3 +-- ui/page/rewards/view.jsx | 40 +++++++++++++------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/ui/component/userSignIn/view.jsx b/ui/component/userSignIn/view.jsx index a5c25e57c..ed83c7706 100644 --- a/ui/component/userSignIn/view.jsx +++ b/ui/component/userSignIn/view.jsx @@ -64,7 +64,6 @@ function UserSignIn(props: Props) { const [hasSeenFollowList, setHasSeenFollowList] = usePersistedState('channel-follow-intro', false); const hasVerifiedEmail = user && user.has_verified_email; const rewardsApproved = user && user.is_reward_approved; - const isIdentityVerified = user && user.is_identity_verified; const hasFetchedReward = useFetched(claimingReward); const channelCount = channels ? channels.length : 0; 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 const showEmail = !emailToVerify && !hasVerifiedEmail; const showEmailVerification = emailToVerify && !hasVerifiedEmail; - const showUserVerification = hasVerifiedEmail && !rewardsApproved && !isIdentityVerified; + const showUserVerification = hasVerifiedEmail && !rewardsApproved; const showSyncPassword = syncEnabled && getSyncError; const showChannelCreation = hasVerifiedEmail && diff --git a/ui/page/rewards/view.jsx b/ui/page/rewards/view.jsx index f1c8a4cd3..1c57c92f5 100644 --- a/ui/page/rewards/view.jsx +++ b/ui/page/rewards/view.jsx @@ -42,32 +42,24 @@ class RewardsPage extends PureComponent { if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) { return ; } - return ( - -

- {__('This account must undergo review before you can participate in the rewards program.')}{' '} - {__('This can take anywhere from several minutes to several days.')} -

+
+

+ {__('This account must undergo review before you can participate in the rewards program.')}{' '} + {__('This can take anywhere from several minutes to several days.')} +

-

{__('We apologize for this inconvenience, but have added this additional step to prevent fraud.')}

-

- {`${__('If you continue to see this message, send us an email to help@lbry.com.')} ${__( - 'Please enjoy free content in the meantime!' - )}`} -

- - } - actions={ -
-
- } - /> +

{__('We apologize for this inconvenience, but have added this additional step to prevent fraud.')}

+

+ {`${__('If you continue to see this message, send us an email to help@lbry.com.')} ${__( + 'Please enjoy free content in the meantime!' + )}`} +

+
+
+
); }