move tos, redux -> component state

src/actions/language.js

@@ -1,6 +1,6 @@
 // @flow
 
-import {writeAppSettings, APP_SETTINGS_KEYS, loadTOS} from '../helpers/appSettings'
+import {writeAppSettings, APP_SETTINGS_KEYS} from '../helpers/appSettings'
 
 import {type Dispatch} from 'redux'
 
@@ -16,20 +16,9 @@ export const changeLanguage = (languageCode: string) => (dispatch: Dispatch<any>
   })
 }
 
-export const changeTOSLanguage = (tos: string) => (dispatch: Dispatch<any>) => {
-  dispatch({
-    path: ['tos'],
-    payload: tos,
-    reducer: (state, tos) => tos,
-    type: 'CHANGE_TOS_LANGUAGE',
-  })
-}
-
 export const changeAndSaveLanguage = (languageCode: string) => async (dispatch: Dispatch<any>) => {
   await writeAppSettings(APP_SETTINGS_KEYS.LANG, languageCode)
-  const tos = await loadTOS(languageCode)
 
-  dispatch(changeTOSLanguage(tos))
   dispatch(changeLanguage(languageCode))
 }
 

src/components/Common/TermsOfService.js

@@ -1,24 +1,21 @@
 // @flow
 
 import React from 'react'
-import {connect} from 'react-redux'
-import {compose} from 'redux'
+import {useSelector} from 'react-redux'
 import Markdown from 'react-native-easy-markdown'
+import {loadTOS} from '../../helpers/appSettings'
+import {ActivityIndicator} from 'react-native'
+import {languageSelector} from '../../selectors'
 
-import type {ComponentType} from 'react'
+const TermsOfService = () => {
+  const [tos, setTos] = React.useState()
+  const languageCode = useSelector(languageSelector)
 
-type Props = {
-  tos: string,
-}
+  React.useEffect(() => {
+    loadTOS(languageCode).then(setTos)
+  }, [languageCode])
 
-const TermsOfService = ({tos}: Props) => {
-  return <Markdown>{tos}</Markdown>
+  return tos ? <Markdown>{tos}</Markdown> : <ActivityIndicator size={'large'} color={'black'} />
 }
 
-export default (compose(
-  connect((state) => {
-    return {
-      tos: state.tos,
-    }
-  }),
-)(TermsOfService): ComponentType<any>)
+export default TermsOfService

src/state.js

@@ -81,7 +81,6 @@ export type State = {
   isAppInitialized: boolean,
   isAuthenticated: boolean,
   isKeyboardOpen: boolean,
-  tos: string,
   appSettings: {
     acceptedTos: boolean,
     installationId: ?string,