From cfd5d46802f75203d2993c7ae79ff3ffb54bcdc6 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 3 Jul 2020 13:16:54 -0400
Subject: [PATCH] rewards redirect fix for manually approved users

---
 ui/page/rewards/view.jsx       |  9 ++++++++-
 ui/page/rewardsVerify/index.js |  9 +++++++--
 ui/page/rewardsVerify/view.jsx | 14 +++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ui/page/rewards/view.jsx b/ui/page/rewards/view.jsx
index d6f2b1a6d..8856660cc 100644
--- a/ui/page/rewards/view.jsx
+++ b/ui/page/rewards/view.jsx
@@ -32,8 +32,15 @@ type Props = {
 
 class RewardsPage extends PureComponent<Props> {
   componentDidMount() {
-    this.props.fetchRewards();
+    const { user, fetchUser, fetchRewards } = this.props;
+    const rewardsApproved = user && user.is_reward_approved;
+
+    fetchRewards();
+    if (!rewardsApproved) {
+      fetchUser();
+    }
   }
+
   renderPageHeader() {
     const { user, daemonSettings, fetchUser } = this.props;
     const rewardsEnabled = IS_WEB || (daemonSettings && daemonSettings.share_usage_data);
diff --git a/ui/page/rewardsVerify/index.js b/ui/page/rewardsVerify/index.js
index 655381172..132b260ae 100644
--- a/ui/page/rewardsVerify/index.js
+++ b/ui/page/rewardsVerify/index.js
@@ -1,4 +1,9 @@
 import { connect } from 'react-redux';
-import AuthPage from './view';
+import { selectUser } from 'redux/selectors/user';
+import RewardsVerifyPage from './view';
 
-export default connect(null, null)(AuthPage);
+const select = state => ({
+  user: selectUser(state),
+});
+
+export default connect(select, null)(RewardsVerifyPage);
diff --git a/ui/page/rewardsVerify/view.jsx b/ui/page/rewardsVerify/view.jsx
index 9443a2bf8..772096104 100644
--- a/ui/page/rewardsVerify/view.jsx
+++ b/ui/page/rewardsVerify/view.jsx
@@ -4,8 +4,20 @@ import UserVerify from 'component/userVerify';
 import Page from 'component/page';
 import { useHistory } from 'react-router-dom';
 
-function RewardsVerifyPage() {
+type Props = {
+  user: ?User,
+};
+
+function RewardsVerifyPage(props: Props) {
+  const { user } = props;
   const { goBack } = useHistory();
+  const rewardsApproved = user && user.is_reward_approved;
+
+  React.useEffect(() => {
+    if (rewardsApproved) {
+      goBack();
+    }
+  }, [rewardsApproved]);
 
   return (
     <Page>