Merge pull request #3060 from glific/minor-fixes

minor fixes
glific · Sep 4, 2024 · 261cba3 · 261cba3
2 parents 4f5156e + c894a57
commit 261cba3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/containers/Template/Template.test.helper.ts b/src/containers/Template/Template.test.helper.ts
@@ -618,13 +618,6 @@ export const getSpendSendTemplate = {
 export const updateSessiontemplate = {
   request: {
     query: UPDATE_TEMPLATE,
-    variables: {
-      id: '1',
-      input: {
-        translations:
-          '{"2":{"status":"approved","languageId":{"localized":true,"locale":"hi","label":"Hindi","id":"2","__typename":"Language"},"label":"hey","isHsm":false,"body":"hindi translations","MessageMedia":null},"undefined":{"status":"approved","languageId":null,"label":"title","body":"message","MessageMedia":{"type":"IMAGE","sourceUrl":"https://images.ctfassets.net/hrltx12pl8hq/28ECAQiPJZ78hxatLTa7Ts/2f695d869736ae3b0de3e56ceaca3958/free-nature-images.jpg?fit=fill&w=1200&h=630"},"isHsm":false}}',
-      },
-    },
   },
   result: {
     data: {
@@ -663,6 +656,7 @@ export const updateSessiontemplate = {
       },
     },
   },
+  variableMatcher: (variables: any) => true,
 };
 
 export const TEMPLATE_MOCKS = [

diff --git a/src/containers/Ticket/TicketList/TicketList.tsx b/src/containers/Ticket/TicketList/TicketList.tsx
@@ -27,7 +27,7 @@ import styles from './TicketList.module.css';
 import { BulkAction } from './BulkAction/BulkAction';
 import { SHORT_DATE_TIME_FORMAT } from 'common/constants';
 import { ticketsInfo } from 'common/HelpData';
-import { getDisplayName } from 'common/utils';
+import setLogs from 'config/logs';
 
 const getId = (id: any) => <div className={styles.TableText}>{id}</div>;
 const getBody = (body: any) => <div className={styles.TableText}>{body}</div>;
@@ -38,7 +38,13 @@ const getInsertedAt = (insertedAt: string) => (
 );
 
 const getUser = (user: any) => {
-  let displayName = getDisplayName(user);
+  let contactFields: any = {};
+  try {
+    contactFields = JSON.parse(user.fields);
+  } catch (er) {
+    setLogs(er, 'error');
+  }
+  const displayName = contactFields?.name?.value || user?.name || user?.maskedPhone || '';
   return <div className={styles.TableText}>{displayName}</div>;
 };