fix: conflicts

100mslive · Feb 21, 2024 · 7cc9fcb · 7cc9fcb
2 parents fe62925 + 19450a7
commit 7cc9fcb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/packages/hms-video-store/src/interfaces/room.ts b/packages/hms-video-store/src/interfaces/room.ts
@@ -41,7 +41,7 @@ export interface HMSRoom {
    * @alpha
    */
   effectsKey?: string;
-  isHippaEnabled?: boolean;
+  isHipaaEnabled?: boolean;
   isNoiseCancellationEnabled?: boolean;
 }
 

diff --git a/packages/hms-video-store/src/reactive-store/adapter.ts b/packages/hms-video-store/src/reactive-store/adapter.ts
@@ -157,7 +157,7 @@ export class SDKToHMS {
       isLargeRoom: sdkRoom.large_room_optimization,
       isEffectsEnabled: sdkRoom.isEffectsEnabled,
       effectsKey: sdkRoom.effectsKey,
-      isHippaEnabled: sdkRoom.isHippaEnabled,
+      isHipaaEnabled: sdkRoom.isHipaaEnabled,
       isNoiseCancellationEnabled: sdkRoom.isNoiseCancellationEnabled,
     };
   }

diff --git a/packages/hms-video-store/src/schema/room.ts b/packages/hms-video-store/src/schema/room.ts
@@ -40,6 +40,6 @@ export interface HMSRoom {
   isLargeRoom?: boolean;
   isEffectsEnabled?: boolean;
   effectsKey?: string;
-  isHippaEnabled?: boolean;
+  isHipaaEnabled?: boolean;
   isNoiseCancellationEnabled?: boolean;
 }
diff --git a/packages/hms-video-store/src/sdk/models/HMSRoom.ts b/packages/hms-video-store/src/sdk/models/HMSRoom.ts
@@ -22,7 +22,7 @@ export default class Room implements HMSRoom {
    * @alpha
    */
   effectsKey?: string;
-  isHippaEnabled?: boolean;
+  isHipaaEnabled?: boolean;
   isNoiseCancellationEnabled?: boolean;
 
   constructor(id: string) {

diff --git a/packages/hms-video-store/src/signal/init/models.ts b/packages/hms-video-store/src/signal/init/models.ts
@@ -58,6 +58,6 @@ export enum InitFlags {
   FLAG_DISABLE_VIDEO_TRACK_AUTO_UNSUBSCRIBE = 'disableVideoTrackAutoUnsubscribe',
   FLAG_WHITEBOARD_ENABLED = 'whiteboardEnabled',
   FLAG_EFFECTS_SDK_ENABLED = 'effectsSDKEnabled',
-  FLAG_HIPPA_ENABLED = 'hippa',
+  FLAG_HIPAA_ENABLED = 'hipaa',
   FLAG_NOISE_CANCELLATION = 'noiseCancellation',
 }
diff --git a/packages/hms-video-store/src/transport/index.ts b/packages/hms-video-store/src/transport/index.ts
@@ -911,7 +911,7 @@ export default class HMSTransport {
       if (room) {
         room.effectsKey = this.initConfig.config.vb?.effectsKey;
         room.isEffectsEnabled = this.isFlagEnabled(InitFlags.FLAG_EFFECTS_SDK_ENABLED);
-        room.isHippaEnabled = this.isFlagEnabled(InitFlags.FLAG_HIPPA_ENABLED);
+        room.isHipaaEnabled = this.isFlagEnabled(InitFlags.FLAG_HIPAA_ENABLED);
         room.isNoiseCancellationEnabled = this.isFlagEnabled(InitFlags.FLAG_NOISE_CANCELLATION);
       }
       this.analyticsTimer.end(TimedEvent.INIT);