feat(FOROME-1227): merge conflicts

ForomePlatform · Jun 27, 2022 · 3e3ee5b · 3e3ee5b
1 parent 2c33927
commit 3e3ee5b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/src/components/solution-control/solution-control-popover/solution-control-popover.tsx b/src/components/solution-control/solution-control-popover/solution-control-popover.tsx
@@ -5,7 +5,6 @@ import cn from 'classnames'
 
 import { t } from '@i18n'
 import { Button } from '@ui/button'
-import { Loader } from '@ui/loader'
 import { Popover } from '@ui/popover'
 import { IPopoverBaseProps } from '@ui/popover/popover.interface'
 import { popoverOffset } from '@pages/ws/ws.constants'
@@ -14,7 +13,6 @@ import { SolutionControlList } from '../solution-control-list'
 
 interface ISolutionControlPopoverProps extends IPopoverBaseProps {
   isCreateDisabled?: boolean
-  isFetching: boolean
   onCreate: () => void
   onApply: (solutionName: string) => void
   onJoin?: (solutionName: string) => void
@@ -31,7 +29,6 @@ export const SolutionControlPopover = ({
   solutions,
   selected,
   isCreateDisabled,
-  isFetching,
   controlName,
   modifiedSolution,
   onCreate,
@@ -62,8 +59,7 @@ export const SolutionControlPopover = ({
             {t('solutionControl.createNewSolution', { controlName })}
           </button>
         </header>
-        {isFetching && <Loader size="m" />}
-        {!isFetching && solutions && (
+        {solutions && (
           <SolutionControlList
             className={styles.solutionControlCard__list}
             solutions={solutions}

diff --git a/src/pages/filter/dtree/components/control-panel/solution-control-dtree.tsx b/src/pages/filter/dtree/components/control-panel/solution-control-dtree.tsx
@@ -14,7 +14,6 @@ export const SolutionControlDtree = observer((): ReactElement => {
   return (
     <SolutionControl
       selected={activeDtree}
-      isFetching={isFetchingDtrees}
       solutions={availableDtrees}
       isCreateDisabled={dtreeStore.dtreeCode.length < MIN_CODE_LENGTH}
       isFetchingSolutions={isFetchingDtrees}

diff --git a/src/pages/filter/refiner/components/solution-control-refiner/solution-control-refiner.tsx b/src/pages/filter/refiner/components/solution-control-refiner/solution-control-refiner.tsx
@@ -19,7 +19,6 @@ export const SolutionControlRefiner = observer((): ReactElement => {
 
   return (
     <SolutionControl
-      isFetching={isFetchingPresets}
       selected={activePreset}
       solutions={availablePresets}
       controlName={t('solutionControl.filterPreset')}