diff --git a/App.js b/App.js index 752edb4..778d3aa 100644 --- a/App.js +++ b/App.js @@ -7,7 +7,6 @@ import rootReducer from './src/Reducers/index'; import RootView from './src/RootView'; import createSagaMiddleware from 'redux-saga'; import rootSaga from './src/Saga/rootSaga'; - import FirebaseNotification from './src/helper/FirebaseNotification'; let bootSplashLogo = require('./src/assets/images/iconSplash.png'); diff --git a/src/RootView.js b/src/RootView.js index 772bc53..86fc970 100644 --- a/src/RootView.js +++ b/src/RootView.js @@ -1,5 +1,12 @@ import React, {useEffect} from 'react'; -import {View, Text, ImageBackground, StyleSheet, StatusBar} from 'react-native'; +import { + View, + Text, + ImageBackground, + StyleSheet, + StatusBar, + SafeAreaView, +} from 'react-native'; import {connect} from 'react-redux'; import StackNavigation from './routers/StackNavigation'; @@ -25,13 +32,14 @@ const RootView = (props) => { return ( <> <View style={{flex: 1}}> + {/* <DropDown /> */} <Modal isVisible={props.loadingModal.isVisible}> <SkypeIndicator color={'white'} /> </Modal> <StackNavigation /> </View> {/*<VersionChecker/>*/} - {/* <DropDown /> */} + <NoInternetComponent /> </> ); diff --git a/src/components/DropDown.js b/src/components/DropDown.js index 66ecbb7..ac0d7a2 100644 --- a/src/components/DropDown.js +++ b/src/components/DropDown.js @@ -90,22 +90,20 @@ const DropDown = () => { }; return ( - <View style={styles.container}> - <DropdownAlert - ref={(ref) => { - if (ref) { - dropDownAlertRef = ref; - } - }} - containerStyle={styles.content} - showCancel={true} - onCancel={_onCancel} - onTap={_onTap} - titleNumOfLines={2} - messageNumOfLines={0} - onClose={_onClose} - /> - </View> + <DropdownAlert + ref={(ref) => { + if (ref) { + dropDownAlertRef = ref; + } + }} + containerStyle={styles.content} + showCancel={true} + onCancel={_onCancel} + onTap={_onTap} + titleNumOfLines={2} + messageNumOfLines={0} + onClose={_onClose} + /> ); }; @@ -116,6 +114,7 @@ const styles = StyleSheet.create({ }, content: { backgroundColor: PURPLE_COLOR, + zIndex: 10, }, size: { textAlign: 'center', diff --git a/src/components/Header/HeaderHome.js b/src/components/Header/HeaderHome.js index 28dc68e..b916a34 100644 --- a/src/components/Header/HeaderHome.js +++ b/src/components/Header/HeaderHome.js @@ -200,6 +200,7 @@ const HeaderHome = (props) => { <View style={styles.container}> <SnackBar /> <StatusBar backgroundColor="transparent" translucent={true} /> + <View style={{ justifyContent: 'center',