diff --git a/ui/component/userSignIn/view.jsx b/ui/component/userSignIn/view.jsx index ed83c7706..a5c25e57c 100644 --- a/ui/component/userSignIn/view.jsx +++ b/ui/component/userSignIn/view.jsx @@ -64,6 +64,7 @@ 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); @@ -80,7 +81,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; + const showUserVerification = hasVerifiedEmail && !rewardsApproved && !isIdentityVerified; const showSyncPassword = syncEnabled && getSyncError; const showChannelCreation = hasVerifiedEmail && diff --git a/ui/page/rewards/view.jsx b/ui/page/rewards/view.jsx index 1c57c92f5..f1c8a4cd3 100644 --- a/ui/page/rewards/view.jsx +++ b/ui/page/rewards/view.jsx @@ -42,24 +42,32 @@ 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.')} -

-

{__('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!' - )}`} -

-
-
-
+ return ( + +

+ {__('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={ +
+
+ } + /> ); }