From 0c84e6296e336f38e0bc2860af31c032d5c14e7a Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 13 Apr 2020 16:03:44 -0400
Subject: [PATCH] fix rewards verification for users that skipped it on first
 run

---
 ui/component/rewardAuthIntro/view.jsx |  2 +-
 ui/component/router/view.jsx          |  4 ++-
 ui/constants/pages.js                 |  1 +
 ui/page/auth/index.js                 | 13 --------
 ui/page/auth/view.jsx                 | 45 ---------------------------
 ui/page/rewardsVerify/index.js        |  4 +++
 ui/page/rewardsVerify/view.jsx        | 17 ++++++++++
 7 files changed, 26 insertions(+), 60 deletions(-)
 delete mode 100644 ui/page/auth/index.js
 delete mode 100644 ui/page/auth/view.jsx
 create mode 100644 ui/page/rewardsVerify/index.js
 create mode 100644 ui/page/rewardsVerify/view.jsx

diff --git a/ui/component/rewardAuthIntro/view.jsx b/ui/component/rewardAuthIntro/view.jsx
index ce7c86e69..314030a48 100644
--- a/ui/component/rewardAuthIntro/view.jsx
+++ b/ui/component/rewardAuthIntro/view.jsx
@@ -32,7 +32,7 @@ function RewardAuthIntro(props: Props) {
       actions={
         <Button
           button="primary"
-          navigate={`/$/${PAGES.AUTH}?redirect=/$/${PAGES.REWARDS}`}
+          navigate={`/$/${PAGES.REWARDS_VERIFY}?redirect=/$/${PAGES.REWARDS}`}
           label={__('Unlock Rewards')}
         />
       }
diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx
index 943e7e177..9b5a7b271 100644
--- a/ui/component/router/view.jsx
+++ b/ui/component/router/view.jsx
@@ -36,6 +36,7 @@ import EmbedWrapperPage from 'page/embedWrapper';
 import TopPage from 'page/top';
 import Welcome from 'page/welcome';
 import CreatorDashboard from 'page/creatorDashboard';
+import RewardsVerifyPage from 'page/rewardsVerify';
 import { parseURI } from 'lbry-redux';
 import { SITE_TITLE, WELCOME_VERSION } from 'config';
 
@@ -182,7 +183,8 @@ function AppRouter(props: Props) {
       <PrivateRoute {...props} path={`/$/${PAGES.CREATOR_DASHBOARD}`} component={CreatorDashboard} />
       <PrivateRoute {...props} path={`/$/${PAGES.PUBLISH}`} component={PublishPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.REPORT}`} component={ReportPage} />
-      <PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} component={RewardsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} exact component={RewardsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REWARDS_VERIFY}`} component={RewardsVerifyPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.TRANSACTIONS}`} component={TransactionHistoryPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={TagsFollowingManagePage} />
diff --git a/ui/constants/pages.js b/ui/constants/pages.js
index dd71323cc..79ca22e38 100644
--- a/ui/constants/pages.js
+++ b/ui/constants/pages.js
@@ -15,6 +15,7 @@ exports.PUBLISHED = 'published';
 exports.GET_CREDITS = 'getcredits';
 exports.REPORT = 'report';
 exports.REWARDS = 'rewards';
+exports.REWARDS_VERIFY = 'rewards/verify';
 exports.SEND = 'send';
 exports.SETTINGS = 'settings';
 exports.SHOW = 'show';
diff --git a/ui/page/auth/index.js b/ui/page/auth/index.js
deleted file mode 100644
index 7003846ed..000000000
--- a/ui/page/auth/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-import { selectEmailToVerify, selectUser } from 'lbryinc';
-import AuthPage from './view';
-
-const select = state => ({
-  email: selectEmailToVerify(state),
-  user: selectUser(state),
-});
-
-export default connect(
-  select,
-  null
-)(AuthPage);
diff --git a/ui/page/auth/view.jsx b/ui/page/auth/view.jsx
deleted file mode 100644
index d63ea6b78..000000000
--- a/ui/page/auth/view.jsx
+++ /dev/null
@@ -1,45 +0,0 @@
-// @flow
-import React from 'react';
-import UserEmail from 'component/userEmail';
-import UserVerify from 'component/userVerify';
-import Page from 'component/page';
-
-type Props = {
-  isPending: boolean,
-  email: string,
-  location: UrlLocation,
-  history: { push: string => void },
-  user: ?{
-    has_verified_email: boolean,
-    is_reward_approved: boolean,
-    is_identity_verified: boolean,
-  },
-};
-
-class AuthPage extends React.PureComponent<Props> {
-  componentDidMount() {
-    this.navigateIfAuthenticated(this.props);
-  }
-
-  componentDidUpdate() {
-    this.navigateIfAuthenticated(this.props);
-  }
-
-  navigateIfAuthenticated = (props: Props) => {
-    const { isPending, user, location, history } = props;
-    if (!isPending && user && user.has_verified_email && (user.is_reward_approved || user.is_identity_verified)) {
-      const { search } = location;
-      const urlParams = new URLSearchParams(search);
-      const redirectTo = urlParams.get('redirect');
-      const path = redirectTo ? `/$/${redirectTo}` : '/';
-      history.push(path);
-    }
-  };
-
-  render() {
-    const { user, email } = this.props;
-    return <Page>{user && email && user.has_verified_email ? <UserVerify /> : <UserEmail />}</Page>;
-  }
-}
-
-export default AuthPage;
diff --git a/ui/page/rewardsVerify/index.js b/ui/page/rewardsVerify/index.js
new file mode 100644
index 000000000..655381172
--- /dev/null
+++ b/ui/page/rewardsVerify/index.js
@@ -0,0 +1,4 @@
+import { connect } from 'react-redux';
+import AuthPage from './view';
+
+export default connect(null, null)(AuthPage);
diff --git a/ui/page/rewardsVerify/view.jsx b/ui/page/rewardsVerify/view.jsx
new file mode 100644
index 000000000..9443a2bf8
--- /dev/null
+++ b/ui/page/rewardsVerify/view.jsx
@@ -0,0 +1,17 @@
+// @flow
+import React from 'react';
+import UserVerify from 'component/userVerify';
+import Page from 'component/page';
+import { useHistory } from 'react-router-dom';
+
+function RewardsVerifyPage() {
+  const { goBack } = useHistory();
+
+  return (
+    <Page>
+      <UserVerify onSkip={() => goBack()} />
+    </Page>
+  );
+}
+
+export default RewardsVerifyPage;