Merge pull request #547 from glific/session-expiry

Session expiry
glific · Sep 30, 2020 · e7e7be2 · e7e7be2
2 parents 7f736f0 + 27d9457
commit e7e7be2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/src/components/UI/Timer/Timer.tsx b/src/components/UI/Timer/Timer.tsx
@@ -7,6 +7,7 @@ import styles from './Timer.module.css';
 export interface TimerProps {
   time: any;
   contactStatus?: string;
+  contactProviderStatus?: string;
 }
 
 export const Timer: React.FC<TimerProps> = (props: TimerProps) => {
@@ -36,7 +37,10 @@ export const Timer: React.FC<TimerProps> = (props: TimerProps) => {
     hours = '0' + hours.toString();
   }
 
-  if (props.contactStatus && props.contactStatus === 'INVALID') {
+  if (
+    (props.contactStatus && props.contactStatus === 'INVALID') ||
+    props.contactProviderStatus === 'NONE'
+  ) {
     return <ContactOptOutIcon />;
   }
 

diff --git a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx
@@ -15,6 +15,7 @@ export interface ChatConversationProps {
   contactId: number;
   contactName: string;
   contactStatus: string;
+  contactProviderStatus: string;
   selected: boolean;
   senderLastMessage: any;
   onClick: (i: any) => void;
@@ -106,7 +107,11 @@ const ChatConversation: React.SFC<ChatConversationProps> = (props) => {
       <div>
         <div className={chatBubble.join(' ')} />
         <div className={styles.Timer}>
-          <Timer time={props.senderLastMessage} contactStatus={props.contactStatus} />
+          <Timer
+            time={props.senderLastMessage}
+            contactStatus={props.contactStatus}
+            contactProviderStatus={props.contactProviderStatus}
+          />
         </div>
       </div>
       <div className={chatInfoClass.join(' ')}>

diff --git a/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx b/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx
@@ -121,6 +121,7 @@ export const ConversationList: React.SFC<ConversationListProps> = (props) => {
           lastMessage={lastMessage}
           senderLastMessage={conversation.contact.lastMessageAt}
           contactStatus={conversation.contact.status}
+          contactProviderStatus={conversation.contact.providerStatus}
         />
       );
     });

diff --git a/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx b/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx
@@ -97,7 +97,10 @@ export const ChatInput: React.SFC<ChatInputProps> = (props) => {
     }
   }
 
-  if (props.contactStatus && props.contactStatus === 'INVALID') {
+  if (
+    (props.contactStatus && props.contactStatus === 'INVALID') ||
+    props.contactProviderStatus === 'NONE'
+  ) {
     return (
       <div className={styles.ContactOptOutMessage}>
         Sorry, chat is unavailable with this contact at this moment because they aren’t opted in to

diff --git a/src/containers/Chat/ChatMessages/ContactBar/ContactBar.tsx b/src/containers/Chat/ChatMessages/ContactBar/ContactBar.tsx
@@ -309,7 +309,11 @@ export const ContactBar: React.SFC<ContactBarProps> = (props) => {
     <div className={styles.Container}>
       <div className={styles.SessionTimer} data-testid="sessionTimer">
         <span>Session Timer</span>
-        <Timer time={props.lastMessageTime} contactStatus={props.contactStatus} />
+        <Timer
+          time={props.lastMessageTime}
+          contactStatus={props.contactStatus}
+          contactProviderStatus={props.contactProviderStatus}
+        />
       </div>
       <div>
         {assignedToGroup ? (
@@ -328,7 +332,6 @@ export const ContactBar: React.SFC<ContactBarProps> = (props) => {
           <Typography className={styles.Title} variant="h6" noWrap data-testid="beneficiaryName">
             {props.contactName}
           </Typography>
-
           <ClickAwayListener onClickAway={() => setAnchorEl(null)}>
             <div className={styles.Configure}>
               <DropdownIcon onClick={handleConfigureIconClick} />