Fixes flow errors

CityOfZion · Apr 11, 2020 · 66aa09b · 66aa09b
1 parent d0c0c4b
commit 66aa09b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/app/components/Inputs/LanguageSelect/LanguageSelect.jsx b/app/components/Inputs/LanguageSelect/LanguageSelect.jsx
@@ -1,7 +1,5 @@
 // @flow
 import React from 'react'
-//  $FlowFixMe
-import { components } from 'react-select'
 
 import StyledReactSelect from '../StyledReactSelect/StyledReactSelect'
 import { LANGUAGES } from '../../../core/constants'
@@ -26,16 +24,16 @@ const parsedLangOptions = Object.keys(LANGUAGES).map(key => ({
   renderFlag: LANGUAGES[key].renderFlag,
 }))
 
-const { Option } = components
-export const LanguageSettingsIcon = ({ data, ...rest }: { data: Language }) => (
-  <Option {...rest}>
+export const LanguageSettingsIcon = (data: Language) => {
+  const { renderFlag, label } = data
+  return (
     <div className={styles.languageOptionRow}>
-      {data.renderFlag()}
+      {renderFlag()}
       <div />
-      {data.label}
+      {label}
     </div>
-  </Option>
-)
+  )
+}
 
 export default function LanguageSelect({
   setLanguageSetting,
@@ -65,7 +63,7 @@ export default function LanguageSelect({
       {languageMenuOpen && (
         <div id={styles.floatingLanguageSelect}>
           <StyledReactSelect
-            components={{ Option: LanguageSettingsIcon }}
+            formatOptionLabel={LanguageSettingsIcon}
             hideControl
             settiingsSelect
             languageSelect

diff --git a/app/containers/Settings/Settings.jsx b/app/containers/Settings/Settings.jsx
@@ -29,7 +29,6 @@ import LockIcon from '../../assets/icons/lock.svg'
 import CurrencyIcon from '../../assets/icons/currency-icon.svg'
 import LightbulbIcon from '../../assets/icons/lightbulb-icon.svg'
 import CogIcon from '../../assets/icons/cog-icon.svg'
-import LangIcon from '../../assets/icons/lang-icon.svg'
 import VolumeIcon from '../../assets/icons/volume-icon.svg'
 import TimeIcon from '../../assets/icons/time-icon.svg'
 import SaveIcon from '../../assets/icons/save-icon.svg'
@@ -287,7 +286,7 @@ export default class Settings extends Component<Props, State> {
                   >
                     <div className={styles.settingsSelectContainer}>
                       <StyledReactSelect
-                        components={{ Option: LanguageSettingsIcon }}
+                        formatOptionLabel={LanguageSettingsIcon}
                         settingsSelect
                         onChange={this.updateLanguageSetting}
                         isSearchable={false}

diff --git a/app/containers/Settings/Settings.scss b/app/containers/Settings/Settings.scss
@@ -120,5 +120,4 @@ $panel-top-margin: 25px;
   display: flex;
   align-items: center;
   padding: 5px;
-  // -webkit-filter: grayscale(100%);
 }