fix conflict

AppNavigation.js

@@ -194,7 +194,7 @@ const WithBottomTabStack = createBottomTabNavigator(
 		Four: FourthStack,
 		Four: FourthStack,
 	},
 	},
 	{
 	{
-		initialRouteName: 'SmartMeter',
+		initialRouteName: 'Timer', // default SmartMeter
 		tabBarComponent: props => <BottomNavigationTabs {...props} />,
 		tabBarComponent: props => <BottomNavigationTabs {...props} />,
 		tabBarOptions: {
 		tabBarOptions: {
 			keyboardHidesTabBar: true,
 			keyboardHidesTabBar: true,
@@ -235,7 +235,7 @@ const AppStack = createSwitchNavigator(
 		Main: MainStack,
 		Main: MainStack,
 	},
 	},
 	{
 	{
-		initialRouteName: 'Main',
+		initialRouteName: 'Main', //default AuthLoading
 	}
 	}
 );
 );
 
 

screens/Private/TimerScreen/TimerScreen.js

@@ -277,7 +277,7 @@ export default class TimerScreen extends Component {
 							height: 30,
 							height: 30,
 							borderColor: '#c7cad1',
 							borderColor: '#c7cad1',
 						}}
 						}}
-						inputStyle={{ fontFamily: 'Avenir-Roman', fontSize: 12, color: color.darkGrey }}
+						inputStyle={{ fontFamily: 'Avenir-Roman', fontSize: 12, color: '#c7cad1' }}
 						round
 						round
 						lightTheme
 						lightTheme
 						placeholder="Search..."
 						placeholder="Search..."
@@ -375,7 +375,23 @@ export default class TimerScreen extends Component {
 								<Button
 								<Button
 									transparent
 									transparent
 									style={{ flex: 1, justifyContent: 'center' }}
 									style={{ flex: 1, justifyContent: 'center' }}
-									onPress={() => this.setState({ isVisible: false })}
+									onPress={() =>
+										this.setState({
+											isVisible: false,
+											timer: new Date(),
+											active: false,
+											power: false,
+											repeatDays: [
+												{ day: 'S', isRepeat: false },
+												{ day: 'M', isRepeat: false },
+												{ day: 'T', isRepeat: false },
+												{ day: 'W', isRepeat: false },
+												{ day: 'T', isRepeat: false },
+												{ day: 'F', isRepeat: false },
+												{ day: 'S', isRepeat: false },
+											],
+										})
+									}
 								>
 								>
 									<Text style={{ color: color.grey }}>Cancel</Text>
 									<Text style={{ color: color.grey }}>Cancel</Text>
 								</Button>
 								</Button>