Merge branch 'master' into test-cases

glific · Apr 22, 2024 · f3e3e97 · f3e3e97
2 parents e40a9ca + 2d88278
commit f3e3e97
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/containers/Auth/Promotion/Promotion.tsx b/src/containers/Auth/Promotion/Promotion.tsx
@@ -28,7 +28,7 @@ export const Promotion = () => {
 
       {!minimized && (
         <>
-          <div className={styles.Image}>Glific payment timelines & late payment consequences</div>
+          <div className={styles.Image}>Glific payment timelines & late payment policy</div>
 
           <div className={styles.Points}>
             <div className={styles.BodyListText}>

diff --git a/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx b/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx
@@ -131,7 +131,6 @@ export const ChatInput = ({
         setAttachmentAdded(false);
         setAttachmentURL('');
         setAttachmentType('');
-        resetVariable();
       }
     },
   });
@@ -205,14 +204,13 @@ export const ChatInput = ({
         null,
         Number(selectedTemplate.id)
       );
-      resetVariable();
       // else the type will by default be text
     } else {
       onSendMessage(message, null, 'TEXT', selectedTemplate, variableParam);
-      resetVariable();
     }
 
     // Resetting the EditorState
+    resetVariable();
     editor.dispatchCommand(CLEAR_EDITOR_COMMAND, undefined);
     editor.focus();
   };
@@ -291,6 +289,8 @@ export const ChatInput = ({
   const handleCancel = () => {
     resetAttachment();
     resetVariable();
+    editor.dispatchCommand(CLEAR_EDITOR_COMMAND, undefined);
+    editor.focus();
   };
 
   const updateEditorState = (body: string) => {
@@ -486,10 +486,7 @@ export const ChatInput = ({
             <Tooltip title={t('Remove message')} placement="top">
               <IconButton
                 className={updatedEditorState ? styles.CrossIcon : styles.CrossIconWithVariable}
-                onClick={() => {
-                  resetVariable();
-                  resetAttachment();
-                }}
+                onClick={handleCancel}
               >
                 <CrossIcon />
               </IconButton>

diff --git a/src/containers/Chat/ChatMessages/ChatMessage/ChatMessage.module.css b/src/containers/Chat/ChatMessages/ChatMessage/ChatMessage.module.css
@@ -45,6 +45,9 @@
   max-width: 404px;
   float: right;
   clear: both;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
 }
 
 .MineColor {
@@ -156,6 +159,8 @@
   font-size: 10px;
   font-weight: 400;
   line-height: 17px;
+  text-align: end;
+  max-width: 284px;
 }
 
 .MessageDetailsSender {
@@ -232,6 +237,7 @@
 
 .InteractiveContent {
   padding: 0px !important;
+  min-width: 284px;
 }
 
 .Label {