diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml
new file mode 100644
index 0000000000..ebee9aa45a
--- /dev/null
+++ b/.github/workflows/build_nightly.yml
@@ -0,0 +1,152 @@
+name: build_nightly
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+    inputs:
+      build_ios:
+        type: boolean
+        description: iOS
+        default: true
+      build_android:
+        type: boolean
+        description: Android
+        default: true
+      build_web:
+        type: boolean
+        description: Web
+        default: true
+
+defaults:
+  run:
+    working-directory: sample_app
+
+env:
+  FLUTTER_VERSION: "3.29.0"
+  FLUTTER_CHANNEL: stable
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_deploy_ios:
+    runs-on: macos-latest
+    timeout-minutes: 40
+    if: ${{ github.event_name == 'push' || inputs.build_ios == true }}
+    steps:
+      - name: Install Bot SSH Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+
+      - name: Setup Ruby and Gems
+        uses: ruby/setup-ruby@v1
+        with:
+          working-directory: sample_app/ios
+          bundler-cache: true
+
+      - name: Install firebase-tools
+        run: npm install -g firebase-tools
+
+      - name: Copy google service account
+        run: |
+          echo "${{ secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS }}" | base64 --decode | jq > ${{ github.workspace }}/sample_app/ios/firebase-service-account.json
+
+      - name: Build and release
+        working-directory: sample_app/ios
+        env:
+          GOOGLE_APPLICATION_CREDENTIALS: "${{ github.workspace }}/sample_app/ios/firebase-service-account.json"
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+        run: |
+          bundle exec fastlane deploy_to_firebase
+
+  build_and_deploy_android:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    if: ${{ github.event_name == 'push' || inputs.build_android == true }}
+    steps:
+      - name: Install Bot SSH Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          distribution: "zulu"
+          java-version: "17"
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+
+      - name: Build
+        run: flutter build apk
+
+      - name: Copy google service account
+        run: |
+          echo "${{ secrets.SAMPLE_FIREBASE_UPLOAD_CREDENTIALS }}" | base64 --decode | jq > ${{ github.workspace }}/sample_app/android/firebase-service-account.json
+
+      - name: Deploy
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{secrets.SAMPLE_FIREBASE_ANDROID_APPID}}
+          serviceCredentialsFile: "${{ github.workspace }}/sample_app/android/firebase-service-account.json"
+          groups: stream-testers
+          debug: true
+          file: "${{ github.workspace }}/sample_app/build/app/outputs/flutter-apk/app-release.apk"
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-stream-chat-v1
+          path: "${{ github.workspace }}/sample_app/build/app/outputs/flutter-apk/app-release.apk"
+
+  build_and_deploy_web:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: ${{ github.event_name == 'push' || inputs.build_web == true }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: config git
+        run: |
+          git config --global user.email "$(git log --format='%ae' HEAD^!)"
+          git config --global user.name "$(git log --format='%an' HEAD^!)"
+          git fetch origin gh-pages:gh-pages
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+
+      - name: Build and Deploy
+        uses: bluefireteam/flutter-gh-pages@v9
+        with:
+          baseHref: /stream-chat-flutter/
+          workingDir: sample_app
+
+
diff --git a/.github/workflows/pr_title.yml b/.github/workflows/pr_title.yml
index 8b200d5d8c..e9f188d367 100644
--- a/.github/workflows/pr_title.yml
+++ b/.github/workflows/pr_title.yml
@@ -26,6 +26,7 @@ jobs:
             doc
             repo
             localization
+            samples
           requireScope: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c24b8110b1..a35227a8c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ GeneratedPluginRegistrant.*
 **/android/gradlew.bat
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
+**/android/app/.cxx
 
 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -128,5 +129,6 @@ gradle-wrapper.jar
 !/pubspec.lock
 !**/example/web/sql-wasm.js
 !**/example/web/sql-wasm.wasm
+!/sample_app/android/app/google-services.json
 !/sample_app/web/sql-wasm.js
 !/sample_app/web/sql-wasm.wasm
\ No newline at end of file
diff --git a/sample_app/Fastfile b/sample_app/Fastfile
new file mode 100644
index 0000000000..0263840e38
--- /dev/null
+++ b/sample_app/Fastfile
@@ -0,0 +1,31 @@
+opt_out_usage
+
+# Have an easy way to get the root of the project
+def root_path
+  Dir.pwd.sub(/.*\Kfastlane/, '').sub(/.*\Kandroid/, '').sub(/.*\Kios/, '').sub(/.*\K\/\//, '')
+end
+
+# Have an easy way to run flutter tasks on the root of the project
+lane :sh_on_root do |options|
+  Dir.chdir(root_path) { sh(options[:command]) }
+end
+
+# Tasks to be reused on each platform flow
+lane :fetch_dependencies do
+  sh_on_root(command: "flutter pub get --suppress-analytics")
+end
+
+# Tasks to be reused on each platform flow
+lane :build_autogenerated_code do
+  sh_on_root(command: "flutter pub run build_runner build --delete-conflicting-outputs")
+end
+
+# Tasks to be reused on each platform flow
+lane :lint do
+  sh_on_root(command: "flutter format --suppress-analytics --set-exit-if-changed -n lib/main.dart lib/src/ test/")
+end
+
+# Tasks to be reused on each platform flow
+lane :test do |options|
+  sh_on_root(command: "flutter test --no-pub --coverage --suppress-analytics")
+end
\ No newline at end of file
diff --git a/sample_app/android/app/build.gradle b/sample_app/android/app/build.gradle
index f19f37f25f..d4a1985222 100644
--- a/sample_app/android/app/build.gradle
+++ b/sample_app/android/app/build.gradle
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    namespace "com.example.example"
+    namespace "io.getstream.chat.android.flutter.sample"
 
     compileSdkVersion 35
 
@@ -40,10 +40,9 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.example"
+        applicationId "io.getstream.chat.android.flutter.sample"
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
diff --git a/sample_app/android/app/google-services.json b/sample_app/android/app/google-services.json
new file mode 100644
index 0000000000..13b6dba5c5
--- /dev/null
+++ b/sample_app/android/app/google-services.json
@@ -0,0 +1,603 @@
+{
+  "project_info": {
+    "project_number": "674907137625",
+    "firebase_url": "https://stream-chat-internal.firebaseio.com",
+    "project_id": "stream-chat-internal",
+    "storage_bucket": "stream-chat-internal.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:e55b74fd5747e39ad7f348",
+        "android_client_info": {
+          "package_name": "com.example.example"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-2scfo9a5cs074dced5vhm712ej6hhtpm.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.example.example",
+            "certificate_hash": "84e6cb4b0fd5e03f18cc895f25771449543e5b0b"
+          }
+        },
+        {
+          "client_id": "674907137625-c4p9d8pffjokeurnhlkkg0n7hlqhohrp.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.example.example",
+            "certificate_hash": "df0590804ff40703acf8b82d07ed2f8a21cd4cc8"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:5effa1cd0fef9003d7f348",
+        "android_client_info": {
+          "package_name": "com.sampleapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:07c76802bbfd5654d7f348",
+        "android_client_info": {
+          "package_name": "com.sampleapp.rnpushtest"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:c02fbdcc683148e1d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.android.compose.sample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-70lqivg5sj9plf8cadf3mb9d4kqpjgg7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.android.compose.sample",
+            "certificate_hash": "0df0d0349c0eb717eea90c0b41fc00ab1ab04e16"
+          }
+        },
+        {
+          "client_id": "674907137625-plbo43m7pjorusbm76qstde280asrf71.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.android.compose.sample",
+            "certificate_hash": "c3188b0a93adae431af73d407565f38f284cbb4e"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:e96a572655e6c0e8d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.android.compose.sample.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-ioqo27dsi1u5mg7uc9ubgpe0olma47hg.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.android.compose.sample.debug",
+            "certificate_hash": "c3188b0a93adae431af73d407565f38f284cbb4e"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:f4033353c54985b0d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.android.flutter.sample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-0aa50j6b2i35ef9c52lsbk1v16otl492.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.android.flutter.sample",
+            "certificate_hash": "84e6cb4b0fd5e03f18cc895f25771449543e5b0b"
+          }
+        },
+        {
+          "client_id": "674907137625-o2k4no2v5j6kces0b1v7s86mu421u5vm.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.android.flutter.sample",
+            "certificate_hash": "df0590804ff40703acf8b82d07ed2f8a21cd4cc8"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:c41e48c4c799aee8d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.example"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:c36d6f4ab7491192d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.sample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:d91b4d966e372431d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.sample.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:ff6593c705df1c43d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.sdk"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-khntpmmm3s1756v4jugnhcifgjlqrmd0.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.sdk",
+            "certificate_hash": "38f7d663a2ed58ae8990d365c41bd82df62185dc"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:630333f72f5080b2d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.ui.sample"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-8s27vqo4puao5d025nlsakt78j1pnb45.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.ui.sample",
+            "certificate_hash": "0df0d0349c0eb717eea90c0b41fc00ab1ab04e16"
+          }
+        },
+        {
+          "client_id": "674907137625-j82a5eaohtarvub3agqtossi90fpefhg.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.ui.sample",
+            "certificate_hash": "c3188b0a93adae431af73d407565f38f284cbb4e"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:479d5763241739ded7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.ui.sample.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-miq20f82jaeioq126h3sn3sagm5fdbo5.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "io.getstream.chat.ui.sample.debug",
+            "certificate_hash": "c3188b0a93adae431af73d407565f38f284cbb4e"
+          }
+        },
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:47af6d69a27eac48d7f348",
+        "android_client_info": {
+          "package_name": "io.getstream.chat.virtualevent"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:674907137625:android:e20ff8f1ccbf76e4d7f348",
+        "android_client_info": {
+          "package_name": "io.ionic.starter"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBArS4RH7lUn3xbD-jhzWl5hVWZhliRgY0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "674907137625-o5iqvv6dtmljtn069b5djv19ad9a7js0.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "674907137625-2n5l5f3j8chjrgl0hkendtgvlbdnf42j.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.getstream.reactnative.SampleApp"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/sample_app/android/app/src/debug/AndroidManifest.xml b/sample_app/android/app/src/debug/AndroidManifest.xml
index 57257d0647..5afbbfdecd 100644
--- a/sample_app/android/app/src/debug/AndroidManifest.xml
+++ b/sample_app/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/sample_app/android/app/src/main/AndroidManifest.xml b/sample_app/android/app/src/main/AndroidManifest.xml
index 676306632e..8ff8f0abb5 100644
--- a/sample_app/android/app/src/main/AndroidManifest.xml
+++ b/sample_app/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/sample_app/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/sample_app/android/app/src/main/kotlin/io/getstream/chat/android/flutter/sample/MainActivity.kt
similarity index 65%
rename from sample_app/android/app/src/main/kotlin/com/example/example/MainActivity.kt
rename to sample_app/android/app/src/main/kotlin/io/getstream/chat/android/flutter/sample/MainActivity.kt
index e793a000d6..893de3d6bc 100644
--- a/sample_app/android/app/src/main/kotlin/com/example/example/MainActivity.kt
+++ b/sample_app/android/app/src/main/kotlin/io/getstream/chat/android/flutter/sample/MainActivity.kt
@@ -1,6 +1,6 @@
-package com.example.example
+package io.getstream.chat.android.flutter.sample
 
 import io.flutter.embedding.android.FlutterActivity
 
 class MainActivity: FlutterActivity() {
-}
+}
\ No newline at end of file
diff --git a/sample_app/android/build.gradle b/sample_app/android/build.gradle
index 0ef75c8bc5..146fdda907 100644
--- a/sample_app/android/build.gradle
+++ b/sample_app/android/build.gradle
@@ -16,6 +16,9 @@ subprojects {
             def packageName = manifest.@package.text()
             android.namespace= packageName
         }
+        if (project.hasProperty('android')) {
+            project.android { compileSdkVersion 35 }
+        }
     }
 
 }
@@ -25,4 +28,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/sample_app/android/gradle.properties b/sample_app/android/gradle.properties
index 38c8d4544f..57f870060e 100644
--- a/sample_app/android/gradle.properties
+++ b/sample_app/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2g
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/sample_app/ios/Gemfile b/sample_app/ios/Gemfile
index cdd3a6b349..d2c4cce430 100644
--- a/sample_app/ios/Gemfile
+++ b/sample_app/ios/Gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+gem "cocoapods", '~> 1.16.2'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/sample_app/ios/Gemfile.lock b/sample_app/ios/Gemfile.lock
index 85b5b38dd3..d008176201 100644
--- a/sample_app/ios/Gemfile.lock
+++ b/sample_app/ios/Gemfile.lock
@@ -1,52 +1,116 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.512.0)
-    aws-sdk-core (3.121.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-eventstream (1.3.1)
+    aws-partitions (1.1059.0)
+    aws-sdk-core (3.219.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.182.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    claide (1.1.0)
+    cocoapods (1.16.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    drb (2.2.1)
     emoji_regex (3.2.3)
-    excon (0.86.0)
-    faraday (1.8.0)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -55,21 +119,24 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.195.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -78,34 +145,44 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.2.9)
+      xcpretty (~> 0.4.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-firebase_app_distribution (0.10.0)
+      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
+      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    ffi (1.17.1-arm64-darwin)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -113,104 +190,121 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.8.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-firebaseappdistribution_v1 (0.3.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-firebaseappdistribution_v1alpha (0.2.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.0.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.3.0)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    json (2.10.1)
+    jwt (2.10.1)
+      base64
+    logger (1.6.6)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    minitest (5.25.4)
+    molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    nap (1.1.0)
     naturally (2.2.1)
-    optparse (0.1.1)
-    os (1.1.1)
-    plist (3.6.0)
-    public_suffix (4.0.6)
-    rake (13.0.6)
-    representable (3.1.1)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (4.0.7)
+    rake (13.2.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
+    rexml (3.4.1)
+    rouge (3.28.0)
+    ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.16.0)
+    rubyzip (2.4.1)
+    securerandom (0.4.1)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  arm64-darwin-24
 
 DEPENDENCIES
+  cocoapods (~> 1.16.2)
   fastlane
   fastlane-plugin-firebase_app_distribution
 
 BUNDLED WITH
-   2.0.2
+   2.3.3
diff --git a/sample_app/ios/Podfile b/sample_app/ios/Podfile
index 279576f388..10f3c9b470 100644
--- a/sample_app/ios/Podfile
+++ b/sample_app/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/sample_app/ios/Runner.xcodeproj/project.pbxproj b/sample_app/ios/Runner.xcodeproj/project.pbxproj
index d5cbb11dc9..33541bef24 100644
--- a/sample_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/sample_app/ios/Runner.xcodeproj/project.pbxproj
@@ -481,7 +481,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -623,7 +622,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -660,14 +658,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = EHV7XZLAHA;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EHV7XZLAHA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -686,6 +685,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AdHoc io.getstream.flutter 1741161591";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/sample_app/ios/fastlane/Appfile b/sample_app/ios/fastlane/Appfile
index 1803063093..e0624a1c0b 100644
--- a/sample_app/ios/fastlane/Appfile
+++ b/sample_app/ios/fastlane/Appfile
@@ -1,6 +1,8 @@
-# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app
+app_identifier("io.getstream.flutter") # The bundle identifier of your app
 # apple_id("[[APPLE_ID]]") # Your Apple email address
 
+itc_team_id("118902954") # App Store Connect Team ID
+team_id("EHV7XZLAHA") # Developer Portal Team ID
 
 # For more information about the Appfile, see:
 #     https://docs.fastlane.tools/advanced/#appfile
diff --git a/sample_app/ios/fastlane/Fastfile b/sample_app/ios/fastlane/Fastfile
index c072b9f034..a97ad07291 100644
--- a/sample_app/ios/fastlane/Fastfile
+++ b/sample_app/ios/fastlane/Fastfile
@@ -1,6 +1,8 @@
-fastlane_version "2.195.0"
+fastlane_version "2.226.0"
 default_platform :ios
 
+import '../../Fastfile'
+
 before_all do
   if is_ci
     setup_ci()
@@ -10,6 +12,7 @@ end
 desc "Installs all Certs and Profiles necessary for development and ad-hoc"
 lane :match_me do
   match(
+    api_key: appstore_api_key,
     type: "adhoc",
     app_identifier: [
         "io.getstream.flutter",
@@ -19,9 +22,22 @@ lane :match_me do
   )
 end
 
+lane :build do |options|
+    fetch_dependencies
+
+    sign_enabled = options[:sign_enabled] || false
+    sign_param = sign_enabled ? '' : '--no-codesign'
+
+    config_only = options[:config_only] || false
+    config_param = config_only ? '--config-only' : ''
+
+    sh_on_root(command: "flutter build ios --no-pub --suppress-analytics --release #{sign_param} #{config_param}")
+end
+
 desc "Installs all Certs and Profiles necessary for appstore"
 lane :match_appstore do
   match(
+    api_key: appstore_api_key,
     type: "appstore",
     app_identifier: [
         "io.getstream.flutter",
@@ -30,61 +46,68 @@ lane :match_appstore do
   )
 end
 
-platform :ios do
-    desc "Deploy build to Firebase"
-    lane :deploy_to_firebase do
-        match_me
-       
-        gym(
-            workspace: "./Runner.xcworkspace",
-            scheme: "Runner",
-            export_method: "ad-hoc",
-            export_options: "./fastlane/beta_gym_export_options.plist",
-            silent: true,
-            clean: true,
-            include_symbols: true,
-            output_directory: "./dist"
-        )
-
-        message = changelog_from_git_commits(commits_count: 10)
-
-        firebase_app_distribution(
-            app: "1:674907137625:ios:cafb9fb076a453c4d7f348",
-            groups: "ios-stream-testers"
-        )
-    end
+lane :deploy_to_firebase do
+    match_me
+
+    build(
+        sign_enabled: true,
+    )
+
+    build_app(
+      scheme: "Runner",
+      export_method: "ad-hoc",
+      silent: true,
+      clean: true,
+      include_symbols: true,
+      output_directory: './dist',
+    )
+
+    message = changelog_from_git_commits(commits_count: 10)
+
+    firebase_app_distribution(
+        app: "1:674907137625:ios:cafb9fb076a453c4d7f348",
+        groups: "ios-stream-testers"
+    )
+end
+
+lane :deploy_to_testflight do
+    match_appstore
+
+    settings_to_override = {
+      :BUNDLE_IDENTIFIER => "io.getstream.flutter",
+      :PROVISIONING_PROFILE_SPECIFIER => "match AppStore io.getstream.flutter 1651569762"
+    }
+
+    gym(
+        workspace: "./Runner.xcworkspace",
+        scheme: "Runner",
+        export_method: "app-store",
+        export_options: "./fastlane/testflight_gym_export_options.plist",
+        silent: true,
+        clean: true,
+        xcargs: settings_to_override,
+        include_symbols: true,
+        output_directory: "./dist",
+    )
+
+    message = changelog_from_git_commits(commits_count: 10)
+
+    upload_to_testflight(
+        api_key: appstore_api_key,
+        groups: ['Public'],
+        distribute_external: true,
+        changelog: message,
+        username: 'salvatore@getstream.io',
+        reject_build_waiting_for_review: true
+    )
 end
 
-platform :ios do
-    desc "Deploy build to TestFlight"
-    lane :deploy_to_testflight do
-        match_appstore
-
-        settings_to_override = {
-          :BUNDLE_IDENTIFIER => "io.getstream.flutter",
-          :PROVISIONING_PROFILE_SPECIFIER => "match AppStore io.getstream.flutter 1651569762"
-        }
-
-        gym(
-            workspace: "./Runner.xcworkspace",
-            scheme: "Runner",
-            export_method: "app-store",
-            export_options: "./fastlane/testflight_gym_export_options.plist",
-            silent: true,
-            clean: true,
-            xcargs: settings_to_override,
-            include_symbols: true,
-            output_directory: "./dist",
-        )
-
-        message = changelog_from_git_commits(commits_count: 10)
-
-        upload_to_testflight(
-            groups: ['Public'],
-            distribute_external: true,
-            changelog: message,
-            username: 'salvatore@getstream.io',
-            reject_build_waiting_for_review: true
-        )
-    end
+
+private_lane :appstore_api_key do
+@appstore_api_key ||= app_store_connect_api_key(
+  key_id: 'MT3PRT8TB7',
+  issuer_id: '69a6de96-0738-47e3-e053-5b8c7c11a4d1',
+  key_content: ENV.fetch('APPSTORE_API_KEY', nil),
+  in_house: false
+)
 end
diff --git a/sample_app/ios/fastlane/Matchfile b/sample_app/ios/fastlane/Matchfile
index cc976de1a7..9f0fbf4a76 100644
--- a/sample_app/ios/fastlane/Matchfile
+++ b/sample_app/ios/fastlane/Matchfile
@@ -1,16 +1,3 @@
-git_url("https://github.com/GetStream/ios-certificates")
-
+git_url("git@github.com:GetStream/ios-certificates.git")
 storage_mode("git")
-
-username("salvatore@getstream.io")
-
 team_id("EHV7XZLAHA")
-
-# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
-
-# username("user@fastlane.tools") # Your Apple Developer Portal username
-
-# For all available options run `fastlane match --help`
-# Remove the # in the beginning of the line to enable the other options
-
-# The docs are available on https://docs.fastlane.tools/actions/match