From 556c866d98775a84a2cc81b43e1d3c92c689d95a Mon Sep 17 00:00:00 2001
From: Yamil Medina <yamilmedina@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:08:23 +0100
Subject: [PATCH] chore: remove playtest branch action and adjust size labels
 to kalium values (#2547)

---
 .github/labels.yml                            | 30 +++++++++
 .github/workflows/create-playtest-branch.yml  | 63 -------------------
 .../ui/home/conversations/MessageItem.kt      |  1 +
 kalium                                        |  2 +-
 4 files changed, 32 insertions(+), 64 deletions(-)
 create mode 100644 .github/labels.yml
 delete mode 100644 .github/workflows/create-playtest-branch.yml

diff --git a/.github/labels.yml b/.github/labels.yml
new file mode 100644
index 0000000000..55e879c550
--- /dev/null
+++ b/.github/labels.yml
@@ -0,0 +1,30 @@
+XS:
+    name: size/XS
+    lines: 10
+    color: 3CBF00
+S:
+    name: size/S
+    lines: 100
+    color: 5D9801
+M:
+    name: size/M
+    lines: 300
+    color: 7F7203
+L:
+    name: size/L
+    lines: 500
+    color: A14C05
+XL:
+    name: size/XL
+    lines: 1000
+    color: C32607
+    comment: |
+        # Ups 🫰🟨
+        This PR is too big. Please try to break it up into smaller PRs.
+XXL:
+    name: size/XXL
+    lines: 100000
+    color: E50009
+    comment: |
+        # Ups 🫰🟥
+        This PR is too big. Please break it up into smaller PRs.
diff --git a/.github/workflows/create-playtest-branch.yml b/.github/workflows/create-playtest-branch.yml
deleted file mode 100644
index 54653c1418..0000000000
--- a/.github/workflows/create-playtest-branch.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: "Create a new Playtest branch"
-
-on:
-  schedule:
-    - cron: '30 2 * * THU' # every Thursday at 02:30 UTC
-  workflow_dispatch:
-    inputs:
-      playtest-branch-manual-name:
-        description: 'A name for a playtest/$name branch'
-        required: true
-
-jobs:
-  create-playtest-branch:
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.WIRE_ANDROID_TEAM_WEBHOOK_URL }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive # Needed in order to fetch Kalium sources for building
-          fetch-depth: 0
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-      - name: Manually create a named playtest branch
-        if: ${{ github.event.inputs.playtest-branch-manual-name }}  
-        run: |
-          git checkout develop
-          git submodule update
-          git checkout -b "$PLAYTEST_BRANCH_NAME"
-          git push origin "$PLAYTEST_BRANCH_NAME"
-          gh pr create --draft --base main --title "Playtest Placeholder PR $PLAYTEST_NAME" --body "Do not merge"
-        env:
-          PLAYTEST_BRANCH_NAME: playtest/${{ github.event.inputs.playtest-branch-manual-name }}
-          PLAYTEST_NAME: ${{ github.event.inputs.playtest-branch-manual-name }}
-      - name: Notify on Wire (Manual branch)
-        uses: 8398a7/action-slack@v3
-        if: ${{ github.event.inputs.playtest-branch-manual-name }}
-        env:
-          PLAYTEST_BRANCH_NAME: playtest/${{ github.event.inputs.playtest-branch-manual-name }}
-        with:
-          status: ${{ job.status }}
-          text: "PLAYTEST BRANCH CREATED **${{env.PLAYTEST_BRANCH_NAME}}** 🚀 - Hotfixes only"
-      - name: Automatically Create a named playtest branch
-        if: "${{ github.event.inputs.playtest-branch-manual-name == '' }}"
-        run: |
-          git checkout develop
-          git submodule update
-          git checkout -b "$PLAYTEST_BRANCH_NAME"
-          git push origin "$PLAYTEST_BRANCH_NAME"
-          gh pr create --draft --base main --title "Playtest Placeholder PR ${{ steps.date.outputs.date }}" --body "Do not merge"
-        env:
-          PLAYTEST_BRANCH_NAME: playtest/${{ steps.date.outputs.date }}
-      - name: Notify on Wire (Automatic Branch)
-        uses: 8398a7/action-slack@v3
-        if: "${{ github.event.inputs.playtest-branch-manual-name == '' }}"
-        env:
-          PLAYTEST_BRANCH_NAME: playtest/${{ steps.date.outputs.date }}
-        with:
-          status: ${{ job.status }}
-          text: "Playtest branch **$PLAYTEST_BRANCH_NAME** created 🚀 - Hotfixes only on this branch"
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
index e8df1da46a..2163c7fbdd 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
@@ -348,6 +348,7 @@ fun EphemeralMessageExpiredLabel(isSelfMessage: Boolean, conversationDetailsData
 @Composable
 fun MessageExpireLabel(messageContent: UIMessageContent?, timeLeft: String) {
     when (messageContent) {
+        is UIMessageContent.Location,
         is UIMessageContent.TextMessage -> {
             StatusBox(statusText = stringResource(R.string.self_deleting_message_time_left, timeLeft))
         }
diff --git a/kalium b/kalium
index 3a21d0976f..e07f9911b2 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 3a21d0976fcc39fe6601aba12c531776148add93
+Subproject commit e07f9911b242e74dc67ce6074d6ca4b92607fea2