fix: chips should show organization or region name

gwynndp · Mar 19, 2022 · cd4aa48 · cd4aa48
1 parent 5c999e0
commit cd4aa48
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/components/Messaging/AnnounceMessage.js b/src/components/Messaging/AnnounceMessage.js
@@ -79,9 +79,10 @@ const AnnounceMessageForm = ({ setToggleAnnounceMessage }) => {
   const handleChange = (e) => {
     setErrors(null);
     const { name, value } = e.target;
+    console.log(name, value, String.toString(value));
     setValues({
       ...values,
-      [name]: value,
+      [name]: `${value}`,
     });
   };
 

diff --git a/src/components/Messaging/MessageBody.js b/src/components/Messaging/MessageBody.js
@@ -388,11 +388,19 @@ const SenderInformation = ({
               <b>DATE:</b> {dateFormat(message?.composed_at, 'yyyy/mm/dd')}
             </Typography>
             {message?.bulk_message_recipients &&
-              message?.bulk_message_recipients.map((recipient, i) => (
+              message.bulk_message_recipients.map((recipient, i) => (
                 <Chip
-                  key={`${recipient.recipient}-${i}`}
-                  label={`${recipient.recipient}`}
-                  color={recipient.type === 'region' ? 'secondary' : 'primary'}
+                  key={`${
+                    recipient.organization
+                      ? recipient.organization
+                      : recipient.region
+                  }-${i}`}
+                  label={`${
+                    recipient.organization
+                      ? recipient.organization
+                      : recipient.region
+                  }`}
+                  color="primary"
                   style={{
                     color: 'white',
                     borderRadius: '6px',