From 5e620eeb55724db00a24e88cb135f71fa144c79d Mon Sep 17 00:00:00 2001
From: AlixH <alixhumbert@gmail.com>
Date: Thu, 6 Apr 2023 16:31:36 +0200
Subject: [PATCH] Prevent drawer from opening where it shouldn't

---
 .../connector/ChargingStationConnectorComponent.tsx      | 2 +-
 .../ChargingStationConnectorComponentStyles.tsx          | 9 ++++-----
 src/screens/base-screen/BaseScreen.tsx                   | 2 +-
 src/screens/base-screen/SelectableList.tsx               | 8 +++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/charging-station/connector/ChargingStationConnectorComponent.tsx b/src/components/charging-station/connector/ChargingStationConnectorComponent.tsx
index b5c10a5c7..705fa6f09 100644
--- a/src/components/charging-station/connector/ChargingStationConnectorComponent.tsx
+++ b/src/components/charging-station/connector/ChargingStationConnectorComponent.tsx
@@ -145,7 +145,7 @@ export default class ChargingStationConnectorComponent extends React.Component<P
     const { connector, navigation, chargingStation, onNavigate, listed } = this.props;
     return (
       <TouchableOpacity
-        style={[style.container, listed && style.borderedTopContainer]}
+        style={[style.container, listed && style.borderedBottomContainer]}
         disabled={chargingStation.inactive || !listed}
         onPress={() => {
           if (onNavigate) {
diff --git a/src/components/charging-station/connector/ChargingStationConnectorComponentStyles.tsx b/src/components/charging-station/connector/ChargingStationConnectorComponentStyles.tsx
index 09e568664..3d4be3fbb 100644
--- a/src/components/charging-station/connector/ChargingStationConnectorComponentStyles.tsx
+++ b/src/components/charging-station/connector/ChargingStationConnectorComponentStyles.tsx
@@ -12,12 +12,11 @@ export default function computeStyleSheet(): StyleSheet.NamedStyles<any> {
       width: '100%',
       justifyContent: 'center',
       alignItems: 'stretch',
-      borderStyle: 'solid',
-      borderBottomWidth: 1,
-      borderColor: commonColor.listBorderColor
+      borderStyle: 'solid'
     },
-    borderedTopContainer: {
-      borderTopColor: commonColor.listBorderColor
+    borderedBottomContainer: {
+      borderBottomWidth: 1,
+      borderBottomColor: commonColor.listBorderColor
     },
     connectorContainer: {
       flexDirection: 'row',
diff --git a/src/screens/base-screen/BaseScreen.tsx b/src/screens/base-screen/BaseScreen.tsx
index d52b60ab3..6fd55ac79 100644
--- a/src/screens/base-screen/BaseScreen.tsx
+++ b/src/screens/base-screen/BaseScreen.tsx
@@ -56,7 +56,7 @@ export default class BaseScreen<P, S> extends React.Component<Props, State> {
     this.backHandler?.remove();
   }
 
-  private setDrawerStatus(): void {
+  protected setDrawerStatus(): void {
     const drawer = this.props?.navigation?.getParent('drawer');
     drawer?.setOptions({
       swipeEnabled: this.canOpenDrawer
diff --git a/src/screens/base-screen/SelectableList.tsx b/src/screens/base-screen/SelectableList.tsx
index 3784ea39b..9ddb1acbb 100644
--- a/src/screens/base-screen/SelectableList.tsx
+++ b/src/screens/base-screen/SelectableList.tsx
@@ -95,5 +95,11 @@ export default class SelectableList<T extends ListItem> extends BaseScreen<Selec
     await this.refresh();
     // Hide spinner
     this.setState({ refreshing: false });
-  };
+  }
+
+  protected setDrawerStatus() {
+    if (!this.props.isModal) {
+      super.setDrawerStatus();
+    }
+  }
 }