iron out auth issues

ui/js/actions/app.js

@@ -12,7 +12,6 @@ import {
 import { doSearch } from "actions/search";
 import { doFetchDaemonSettings } from "actions/settings";
 import { doAuthenticate } from "actions/user";
-import { doRewardList } from "actions/rewards";
 import { doFileList } from "actions/file_info";
 
 const { remote, ipcRenderer, shell } = require("electron");

ui/js/actions/rewards.js

@@ -1,8 +1,7 @@
 import * as types from "constants/action_types";
-import lbry from "lbry";
 import lbryio from "lbryio";
 import rewards from "rewards";
-import { selectRewards, selectRewardsByType } from "selectors/rewards";
+import { selectRewardsByType } from "selectors/rewards";
 
 export function doRewardList() {
   return function(dispatch, getState) {

ui/js/actions/user.js

@@ -16,8 +16,6 @@ export function doAuthenticate() {
           type: types.AUTHENTICATION_SUCCESS,
           data: { user },
         });
-
-        dispatch(doRewardList()); //FIXME - where should this happen?
       })
       .catch(error => {
         dispatch({
@@ -36,6 +34,8 @@ export function doUserFetch() {
     lbryio
       .getCurrentUser()
       .then(user => {
+        dispatch(doRewardList());
+
         dispatch({
           type: types.USER_FETCH_SUCCESS,
           data: { user },

ui/js/component/authOverlay/view.jsx

@@ -3,6 +3,7 @@ import lbryio from "lbryio.js";
 import ModalPage from "component/modal-page.js";
 import Auth from "component/auth";
 import Link from "component/link";
+import { getLocal, setLocal } from "utils";
 
 export class AuthOverlay extends React.PureComponent {
   constructor(props) {
@@ -14,7 +15,12 @@ export class AuthOverlay extends React.PureComponent {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.isShowing && !this.props.isPending && !nextProps.isShowing) {
+    if (
+      this.props.isShowing &&
+      !this.props.isPending &&
+      !nextProps.isShowing /* && !getLocal("welcome_screen_shown")*/
+    ) {
+      setLocal("welcome_screen_shown", true);
       setTimeout(() => this.props.openWelcomeModal(), 1);
     }
   }

ui/js/selectors/user.js

@@ -25,7 +25,7 @@ export const selectEmailToVerify = createSelector(
 export const selectUserHasEmail = createSelector(
   selectUser,
   selectEmailToVerify,
-  (user, email) => (user && user.has_email) || email
+  (user, email) => (user && user.has_email) || !!email
 );
 
 export const selectUserIsRewardEligible = createSelector(
@@ -64,11 +64,8 @@ export const selectEmailVerifyErrorMessage = createSelector(
 );
 
 export const selectUserIsVerificationCandidate = createSelector(
-  selectUserIsRewardEligible,
-  selectUserIsRewardApproved,
-  selectEmailToVerify,
   selectUser,
-  (isEligible, isApproved, emailToVerify, user) => emailToVerify && user
+  user => user && !user.has_verified_email
 );
 
 export const selectUserIsAuthRequested = createSelector(

ui/js/store.js

@@ -77,7 +77,7 @@ if (env === "development") {
   middleware.push(logger);
 }
 
-middleware.push(createActionBuffer(REHYDRATE));
+// middleware.push(createActionBuffer(REHYDRATE)); // was causing issues with authentication reducers not firing
 
 const createStoreWithMiddleware = redux.compose(
   autoRehydrate(),