From 2bf73eb961d42ed61af7db4a226a95c6e2ece26b Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 14 Sep 2018 11:28:34 -0400
Subject: [PATCH] update state if user data changed

---
 app/src/page/rewards/view.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/page/rewards/view.js b/app/src/page/rewards/view.js
index 38bc67e..3ab6011 100644
--- a/app/src/page/rewards/view.js
+++ b/app/src/page/rewards/view.js
@@ -35,20 +35,22 @@ class RewardsPage extends React.PureComponent {
   }
 
   componentWillReceiveProps(nextProps) {
-    const { emailVerifyErrorMessage, emailVerifyPending } = nextProps;
+    const { emailVerifyErrorMessage, emailVerifyPending, user } = nextProps;
     if (emailVerifyPending) {
       this.setState({ verifyRequestStarted: true });
     }
 
     if (this.state.verifyRequestStarted && !emailVerifyPending) {
-      const { user } = nextProps;
       this.setState({ verifyRequestStarted: false });
       if (!emailVerifyErrorMessage) {
         this.setState({ isEmailVerified: true });
       }
+    }
 
-      // update other checks regardless of email verify result (due to fetching user data)
+    if (user) {
+      // update other checks (if new user data has been retrieved)
       this.setState({
+        isEmailVerified: (user && user.primary_email && user.has_verified_email)
         isIdentityVerified: (user && user.is_identity_verified),
         isRewardApproved: (user && user.is_reward_approved)
       });