Fixes after rebasing

extensions/cornerstone/src/OHIFCornerstoneViewport.js

@@ -180,7 +180,7 @@ class OHIFCornerstoneViewport extends Component {
 
     if (
       displaySet.displaySetInstanceUID !==
-      prevDisplaySet.displaySetInstanceUID ||
+        prevDisplaySet.displaySetInstanceUID ||
       displaySet.SOPInstanceUID !== prevDisplaySet.SOPInstanceUID ||
       displaySet.frameIndex !== prevDisplaySet.frameIndex
     ) {
@@ -216,18 +216,21 @@ class OHIFCornerstoneViewport extends Component {
       });
     }
 
-    const debouncedNewImageHandler = debounce(({ currentImageIdIndex, sopInstanceUid }) => {
-      const { displaySet } = this.props.viewportData;
-      const { StudyInstanceUID } = displaySet;
-      if (currentImageIdIndex > 0) {
-        this.props.onNewImage({
-          StudyInstanceUID,
-          SOPInstanceUID: sopInstanceUid,
-          frameIndex: currentImageIdIndex,
-          activeViewportIndex: viewportIndex,
-        });
-      }
-    }, 700);
+    const debouncedNewImageHandler = debounce(
+      ({ currentImageIdIndex, sopInstanceUid }) => {
+        const { displaySet } = this.props.viewportData;
+        const { StudyInstanceUID } = displaySet;
+        if (currentImageIdIndex > 0) {
+          this.props.onNewImage({
+            StudyInstanceUID,
+            SOPInstanceUID: sopInstanceUid,
+            frameIndex: currentImageIdIndex,
+            activeViewportIndex: viewportIndex,
+          });
+        }
+      },
+      700
+    );
 
     return (
       <>

extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.test.js

@@ -36,7 +36,10 @@ describe('measurementServiceMappings.js', () => {
     };
     mappings = measurementServiceMappingsFactory(measurementServiceMock);
     handles = { start: { x: 1, y: 2 }, end: { x: 1, y: 2 } };
-    points = [{ x: 1, y: 2 }, { x: 1, y: 2 }];
+    points = [
+      { x: 1, y: 2 },
+      { x: 1, y: 2 },
+    ];
     csToolsAnnotation = {
       toolName: definition,
       measurementData: {