Fix close event not responding well (#52)

Co-authored-by: Soliman <soliman.achahbar@arhs-spikeseed.com>

Author: Soliman13

CHANGELOG.md

@@ -1,4 +1,9 @@
-# Changelog (Current version: 1.2.3)
+# Changelog (Current version: 1.2.4)
+
+### Version 1.2.4
+
+News
+- Fix close event not responding well
 
 ### Version 1.2.3
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netwatch",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Network traffic logger for React Native",
   "homepage": "https://github.com/odemolliens/react-native-netwatch",
   "main": "src/index.tsx",

src/Components/Main.tsx

@@ -209,13 +209,11 @@ export const Main = (props: IProps) => {
   return (
     <>
       <Appbar.Header style={[styles.header, { backgroundColor: theme.secondaryDarkColor }]}>
-        <TouchableOpacity style={[styles.button, { borderLeftWidth: 0 }]}>
-          <FeatherIcon
-            name="x"
-            color={theme.textColorOne}
-            size={24}
-            onPress={() => (settingsVisible ? setSettingsVisible(false) : props.onPressClose(false))}
-          />
+        <TouchableOpacity
+          style={[styles.button, { borderLeftWidth: 0 }]}
+          onPress={() => (settingsVisible ? setSettingsVisible(false) : props.onPressClose(false))}
+        >
+          <FeatherIcon name="x" color={theme.textColorOne} size={24} />
         </TouchableOpacity>
         <Appbar.Content color={theme.primaryColor} title="Netwatch" titleStyle={{ fontSize: 18 }} />
         {loadingXLSX ? (

src/Components/__tests__/Main.test.tsx

@@ -5,7 +5,7 @@ import ReduxAction from '../../Core/Objects/ReduxAction';
 import { RNRequest } from '../../Core/Objects/RNRequest';
 import { EnumFilterType, EnumSourceType } from '../../types';
 import NRequest from '../../Core/Objects/NRequest';
-import { Alert } from 'react-native';
+import { Alert, TouchableOpacity } from 'react-native';
 import Share from 'react-native-share';
 
 describe('Main test suite', () => {
@@ -181,7 +181,8 @@ describe('Main test suite', () => {
     jest.spyOn(React, 'useState').mockImplementation(useStateMock);
     givenProps();
     givenComponent();
-    component.find('[name="x"]').simulate('press');
+    // @ts-ignore
+    component.find(TouchableOpacity).first().props().onPress();
     expect(props.onPressClose).toHaveBeenCalledTimes(1);
     expect(props.onPressClose).toHaveBeenCalledWith(false);
   });

src/Components/__tests__/__snapshots__/Main.test.tsx.snap

@@ -20,6 +20,7 @@ exports[`Main test suite Tests source should render properly 1`] = `
     }
   >
     <ForwardRef
+      onPress={[Function]}
       style={
         Array [
           Object {
@@ -38,7 +39,6 @@ exports[`Main test suite Tests source should render properly 1`] = `
       <Icon
         color="#F9FAFB"
         name="x"
-        onPress={[Function]}
         size={24}
       />
     </ForwardRef>
@@ -220,6 +220,7 @@ exports[`Main test suite should render properly and showSettings 1`] = `
     }
   >
     <ForwardRef
+      onPress={[Function]}
       style={
         Array [
           Object {
@@ -238,7 +239,6 @@ exports[`Main test suite should render properly and showSettings 1`] = `
       <Icon
         color="#F9FAFB"
         name="x"
-        onPress={[Function]}
         size={24}
       />
     </ForwardRef>