update

screens/Private/TimerScreen/TimerScreen.js

@@ -53,12 +53,8 @@ const initTimeSetting = {
 const initState = {
 const initState = {
 	...initTimeSetting,
 	...initTimeSetting,
 	isAddVisible: false,
 	isAddVisible: false,
-<<<<<<< Updated upstream:screens/Private/TimerScreen/TimerScreen.ios.js
-	isfilterVisible: false,
-=======
 	isFilterVisible: false,
 	isFilterVisible: false,
 	isModalVisible: false,
 	isModalVisible: false,
->>>>>>> Stashed changes:screens/Private/TimerScreen/TimerScreen.js
 
 
 	search: '',
 	search: '',
 	filter: false,
 	filter: false,
@@ -629,22 +625,6 @@ class TimerScreen extends Component {
 					animationType="fade"
 					animationType="fade"
 					visible={this.state.isFilterVisible}
 					visible={this.state.isFilterVisible}
 				>
 				>
-<<<<<<< Updated upstream:screens/Private/TimerScreen/TimerScreen.ios.js
-					<Modal2
-						swipeArea={45}
-						swipeThreshold={65}
-						backdropPressToClose={false}
-						style={[styles.filterModal]}
-						position={'bottom'}
-						isOpen={this.state.isfilterVisible}
-						onClosed={() => {
-							this.setState({ isfilterVisible: false });
-						}}
-					>
-						{this.renderFilterModal()}
-					</Modal2>
-				</Modal>
-=======
 					<Modal
 					<Modal
 						swipeArea={45}
 						swipeArea={45}
 						swipeThreshold={65}
 						swipeThreshold={65}
@@ -762,7 +742,6 @@ class TimerScreen extends Component {
 						</ScrollView>
 						</ScrollView>
 					</Modal>
 					</Modal>
 				</BackdropModal>
 				</BackdropModal>
->>>>>>> Stashed changes:screens/Private/TimerScreen/TimerScreen.js
 			</>
 			</>
 		);
 		);
 	}
 	}
@@ -860,15 +839,8 @@ const styles = StyleSheet.create({
 	filterHeaderContainer: {
 	filterHeaderContainer: {
 		...theme.rowContainer,
 		...theme.rowContainer,
 		justifyContent: 'space-between',
 		justifyContent: 'space-between',
-<<<<<<< Updated upstream:screens/Private/TimerScreen/TimerScreen.ios.js
-		paddingBottom: 10,
-		borderBottomColor: 'rgba(189, 192, 200, 0.3)',
-		borderBottomWidth: 1,
-	},
-=======
 	},
 	},
 
 
->>>>>>> Stashed changes:screens/Private/TimerScreen/TimerScreen.js
 	checkboxContainer: {
 	checkboxContainer: {
 		borderColor: 'transparent',
 		borderColor: 'transparent',
 		backgroundColor: color.white,
 		backgroundColor: color.white,