diff --git a/.gitignore b/.gitignore
index 267163f..8e0ff9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .atom/
 .idea/
 .vscode/
+**/.fvm/
 
 .packages
 .pub/
diff --git a/stream_chat_v1/ios/Flutter/Debug.xcconfig b/stream_chat_v1/ios/Flutter/Debug.xcconfig
index e8efba1..b2f5fae 100644
--- a/stream_chat_v1/ios/Flutter/Debug.xcconfig
+++ b/stream_chat_v1/ios/Flutter/Debug.xcconfig
@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/stream_chat_v1/ios/Flutter/Release.xcconfig b/stream_chat_v1/ios/Flutter/Release.xcconfig
index 399e934..88c2914 100644
--- a/stream_chat_v1/ios/Flutter/Release.xcconfig
+++ b/stream_chat_v1/ios/Flutter/Release.xcconfig
@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj b/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj
index 7965153..19ea95e 100644
--- a/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj
+++ b/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj
@@ -314,7 +314,6 @@
 				"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
 				"${BUILT_PRODUCTS_DIR}/esys_flutter_share/esys_flutter_share.framework",
@@ -343,7 +342,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/esys_flutter_share.framework",
diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a1..919434a 100644
--- a/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/stream_chat_v1/lib/advanced_options_page.dart b/stream_chat_v1/lib/advanced_options_page.dart
index ee50514..f3ea431 100644
--- a/stream_chat_v1/lib/advanced_options_page.dart
+++ b/stream_chat_v1/lib/advanced_options_page.dart
@@ -33,7 +33,6 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
-      resizeToAvoidBottomPadding: false,
       appBar: AppBar(
         backgroundColor: StreamChatTheme.of(context).colorTheme.white,
         elevation: 1,
diff --git a/stream_chat_v1/pubspec.yaml b/stream_chat_v1/pubspec.yaml
index 3d4c9e9..4a6926a 100644
--- a/stream_chat_v1/pubspec.yaml
+++ b/stream_chat_v1/pubspec.yaml
@@ -20,10 +20,6 @@ dependencies:
   lottie: ^0.7.0+1
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
-  flutter_driver:
-    sdk: flutter
   flutter_launcher_icons: ^0.8.1
   test: any