diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4a2d90f8..955d74d5 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Android Release
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -13,22 +13,37 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ env.java_version }}
+          cache: 'gradle'
+
+      - name: Install Android SDK
+        run: |
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          unzip commandlinetools.zip
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
+
+      - name: Set up Android environment variables
+        run: |
+          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+
       - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/flutter
           key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
-      - name: Install jq
-        run: |
-          apt update
-          apt-get install -y jq
-
-      - uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "12.x"
-          cache: "gradle"
-
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
@@ -66,9 +81,12 @@ jobs:
           touch .env
           flutter test
 
-#      - name: Build apk
-#        run: flutter build apk
+      - name: Build apk
+        run: flutter build apk
 
-# Runs a set of commands using the runners shell
-#      - name: Start release build
-#        run: flutter build appbundle
+      - name: Rename and move apk
+        run: |
+          TIMESTAMP=$(date +'%Y-%m-%d-%H-%M')
+          APK_NAME="eatvio_app_${TIMESTAMP}.apk"
+          mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
+          echo "APK build finished $APK_NAME"
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 27c7c439..0d9e3349 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on: [ pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -13,6 +13,38 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: ${{ env.java_version }}
+          cache: "gradle"
+
+      - name: Install Android SDK
+        run: |
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          unzip commandlinetools.zip
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
+          yes | sdkmanager --licenses 2>/dev/null || true
+
+      - name: Set up Android environment variables
+        run: |
+          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+
+      - name: Debug Environment Variables
+        run: |
+          echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT"
+          echo "ANDROID_HOME: $ANDROID_HOME"
+          echo "PATH: $PATH"
+
       - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/flutter
@@ -20,15 +52,8 @@ jobs:
 
       - name: Install jq
         run: |
-          apt update
           apt-get install -y jq
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "12.x"
-          cache: "gradle"
-
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
@@ -36,7 +61,7 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
 
-      - name: show cache keys
+      - name: Show cache keys
         run: |
           echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
           echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
@@ -47,10 +72,11 @@ jobs:
           echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
         shell: bash
 
-      - name: fix dir permissions
+      - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter --version
+          flutter config --android-sdk="$ANDROID_HOME"
+          flutter doctor -v
 
       - name: Get dependencies
         run: flutter pub get
@@ -65,3 +91,14 @@ jobs:
         run: |
           touch .env
           flutter test
+
+      - name: Build apk
+        run: |
+          flutter build apk
+
+      - name: Rename and move apk
+        run: |
+          TIMESTAMP=$(date +'%Y-%m-%d-%H-%M')
+          APK_NAME="eatvio_app_${TIMESTAMP}.apk"
+          mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
+          echo "APK build finished $APK_NAME"
diff --git a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
index a2068225..fe468f3b 100644
--- a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
@@ -45,6 +45,7 @@ class ChatSelectScreen extends StatelessWidget {
                 return [
                   SliverAppBar(
                     backgroundColor: Colors.white,
+                    stretchTriggerOffset: 1,
                     forceMaterialTransparency: true,
                     floating: true,
                     snap: true,