diff --git a/ui/js/lbryio.js b/ui/js/lbryio.js index 475e9e7e2..8d785ee2a 100644 --- a/ui/js/lbryio.js +++ b/ui/js/lbryio.js @@ -136,7 +136,7 @@ lbryio.authenticate = function() { resolve({ id: 1, language: "en", - has_email: true, + primary_email: "disabled@lbry.io", has_verified_email: true, is_identity_verified: true, is_reward_approved: false, diff --git a/ui/js/page/auth/index.js b/ui/js/page/auth/index.js index 063c5aad6..541504dbb 100644 --- a/ui/js/page/auth/index.js +++ b/ui/js/page/auth/index.js @@ -4,7 +4,6 @@ import { connect } from "react-redux"; import { selectPathAfterAuth } from "selectors/app"; import { selectAuthenticationIsPending, - selectUserHasEmail, selectEmailToVerify, selectUserIsVerificationCandidate, selectUser, @@ -19,7 +18,6 @@ const select = state => ({ selectUserIsPending(state) || selectIdentityVerifyIsPending(state), email: selectEmailToVerify(state), - hasEmail: selectUserHasEmail(state), pathAfterAuth: selectPathAfterAuth(state), user: selectUser(state), isVerificationCandidate: selectUserIsVerificationCandidate(state), diff --git a/ui/js/page/auth/view.jsx b/ui/js/page/auth/view.jsx index 5e87dfbf6..b43c7298c 100644 --- a/ui/js/page/auth/view.jsx +++ b/ui/js/page/auth/view.jsx @@ -56,7 +56,7 @@ export class AuthPage extends React.PureComponent { } render() { - const { email, hasEmail, isPending } = this.props; + const { email, user, isPending } = this.props; return (
@@ -67,7 +67,7 @@ export class AuthPage extends React.PureComponent {
{!isPending && !email && - !hasEmail && + !user.has_verified_email &&

{__("Create a verified identity and receive LBC rewards.")}

} diff --git a/ui/js/page/help/index.js b/ui/js/page/help/index.js index 31bb1ed51..c3d4086a3 100644 --- a/ui/js/page/help/index.js +++ b/ui/js/page/help/index.js @@ -2,9 +2,14 @@ import React from "react"; import { doNavigate } from "actions/app"; import { connect } from "react-redux"; import HelpPage from "./view"; +import { selectUser } from "selectors/user"; + +const select = state => ({ + user: selectUser(state), +}); const perform = dispatch => ({ navigate: (path, params) => dispatch(doNavigate(path, params)), }); -export default connect(null, perform)(HelpPage); +export default connect(select, perform)(HelpPage); diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx index b8a59a619..0d2d42378 100644 --- a/ui/js/page/help/view.jsx +++ b/ui/js/page/help/view.jsx @@ -41,7 +41,7 @@ class HelpPage extends React.PureComponent { render() { let ver, osName, platform, newVerLink; - const { navigate } = this.props; + const { navigate, user } = this.props; if (this.state.versionInfo) { ver = this.state.versionInfo; @@ -136,16 +136,24 @@ class HelpPage extends React.PureComponent { ? - + + + + + - + - - + + diff --git a/ui/js/page/rewards/index.js b/ui/js/page/rewards/index.js index ce24ce6e7..8a7a29d98 100644 --- a/ui/js/page/rewards/index.js +++ b/ui/js/page/rewards/index.js @@ -5,11 +5,7 @@ import { selectFetchingRewards, selectRewards, } from "selectors/rewards"; -import { - selectUser, - selectUserHasEmail, - selectUserIsVerificationCandidate, -} from "selectors/user"; +import { selectUser } from "selectors/user"; import { doAuthNavigate, doNavigate } from "actions/app"; import { doRewardList } from "actions/rewards"; import rewards from "rewards"; diff --git a/ui/js/page/rewards/view.jsx b/ui/js/page/rewards/view.jsx index e590d5895..abb7a3879 100644 --- a/ui/js/page/rewards/view.jsx +++ b/ui/js/page/rewards/view.jsx @@ -73,7 +73,7 @@ class RewardsPage extends React.PureComponent { if ( user && - (!user.has_email || + (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) ) { diff --git a/ui/js/reducers/user.js b/ui/js/reducers/user.js index 6c624c053..4f78d3dc2 100644 --- a/ui/js/reducers/user.js +++ b/ui/js/reducers/user.js @@ -73,7 +73,7 @@ reducers[types.USER_EMAIL_NEW_STARTED] = function(state, action) { reducers[types.USER_EMAIL_NEW_SUCCESS] = function(state, action) { let user = Object.assign({}, state.user); - user.has_email = true; + user.primary_email = action.data.email; return Object.assign({}, state, { emailToVerify: action.data.email, emailNewIsPending: false, @@ -105,7 +105,7 @@ reducers[types.USER_EMAIL_VERIFY_STARTED] = function(state, action) { reducers[types.USER_EMAIL_VERIFY_SUCCESS] = function(state, action) { let user = Object.assign({}, state.user); - user.has_email = true; + user.primary_email = action.data.email; return Object.assign({}, state, { emailToVerify: "", emailVerifyIsPending: false, diff --git a/ui/js/selectors/user.js b/ui/js/selectors/user.js index 6ade78efe..55108d335 100644 --- a/ui/js/selectors/user.js +++ b/ui/js/selectors/user.js @@ -21,13 +21,7 @@ export const selectEmailToVerify = createSelector( export const selectUserEmail = createSelector( selectUser, - user => (user && user.email ? user.email : "fake@lbry.io") -); - -export const selectUserHasEmail = createSelector( - selectUser, - selectEmailToVerify, - (user, email) => (user && user.has_email) || !!email + user => (user ? user.primary_email : null) ); export const selectUserIsRewardApproved = createSelector( @@ -74,12 +68,3 @@ export const selectUserIsVerificationCandidate = createSelector( selectUser, user => user && (!user.has_verified_email || !user.is_identity_verified) ); - -export const selectUserIsAuthRequested = createSelector( - selectEmailNewDeclined, - selectAuthenticationIsPending, - selectUserIsVerificationCandidate, - selectUserHasEmail, - (isEmailDeclined, isPending, isVerificationCandidate, hasEmail) => - !isEmailDeclined && (isPending || !hasEmail || isVerificationCandidate) -);
{__("daemon (lbrynet)")}{__("App")}{this.state.uiVersion}
{__("Daemon (lbrynet)")} {ver.lbrynet_version}
{__("wallet (lbryum)")}{__("Wallet (lbryum)")} {ver.lbryum_version}
{__("interface")}{this.state.uiVersion}{__("Connected Email")} + {user && user.primary_email + ? user.primary_email + : {__("none")}} +
{__("Platform")}