From 7374b147b064619fb40ec6da76a85ed59666c384 Mon Sep 17 00:00:00 2001
From: umayanga <umayangag@gmail.com>
Date: Mon, 1 Jun 2020 15:29:08 +0530
Subject: [PATCH 1/2] log image changes

---
 frontend/src/app/Logo/index.js                          | 5 ++---
 frontend/src/guest-view/components/GuestIncidentForm.js | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/Logo/index.js b/frontend/src/app/Logo/index.js
index 7bf467c..3fe30cc 100644
--- a/frontend/src/app/Logo/index.js
+++ b/frontend/src/app/Logo/index.js
@@ -4,15 +4,14 @@ import { Link } from "react-router-dom";
 
 import ECLogo from "../../static/img/ps-logo.jpg";
 import "./Logo.css";
-// import {API_BASE_URL} from '../../config';
+import {API_BASE_URL} from '../../config';
 
 function Logo(props) {
   return (
     <div className="logo-container">
       <Link to="/">
         <img
-          // src={props.image? API_BASE_URL+"/media/"+props.image:ECLogo}
-          src={ECLogo}
+          src={props.image? API_BASE_URL+"/media/"+props.image:ECLogo}
           alt="logo"
           style={{
             maxWidth: props.maxWidth,
diff --git a/frontend/src/guest-view/components/GuestIncidentForm.js b/frontend/src/guest-view/components/GuestIncidentForm.js
index f64f28c..2644c9e 100644
--- a/frontend/src/guest-view/components/GuestIncidentForm.js
+++ b/frontend/src/guest-view/components/GuestIncidentForm.js
@@ -121,7 +121,7 @@ const VerticalLinearStepper = (props) => {
     dispatch(fetchCategories());
     dispatch(fetchChannels());
     dispatch(fetchDistricts());
-    // dispatch(loadOrganization(queryParams.organization ? queryParams.organization : 1));
+    dispatch(loadOrganization(queryParams.organization ? queryParams.organization : 1));
   }, []);
 
   const { formatMessage: f } = useIntl();
@@ -902,7 +902,7 @@ const VerticalLinearStepper = (props) => {
                 recipientMobile: incidentContact.recipientMobile,
                 recipientEmail: incidentContact.recipientEmail,
                 recipientTitle: recipientTitle,
-                // organizationId: queryParams.organization,
+                organizationId: queryParams.organization,
               };
               const dateTime = getFormattedDateTime();
               if (dateTime) {
@@ -1144,14 +1144,14 @@ const VerticalLinearStepper = (props) => {
 
   const isLoading = isLoadingIncident || isLoadingMetaData;
   // const organization = useSelector((state) => state.guestView.organization);
+    const organization={logo:null};
 
   return (
     <div className={classes.root}>
       <Grid container spacing={24}>
         <Grid item xs={12} sm={6}>
           <Grid item xs={12} sm={6}>
-            {/* <Logo image={organization ? organization.logo : null} /> */}
-            <Logo />
+             <Logo image={organization ? organization.logo : null} />
           </Grid>
         </Grid>
 

From afd7a983fa3fe32ed160088cffbd0003631ff983 Mon Sep 17 00:00:00 2001
From: umayanga <umayangag@gmail.com>
Date: Mon, 1 Jun 2020 16:02:54 +0530
Subject: [PATCH 2/2] organization state hook fix

---
 frontend/src/guest-view/components/GuestIncidentForm.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/guest-view/components/GuestIncidentForm.js b/frontend/src/guest-view/components/GuestIncidentForm.js
index 2644c9e..a1b800c 100644
--- a/frontend/src/guest-view/components/GuestIncidentForm.js
+++ b/frontend/src/guest-view/components/GuestIncidentForm.js
@@ -130,6 +130,7 @@ const VerticalLinearStepper = (props) => {
   const { elections, categories, channels, districts } = useSelector(
     (state) => state.shared
   );
+    const organization = useSelector((state) => state.guestView.organization);
 
   function removeDuplicates(originalArray, prop) {
     var newArray = [];
@@ -1143,8 +1144,6 @@ const VerticalLinearStepper = (props) => {
   }
 
   const isLoading = isLoadingIncident || isLoadingMetaData;
-  // const organization = useSelector((state) => state.guestView.organization);
-    const organization={logo:null};
 
   return (
     <div className={classes.root}>