diff --git a/app/App.tsx b/app/App.tsx index 62e4004a..192ba88a 100644 --- a/app/App.tsx +++ b/app/App.tsx @@ -21,7 +21,6 @@ import { useTranslation } from 'react-i18next' import { StatusBar } from 'react-native' import { isTablet } from 'react-native-device-info' import Orientation from 'react-native-orientation-locker' -import { SafeAreaProvider } from 'react-native-safe-area-context' import SplashScreen from 'react-native-splash-screen' import Toast from 'react-native-toast-message' import { container } from 'tsyringe' @@ -83,9 +82,7 @@ const App = () => { overlayColor={'black'} overlayOpacity={0.7} > - - - + diff --git a/app/src/navigators/TabStack.tsx b/app/src/navigators/TabStack.tsx index 6391c4e7..25dad065 100644 --- a/app/src/navigators/TabStack.tsx +++ b/app/src/navigators/TabStack.tsx @@ -39,10 +39,10 @@ const TabStack: React.FC = () => { const tabBarIconContainerStyles = (focused: boolean): ViewStyle => ({ ...TabTheme.tabBarContainerStyle, - borderTopWidth: focused ? 4 : 0, - borderTopColor: ColorPallet.brand.primary, + borderTopWidth: 4, + borderTopColor: focused ? ColorPallet.brand.primary : ColorPallet.brand.primaryBackground, width: '100%', - justifyContent: showLabels ? 'flex-end' : 'center', + justifyContent: 'center', }) const tabs = [ @@ -89,7 +89,7 @@ const TabStack: React.FC = () => { { backgroundColor: ColorPallet.brand.primary, justifyContent: 'center', alignItems: 'center', - borderWidth: 1, }} > { } return ( - +