diff --git a/src/components/AddressAutocomplete.js b/src/components/AddressAutocomplete.js index 2badc7ede..7905ddb21 100644 --- a/src/components/AddressAutocomplete.js +++ b/src/components/AddressAutocomplete.js @@ -31,6 +31,7 @@ import { useBackgroundHighlightColor, useBaseTextColor, useColorModeToken, + usePrimaryColor, } from '../styles/theme'; import AddressUtils from '../utils/Address'; import PostCodeButton from './AddressAutocomplete/components/PostCodeButton'; @@ -375,17 +376,24 @@ function AddressAutocomplete(props) { // do not use default FlatList - see https://github.com/byteburgers/react-native-autocomplete-input/pull/230 renderResultList={({ data, listContainerStyle }) => ( - {data.map((item, index) => ( - - {renderItem({ item })} - - - ))} - {props.country === 'gb' ? ( - - ) : ( - - )} + + {data.map((item, index) => ( + + {renderItem({ item })} + + + ))} + {props.country === 'gb' ? ( + + ) : ( + + )} + )} renderTextInput={inputProps => renderTextInput(inputProps)} @@ -398,7 +406,7 @@ function AddressAutocomplete(props) { ...inputContainerStyle, }} listContainerStyle={{ - backgroundColor: props.containerColor, + backgroundColor: props.backgroundColor, ...listContainerStyle, }} //FIXME: avoid using generic `style` prop; use `containerStyle`/`inputContainerStyle`/`listContainerStyle/ etc. @@ -478,6 +486,7 @@ function withHooks(ClassComponent) { const backgroundColor = useBackgroundContainerColor(); const containerColor = useBackgroundHighlightColor(); + const primaryColor = usePrimaryColor(); return ( ); };