Merge conflict

jcobis · jcobis · commit d0cfc122e54a · 2025-10-15T14:04:16.000-04:00
diff --git a/packages/compass-collection/src/components/mock-data-generator-modal/mock-data-generator-modal.tsx b/packages/compass-collection/src/components/mock-data-generator-modal/mock-data-generator-modal.tsx
@@ -99,7 +99,7 @@ const MockDataGeneratorModal = ({
           <PreviewScreen
             confirmedFakerSchema={
               fakerSchemaGenerationState.status === 'completed'
-                ? fakerSchemaGenerationState.fakerSchema
+                ? fakerSchemaGenerationState.editedFakerSchema
                 : {}
             }
           />

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ const MockDataGeneratorModal = ({`
`99`	`99`	`<PreviewScreen`
`100`	`100`	`confirmedFakerSchema={`
`101`	`101`	`fakerSchemaGenerationState.status === 'completed'`
`102`		`- ? fakerSchemaGenerationState.fakerSchema`
	`102`	`+ ? fakerSchemaGenerationState.editedFakerSchema`
`103`	`103`	`: {}`
`104`	`104`	`}`
`105`	`105`	`/>`