IO-994 Generic user handling

client/src/components/email-overlay/email-overlay.container.jsx

@@ -16,9 +16,9 @@ import {
 } from "../../redux/user/user.selectors";
 import RenderTemplate from "../../utils/RenderTemplate";
 import { EmailSettings } from "../../utils/TemplateConstants";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import EmailOverlayComponent from "./email-overlay.component";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 
 const mapStateToProps = createStructuredSelector({
   modalVisible: selectEmailVisible,
@@ -48,7 +48,10 @@ export function EmailOverlayContainer({
       name: `${currentUser.displayName} @ ${bodyshop.shopname}`,
       address: EmailSettings.fromAddress,
     },
-    ReplyTo: { Email: currentUser.email, Name: currentUser.displayName },
+    ReplyTo: {
+      Email: currentUser.validemail ? currentUser.email : bodyshop.email,
+      Name: currentUser.displayName,
+    },
   };
 
   const handleFinish = async (values) => {

client/src/graphql/bodyshop.queries.js

@@ -19,6 +19,7 @@ export const QUERY_BODYSHOP = gql`
           authid
           email
           dashboardlayout
+          validemail
           employee {
             id
           }

client/src/redux/user/user.sagas.js

@@ -219,6 +219,13 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     );
 
     yield put(setAuthlevel(authRecord[0] ? authRecord[0].authlevel : 0));
+    yield put(
+      updateUserDetailsSuccess(
+        authRecord[0]
+          ? { validemail: authRecord[0].user.validemail }
+          : { validemail: false }
+      )
+    );
   } catch (error) {
     yield put(signInFailure(error.message));
   }