From d742d3a5a822cfad74e77d9426a0afd45407e7f0 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Oct 2022 12:45:04 +0500
Subject: [PATCH] fixed issue caused by lint and merge

---
 App.js                                                 |  3 +--
 metro.config.js                                        |  2 +-
 .../basicUIElements/view/userListItem/userListItem.tsx |  7 +++----
 .../foregroundNotification/foregroundNotification.tsx  |  1 -
 .../quickProfileModal/container/quickProfileModal.tsx  |  2 +-
 src/screens/application/children/applicationScreen.tsx | 10 +++++-----
 yarn.lock                                              |  5 -----
 7 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/App.js b/App.js
index 89e46a645..afc97b2c9 100644
--- a/App.js
+++ b/App.js
@@ -1,9 +1,8 @@
 // eslint-disable-next-line
-import { Alert } from 'react-native';
 import App from './src/index';
 
 if (__DEV__) {
-  import('./reactotron-config').then(() => { Alert.alert("reatotron working"); console.log('Reactotron Configured')}).catch((err)=>Alert.alert(err.message));
+  import('./reactotron-config').then(() => { console.log('Reactotron Configured')});
 }
 
 export default App;
\ No newline at end of file
diff --git a/metro.config.js b/metro.config.js
index e91aba937..13a964217 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -10,7 +10,7 @@ module.exports = {
     getTransformOptions: async () => ({
       transform: {
         experimentalImportSupport: false,
-        inlineRequires: true,
+        inlineRequires: false,
       },
     }),
   },
diff --git a/src/components/basicUIElements/view/userListItem/userListItem.tsx b/src/components/basicUIElements/view/userListItem/userListItem.tsx
index 5aaa8f930..acca65e46 100644
--- a/src/components/basicUIElements/view/userListItem/userListItem.tsx
+++ b/src/components/basicUIElements/view/userListItem/userListItem.tsx
@@ -33,7 +33,7 @@ const UserListItem = ({
   rightItemRenderer,
 }) => {
   const _handleRightButtonPress = () => {
-    if (onPressRightText){
+    if (onPressRightText) {
       const _data = {};
       _data.following = username;
 
@@ -109,12 +109,11 @@ const UserListItem = ({
                     ref={setPopoverAnchor}
                     style={styles.rightWrapper}
                     onPress={() => {
-                      if (rightTooltipText){
+                      if (rightTooltipText) {
                         openPopover();
                       }
                       _handleRightButtonPress();
-
-                  >
+                    }}>
                     <>
                       <Text
                         style={[
diff --git a/src/components/foregroundNotification/foregroundNotification.tsx b/src/components/foregroundNotification/foregroundNotification.tsx
index dd09e29e0..57e43956c 100644
--- a/src/components/foregroundNotification/foregroundNotification.tsx
+++ b/src/components/foregroundNotification/foregroundNotification.tsx
@@ -12,7 +12,6 @@ import ROUTES from '../../constants/routeNames';
 // Styles
 import styles, { CONTAINER_HEIGHT } from './styles';
 import RootNavigation from '../../navigation/rootNavigation';
-import { useIntl } from 'react-intl';
 
 interface RemoteMessage {
   data: {
diff --git a/src/components/organisms/quickProfileModal/container/quickProfileModal.tsx b/src/components/organisms/quickProfileModal/container/quickProfileModal.tsx
index 962d5da71..49bc82f2c 100644
--- a/src/components/organisms/quickProfileModal/container/quickProfileModal.tsx
+++ b/src/components/organisms/quickProfileModal/container/quickProfileModal.tsx
@@ -30,7 +30,7 @@ export const QuickProfileModal = () => {
       gestureEnabled={true}
       containerStyle={styles.sheetContent}
       onClose={_onClose}
-      indicatorColor={EStyleSheet.value('$primaryWhiteLightBackground')}
+      indicatorColor={EStyleSheet.value('$primaryWhiteLightBackground')}>
 
       <QuickProfileContent username={profileModalUsername} onClose={_onClose} />
     </ActionSheet>
diff --git a/src/screens/application/children/applicationScreen.tsx b/src/screens/application/children/applicationScreen.tsx
index 550ab00ab..a6d2d9278 100644
--- a/src/screens/application/children/applicationScreen.tsx
+++ b/src/screens/application/children/applicationScreen.tsx
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { injectIntl } from 'react-intl';
 
 import RootNavigation from '../../../navigation/rootNavigation';
-// import { AppNavigator } from '../../../navigation';
+import { AppNavigator } from '../../../navigation';
 
 // Services
 import {
@@ -115,10 +115,10 @@ class ApplicationScreen extends Component {
       <Fragment>
         {!isConnected && <NoInternetConnection />}
 
-        {/* <AppNavigator /> */}
-        <Text style={{ flex: 1, justifyContent: 'center', alignItems: 'center', color: 'green' }}>
-          I am working though
-        </Text>
+        <AppNavigator />
+        {/* <Text style={{ flex: 1, justifyContent: 'center', alignItems: 'center', color: 'green' }}> */}
+          {/* I am working though */}
+        {/* </Text> */}
       </Fragment>
     );
   }
diff --git a/yarn.lock b/yarn.lock
index aa87f2bc0..606246c05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1640,11 +1640,6 @@
     color "^4.2.3"
     warn-once "^0.1.0"
 
-"@react-navigation/compat@5.3.20":
-  version "5.3.20"
-  resolved "https://registry.yarnpkg.com/@react-navigation/compat/-/compat-5.3.20.tgz#96cc6995f4bd40f70958b420735a189a87b22a0e"
-  integrity sha512-4CDw3QRN2zKj2L1Fxjq6ZOK95EW8UOnW3Par1o+P07qc+dZTAL1poKeRx74yqGLQyGVawozTHOgyE8/XWjdDvg==
-
 "@react-navigation/core@^6.4.0":
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.4.0.tgz#c44d33a8d8ef010a102c7f831fc8add772678509"