From 12f121f0d86986ca085e1533de9d2e090c83af0d Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Tue, 2 May 2023 15:43:46 -0700 Subject: [PATCH 1/2] fix: Provide a default to name if name is not present --- app/javascript/dashboard/helper/messageHelper.js | 2 +- app/javascript/dashboard/helper/specs/messageHelper.spec.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascript/dashboard/helper/messageHelper.js b/app/javascript/dashboard/helper/messageHelper.js index 1ae9a9aff..eb2042066 100644 --- a/app/javascript/dashboard/helper/messageHelper.js +++ b/app/javascript/dashboard/helper/messageHelper.js @@ -8,7 +8,7 @@ export const replaceVariablesInMessage = ({ message, variables }) => { }; export const capitalizeName = name => { - return name.replace(/\b(\w)/g, s => s.toUpperCase()); + return (name || '').replace(/\b(\w)/g, s => s.toUpperCase()); }; const skipCodeBlocks = str => str.replace(/```(?:.|\n)+?```/g, ''); diff --git a/app/javascript/dashboard/helper/specs/messageHelper.spec.js b/app/javascript/dashboard/helper/specs/messageHelper.spec.js index c661c483b..5aa29f616 100644 --- a/app/javascript/dashboard/helper/specs/messageHelper.spec.js +++ b/app/javascript/dashboard/helper/specs/messageHelper.spec.js @@ -143,6 +143,9 @@ describe('#capitalizeName', () => { const string = 'john peter'; expect(capitalizeName(string)).toBe('John Peter'); }); + it('returns empty string if the name is null', () => { + expect(capitalizeName(null)).toBe(''); + }); it('capitalize first name if full name is passed', () => { const string = 'john Doe'; expect(capitalizeName(string)).toBe('John Doe'); From 257a29416659d5fb5e5837e8c7c1b2ea235aa275 Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Tue, 2 May 2023 15:47:06 -0700 Subject: [PATCH 2/2] Bump the version to 2.16.1 --- config/app.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.yml b/config/app.yml index 0f2cf1ff0..d142137c1 100644 --- a/config/app.yml +++ b/config/app.yml @@ -1,5 +1,5 @@ shared: &shared - version: '2.16.0' + version: '2.16.1' development: <<: *shared diff --git a/package.json b/package.json index 5ddcb9a1d..744af450e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatwoot/chatwoot", - "version": "2.16.0", + "version": "2.16.1", "license": "MIT", "scripts": { "eslint": "eslint app/**/*.{js,vue}",