From e4d39880fd347630798712910b572222d67298b7 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 28 Sep 2021 20:43:54 +0300
Subject: [PATCH 1/2] Fix crash to render failed message warning stub.

---
 changelog.d/3833.bugfix                             | 1 +
 vector/src/main/res/layout/fragment_room_detail.xml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/3833.bugfix

diff --git a/changelog.d/3833.bugfix b/changelog.d/3833.bugfix
new file mode 100644
index 0000000000..f5378aef6f
--- /dev/null
+++ b/changelog.d/3833.bugfix
@@ -0,0 +1 @@
+[Bug|Crash] Voice Messages sending need more robustfully
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 66dbbd2840..8a77575e52 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -98,7 +98,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="top"
-        app:constraint_referenced_ids="composerLayout,notificationAreaView,failedMessagesWarningView" />
+        app:constraint_referenced_ids="composerLayout,notificationAreaView,failedMessagesWarningStub" />
 
     <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
@@ -159,7 +159,8 @@
         android:id="@+id/failedMessagesWarningStub"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inflatedId="@layout/view_stub_failed_message_warning_layout"
+        android:inflatedId="@+id/failedMessagesWarningStub"
+        android:layout="@layout/view_stub_failed_message_warning_layout"
         app:layout_constraintBottom_toTopOf="@id/composerLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

From 1c12cdd69a0941b8e60c6fc02ca21d9141c99a5b Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 29 Sep 2021 12:46:47 +0300
Subject: [PATCH 2/2] Fix changelog.

---
 changelog.d/3833.bugfix | 1 -
 changelog.d/4110.bugfix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 changelog.d/3833.bugfix
 create mode 100644 changelog.d/4110.bugfix

diff --git a/changelog.d/3833.bugfix b/changelog.d/3833.bugfix
deleted file mode 100644
index f5378aef6f..0000000000
--- a/changelog.d/3833.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-[Bug|Crash] Voice Messages sending need more robustfully
\ No newline at end of file
diff --git a/changelog.d/4110.bugfix b/changelog.d/4110.bugfix
new file mode 100644
index 0000000000..7400a29b95
--- /dev/null
+++ b/changelog.d/4110.bugfix
@@ -0,0 +1 @@
+Crash while rendering failed message warning
\ No newline at end of file