Merge branch 'main' into BN-71

Author: rahu1ramesh

src/components/clinical/consultationPad/__tests__/ConsultationPad.integration.test.tsx

@@ -60,7 +60,7 @@ import { NotificationProvider } from '@providers/NotificationProvider';
 import { ClinicalConfigProvider } from '@providers/ClinicalConfigProvider';
 import * as locationService from '@services/locationService';
 import * as encounterConceptsService from '@services/encounterConceptsService';
-import * as practitionerService from '@/services/providerService';
+import * as practitionerService from '@services/providerService';
 import * as encounterService from '@services/encounterService';
 import { postConsultationBundle } from '@services/consultationBundleService';
 import { formatDate } from '@utils/date';

yarn.lock

@@ -9218,8 +9218,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==