From a6a2ea63a49c7eab3e2b2318d07ad4c832b0a02a Mon Sep 17 00:00:00 2001
From: harshil Sharma <harshilsharma63@gmail.com>
Date: Tue, 26 Sep 2023 17:32:48 +0530
Subject: [PATCH] Added convert option to GM

---
 app/screens/channel_info/channel_info.tsx | 8 ++++++++
 ios/Podfile.lock                          | 2 +-
 package.json                              | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/screens/channel_info/channel_info.tsx b/app/screens/channel_info/channel_info.tsx
index c71c8df98..3cd0239f1 100644
--- a/app/screens/channel_info/channel_info.tsx
+++ b/app/screens/channel_info/channel_info.tsx
@@ -21,6 +21,8 @@ import Options from './options';
 import Title from './title';
 
 import type {AvailableScreens} from '@typings/screens/navigation';
+import ConvertToChannelLabel from '@app/components/channel_actions/convert_to_channel/convert_to_channel_label';
+import { General } from '@app/constants';
 
 type Props = {
     channelId: string;
@@ -105,6 +107,12 @@ const ChannelInfo = ({
                     canManageMembers={canManageMembers}
                 />
                 <View style={styles.separator}/>
+                {type === General.GM_CHANNEL &&
+                <>
+                    <ConvertToChannelLabel/>
+                    <View style={styles.separator}/>
+                </>
+                }
                 {canEnableDisableCalls &&
                     <>
                         <ChannelInfoEnableCalls
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 264650506..2f1b5396e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1011,4 +1011,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 25f07cb9e5eed8c84db8e8723000e8470c349058
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
index fa464345b..b0b79aa2a 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "pod-install-m1": "react-native setup-ios-permissions && cd ios && arch -x86_64 pod install",
     "postinstall": "patch-package && ./scripts/postinstall.sh",
     "prepare": "husky install",
-    "preinstall": "./scripts/preinstall.sh && npx solidarity",
+    "preinstall": "./scripts/preinstall.sh",
     "start": "react-native start",
     "test": "jest --forceExit --runInBand",
     "test:coverage": "jest --coverage",