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) => {