diff --git a/ui/js/component/app/index.js b/ui/js/component/app/index.js
index ff4940f88..41f79393e 100644
--- a/ui/js/component/app/index.js
+++ b/ui/js/component/app/index.js
@@ -9,28 +9,15 @@ import {
} from "actions/app";
import { doUpdateBalance } from "actions/wallet";
import { selectWelcomeModalAcknowledged } from "selectors/app";
-import rewards from "rewards";
-import {
- selectFetchingRewards,
- makeSelectHasClaimedReward,
-} from "selectors/rewards";
import { selectUser } from "selectors/user";
import App from "./view";
import * as modals from "constants/modal_types";
-const select = (state, props) => {
- const selectHasClaimed = makeSelectHasClaimedReward();
-
- return {
- modal: selectCurrentModal(state),
- isWelcomeAcknowledged: selectWelcomeModalAcknowledged(state),
- isFetchingRewards: selectFetchingRewards(state),
- isWelcomeRewardClaimed: selectHasClaimed(state, {
- reward_type: rewards.TYPE_NEW_USER,
- }),
- user: selectUser(state),
- };
-};
+const select = (state, props) => ({
+ modal: selectCurrentModal(state),
+ isWelcomeAcknowledged: selectWelcomeModalAcknowledged(state),
+ user: selectUser(state),
+});
const perform = dispatch => ({
alertError: errorList => dispatch(doAlertError(errorList)),
diff --git a/ui/js/component/app/view.jsx b/ui/js/component/app/view.jsx
index e364c0db0..4d875dd54 100644
--- a/ui/js/component/app/view.jsx
+++ b/ui/js/component/app/view.jsx
@@ -38,18 +38,13 @@ class App extends React.PureComponent {
}
showWelcome(props) {
- const {
- isFetchingRewards,
- isWelcomeAcknowledged,
- isWelcomeRewardClaimed,
- openWelcomeModal,
- user,
- } = props;
+ const { isWelcomeAcknowledged, openWelcomeModal, user } = props;
if (
!isWelcomeAcknowledged &&
user &&
- (isFetchingRewards === false && isWelcomeRewardClaimed === false)
+ !user.is_reward_approved &&
+ !user.is_identity_verified
) {
openWelcomeModal();
}
diff --git a/ui/js/component/cardVerify/view.jsx b/ui/js/component/cardVerify/view.jsx
index 0bc17507b..0432a69e1 100644
--- a/ui/js/component/cardVerify/view.jsx
+++ b/ui/js/component/cardVerify/view.jsx
@@ -167,6 +167,7 @@ class CardVerify extends React.Component {
- {__("You earned a reward of")}
- {" "}
{__(
- "This reward will show in your Wallet momentarily, shown in the top right, probably while you are reading this message."
+ "This reward will show in your Wallet in the top right momentarily (if it hasn't already)."
)}
{__(
- "LBC is used to compensate creators, to publish, and to have say in how the network works."
+ "These credits are used to compensate creators, to publish your own content, and to have say in how the network works."
)}
@@ -38,7 +37,7 @@ class ModalFirstReward extends React.PureComponent {
{__(
- "Finally, pleaseh know that LBRY is an early beta and that it earns the name."
+ "Finally, please know that LBRY is an early beta and that it earns the name."
)}
- {__(
- "Using LBRY is like dating a centaur. Totally normal up top, and"
- )}
- {" "}{__("way different")} {__("underneath.")}
- {__("Up top, LBRY is similar to popular media sites.")}
- {__(
- "Below, LBRY is controlled by users -- you -- via blockchain and decentralization."
- )}
-
- {__("Please have")} {" "}
- {reward &&
-
+ {__(
+ "Using LBRY is like dating a centaur. Totally normal up top, and"
+ )}
+ {" "}{__("way different")} {__("underneath.")}
+ {__("Up top, LBRY is similar to popular media sites.")}
+ {__(
+ "Below, LBRY is controlled by users -- you -- via blockchain and decentralization."
+ )}
+
+ The LBRY network is controlled and powered by credits called{" "}
+ LBC, a blockchain asset.
+
+ {__("New patrons receive ")} {" "}
+ {totalRewardValue
+ ?
+ {__(
+ "You'll also earn weekly bonuses for checking out the greatest new stuff."
+ )}
+ {__("About Your Reward")}
+ {__("Your First Reward")}
{__("Welcome to LBRY.")}
- {__("Welcome to LBRY")}
+ {__("Claim Your Credits")}
+
- {__("Check your email for a verification code. Email")}{" "} + {__("Email")}{" "} {" "} - {__("if you did not receive or are having trouble with your code.")} + {__("if you encounter any trouble with your code.")}
- Please link a credit card to confirm your identity and receive{" "}
- {reward
- ?
{__("This is to prevent abuse. You will not be charged.")}
++ {__( + "To ensure you are a real and unique person, you must link a valid credit or debit card." + )} +
++ {__( + "A small authorization, but no actual charge, will be run on this card." + )} +
{errorMessage &&{errorMessage}
}