#RI-3470 - fix conflicts

egor-zalenski · egor-zalenski · commit 1c1de9633cf7 · 2022-09-22T14:50:31.000+03:00
diff --git a/redisinsight/ui/src/components/inline-item-editor/InlineItemEditor.tsx b/redisinsight/ui/src/components/inline-item-editor/InlineItemEditor.tsx
@@ -244,7 +244,7 @@ const InlineItemEditor = (props: Props) => {
                         anchorClassName={styles.popoverAnchor}
                         panelClassName={cx(styles.popoverPanel)}
                         className={styles.popoverWrapper}
-                        button={<ApplyBtn />}
+                        button={ApplyBtn}
                       >
                         <div className={styles.popover} data-testid="approve-popover">
                           <EuiText size="m">

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ const InlineItemEditor = (props: Props) => {`
`244`	`244`	`anchorClassName={styles.popoverAnchor}`
`245`	`245`	`panelClassName={cx(styles.popoverPanel)}`
`246`	`246`	`className={styles.popoverWrapper}`
`247`		`- button={<ApplyBtn />}`
	`247`	`+ button={ApplyBtn}`
`248`	`248`	`>`
`249`	`249`	`<div className={styles.popover} data-testid="approve-popover">`
`250`	`250`	`<EuiText size="m">`