diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index c90b4ed37e..7456c8f4df 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1096.apk
+apkFileName: com.discord-1097.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -190,5 +190,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '1096'
-  versionName: 18.0-alpha5
+  versionCode: '1097'
+  versionName: 18.0-alpha6
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 509dbe4d28..9fb635b611 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Sat Apr 11 05:16:34 UTC 2020
-version_name=18.0-alpha5
+#Sat Apr 11 18:45:09 UTC 2020
+version_name=18.0-alpha6
 package_name=com.discord
-build_id=f5f29abb-9110-4706-9a1e-a904d9291f23
-version_code=1096
+build_id=ecb95e61-9434-4ad3-bcfd-41613d111c4d
+version_code=1097
 app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index a4a3f340ee..a609efe1d0 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/layout/flex_input_widget.xml b/com.discord/res/layout/flex_input_widget.xml
index 8f760c5e15..c719421736 100644
--- a/com.discord/res/layout/flex_input_widget.xml
+++ b/com.discord/res/layout/flex_input_widget.xml
@@ -6,16 +6,16 @@
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4.0dip" style="@style/FlexInput.Input.Button" />
     </LinearLayout>
     <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
-        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
             <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
             <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
         </LinearLayout>
-        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:hint="@string/send_a_message" android:maxLines="5" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
             <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:tint="?colorInteractiveNormal" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
         </LinearLayout>
-        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:backgroundTint="?chat_send_btn_bg">
+        <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:tint="?chat_send_btn" android:importantForAccessibility="no" />
         </FrameLayout>
         <TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 0049f24724..aa22040494 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1053,7 +1053,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
     <string name="cloud_sync_modal_or">OR</string>
     <string name="collapse">Collapse</string>
     <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">f5f29abb-9110-4706-9a1e-a904d9291f23</string>
+    <string name="com.crashlytics.android.build_id">ecb95e61-9434-4ad3-bcfd-41613d111c4d</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_me_description">Displays text with emphasis.</string>
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 8a90f43620..d63a1cb812 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -40,11 +40,11 @@
 
 .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1096"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1097"
 
-.field public static final VERSION_CODE:I = 0x448
+.field public static final VERSION_CODE:I = 0x449
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "18.0-alpha5"
+.field public static final VERSION_NAME:Ljava/lang/String; = "18.0-alpha6"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 8536c748a0..0aa98f94ef 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    const/16 v0, 0x448
+    const/16 v0, 0x449
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index dd7e3582ae..632c2d2df6 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -181,7 +181,7 @@
 
     const-string v3, "browser_user_agent"
 
-    const-string v4, "Discord-Android/1096"
+    const-string v4, "Discord-Android/1097"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -189,7 +189,7 @@
 
     const/4 v1, 0x2
 
-    const/16 v2, 0x448
+    const/16 v2, 0x449
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -205,7 +205,7 @@
 
     const/4 v1, 0x3
 
-    const-string v2, "18.0-alpha5"
+    const-string v2, "18.0-alpha6"
 
     const-string v3, ""
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
index 7b8b9470d6..964b99240a 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -159,7 +159,7 @@
 .method public getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/1096"
+    const-string v0, "Discord-Android/1097"
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
index df3cc840f8..f6cf308d8b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
@@ -812,7 +812,7 @@
 .end method
 
 .method public onInputTextTouched(Landroid/view/MotionEvent;)Z
-    .locals 12
+    .locals 11
     .annotation build Landroidx/annotation/UiThread;
     .end annotation
 
@@ -830,11 +830,13 @@
 
     move-result-object p1
 
-    move-object v1, p1
+    move-object v0, p1
 
-    check-cast v1, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
+    check-cast v0, Lcom/lytefast/flexinput/viewmodel/FlexInputState;
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
+
+    const/4 v2, 0x0
 
     const/4 v3, 0x0
 
@@ -848,20 +850,16 @@
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    const/4 v1, 0x1
 
-    const/4 v2, 0x1
+    const/16 v10, 0xfe
 
-    const/16 v11, 0xfe
-
-    invoke-static/range {v1 .. v11}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a(Lcom/lytefast/flexinput/viewmodel/FlexInputState;ZLjava/lang/String;ZILjava/util/List;Ljava/lang/Integer;ZZZI)Lcom/lytefast/flexinput/viewmodel/FlexInputState;
+    invoke-static/range {v0 .. v10}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a(Lcom/lytefast/flexinput/viewmodel/FlexInputState;ZLjava/lang/String;ZILjava/util/List;Ljava/lang/Integer;ZZZI)Lcom/lytefast/flexinput/viewmodel/FlexInputState;
 
     move-result-object p1
 
     invoke-virtual {p0, p1}, Lf/a/b/b0;->updateViewState(Ljava/lang/Object;)V
 
-    return v0
-
     :cond_0
     const/4 p1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 1e6dab32c3..ad42f9a3c9 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -492,7 +492,7 @@
 
     new-array v1, v2, [Ljava/lang/Object;
 
-    const-string v3, "18.0-alpha5"
+    const-string v3, "18.0-alpha6"
 
     aput-object v3, v1, v4
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 73e8c4c62d..3cf5c85361 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1987,7 +1987,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 18.0-alpha5 (1096)"
+    const-string v0, " - 18.0-alpha6 (1097)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
index cc610de456..e63bb16279 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
@@ -822,7 +822,7 @@
     :goto_0
     iget-object v4, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->n:Landroidx/appcompat/widget/AppCompatEditText;
 
-    if-eqz v4, :cond_27
+    if-eqz v4, :cond_28
 
     invoke-virtual {v4}, Landroid/widget/EditText;->getEditableText()Landroid/text/Editable;
 
@@ -890,7 +890,7 @@
 
     iget-object v5, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->q:Landroid/view/View;
 
-    if-eqz v5, :cond_26
+    if-eqz v5, :cond_27
 
     const/16 v8, 0x8
 
@@ -910,7 +910,7 @@
 
     iget-object v5, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->p:Landroid/view/View;
 
-    if-eqz v5, :cond_25
+    if-eqz v5, :cond_26
 
     if-eqz v4, :cond_8
 
@@ -926,7 +926,7 @@
 
     iget-object v5, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->o:Landroid/view/View;
 
-    if-eqz v5, :cond_24
+    if-eqz v5, :cond_25
 
     if-eqz v4, :cond_9
 
@@ -944,12 +944,22 @@
 
     move-result v4
 
-    if-eqz v4, :cond_c
+    if-eqz v4, :cond_d
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->e()Ljava/lang/String;
 
     move-result-object v4
 
+    if-eqz v4, :cond_c
+
+    invoke-static {v4}, Lz/a0/u;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object v4
+
     invoke-interface {v4}, Ljava/lang/CharSequence;->length()I
 
     move-result v4
@@ -974,7 +984,7 @@
 
     move-result v4
 
-    if-lez v4, :cond_c
+    if-lez v4, :cond_d
 
     :cond_b
     const/4 v4, 0x1
@@ -982,12 +992,21 @@
     goto :goto_6
 
     :cond_c
+    new-instance p1, Lz/l;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.CharSequence"
+
+    invoke-direct {p1, v0}, Lz/l;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_d
     const/4 v4, 0x0
 
     :goto_6
     iget-object v5, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->l:Landroid/view/View;
 
-    if-eqz v5, :cond_23
+    if-eqz v5, :cond_24
 
     invoke-virtual {v5, v4}, Landroid/view/View;->setEnabled(Z)V
 
@@ -995,7 +1014,7 @@
 
     const-string v10, "sendBtn"
 
-    if-eqz v5, :cond_22
+    if-eqz v5, :cond_23
 
     invoke-virtual {v5, v4}, Landroid/view/View;->setEnabled(Z)V
 
@@ -1007,17 +1026,17 @@
 
     move-result v4
 
-    if-lez v4, :cond_d
+    if-lez v4, :cond_e
 
     const/4 v4, 0x1
 
     goto :goto_7
 
-    :cond_d
+    :cond_e
     const/4 v4, 0x0
 
     :goto_7
-    if-nez v4, :cond_f
+    if-nez v4, :cond_10
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->c()Ljava/util/List;
 
@@ -1027,31 +1046,31 @@
 
     move-result v4
 
-    if-lez v4, :cond_e
+    if-lez v4, :cond_f
 
     goto :goto_8
 
-    :cond_e
+    :cond_f
     const/4 v4, 0x0
 
     goto :goto_9
 
-    :cond_f
+    :cond_10
     :goto_8
     const/4 v4, 0x1
 
     :goto_9
     iget-object v5, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->m:Landroid/view/View;
 
-    if-eqz v5, :cond_21
+    if-eqz v5, :cond_22
 
-    if-eqz v4, :cond_10
+    if-eqz v4, :cond_11
 
     const/4 v10, 0x0
 
     goto :goto_a
 
-    :cond_10
+    :cond_11
     const/16 v10, 0x8
 
     :goto_a
@@ -1061,17 +1080,17 @@
 
     const-string v10, "inputContainer"
 
-    if-eqz v5, :cond_20
+    if-eqz v5, :cond_21
 
     invoke-virtual {v5}, Landroid/view/ViewGroup;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
     move-result-object v5
 
-    if-eqz v5, :cond_1f
+    if-eqz v5, :cond_20
 
     check-cast v5, Landroid/widget/RelativeLayout$LayoutParams;
 
-    if-nez v4, :cond_11
+    if-nez v4, :cond_12
 
     invoke-static {v8}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I
 
@@ -1079,7 +1098,7 @@
 
     goto :goto_b
 
-    :cond_11
+    :cond_12
     const/4 v4, 0x0
 
     :goto_b
@@ -1087,13 +1106,13 @@
 
     iget-object v4, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->g:Landroid/view/ViewGroup;
 
-    if-eqz v4, :cond_1e
+    if-eqz v4, :cond_1f
 
     invoke-virtual {v4, v5}, Landroid/view/ViewGroup;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
     iget-object v4, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->e:Landroid/view/View;
 
-    if-eqz v4, :cond_1d
+    if-eqz v4, :cond_1e
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->c()Ljava/util/List;
 
@@ -1103,19 +1122,19 @@
 
     move-result v5
 
-    if-lez v5, :cond_12
+    if-lez v5, :cond_13
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->b()Z
 
     move-result v5
 
-    if-eqz v5, :cond_12
+    if-eqz v5, :cond_13
 
     const/4 v5, 0x0
 
     goto :goto_c
 
-    :cond_12
+    :cond_13
     const/16 v5, 0x8
 
     :goto_c
@@ -1123,25 +1142,25 @@
 
     iget-object v4, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->d:Landroid/view/ViewGroup;
 
-    if-eqz v4, :cond_1c
+    if-eqz v4, :cond_1d
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->b()Z
 
     move-result v5
 
-    if-eqz v5, :cond_13
+    if-eqz v5, :cond_14
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->a()Z
 
     move-result v5
 
-    if-eqz v5, :cond_13
+    if-eqz v5, :cond_14
 
     const/4 v5, 0x1
 
     goto :goto_d
 
-    :cond_13
+    :cond_14
     const/4 v5, 0x0
 
     :goto_d
@@ -1163,9 +1182,9 @@
 
     move-result-object v4
 
-    if-eqz v4, :cond_15
+    if-eqz v4, :cond_16
 
-    if-nez v0, :cond_14
+    if-nez v0, :cond_15
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->g()Ljava/lang/Integer;
 
@@ -1179,7 +1198,7 @@
 
     goto :goto_e
 
-    :cond_14
+    :cond_15
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->g()Ljava/lang/Integer;
 
     move-result-object v1
@@ -1190,57 +1209,57 @@
 
     iget-object v0, v0, Lf/b/a/a/a;->d:Landroidx/viewpager/widget/ViewPager;
 
-    if-eqz v0, :cond_16
+    if-eqz v0, :cond_17
 
     invoke-virtual {v0, v1}, Landroidx/viewpager/widget/ViewPager;->setCurrentItem(I)V
 
     goto :goto_e
 
-    :cond_15
-    if-eqz v0, :cond_16
+    :cond_16
+    if-eqz v0, :cond_17
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
 
     move-result v1
 
-    if-ne v1, v7, :cond_16
+    if-ne v1, v7, :cond_17
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isDetached()Z
 
     move-result v1
 
-    if-nez v1, :cond_16
+    if-nez v1, :cond_17
 
     invoke-virtual {v0}, Landroidx/fragment/app/DialogFragment;->dismissAllowingStateLoss()V
 
-    :cond_16
+    :cond_17
     :goto_e
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->j:Landroid/view/View;
 
-    if-eqz v0, :cond_1b
+    if-eqz v0, :cond_1c
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->b()Z
 
     move-result v1
 
-    if-nez v1, :cond_17
+    if-nez v1, :cond_18
 
     const/4 v8, 0x0
 
-    :cond_17
+    :cond_18
     invoke-virtual {v0, v8}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->h()Z
 
     move-result v0
 
-    if-eqz v0, :cond_18
+    if-eqz v0, :cond_19
 
     invoke-virtual {v3}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$i;->invoke()V
 
     goto :goto_f
 
-    :cond_18
+    :cond_19
     invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$h;->invoke()Z
 
     :goto_f
@@ -1254,24 +1273,24 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1a
+    if-eqz v0, :cond_1b
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
 
     move-result v1
 
-    if-ne v1, v7, :cond_1a
+    if-ne v1, v7, :cond_1b
 
     instance-of v1, v0, Lf/b/a/e/b;
 
-    if-nez v1, :cond_19
+    if-nez v1, :cond_1a
 
     move-object v0, v6
 
-    :cond_19
+    :cond_1a
     check-cast v0, Lf/b/a/e/b;
 
-    if-eqz v0, :cond_1a
+    if-eqz v0, :cond_1b
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/viewmodel/FlexInputState;->h()Z
 
@@ -1279,36 +1298,36 @@
 
     invoke-interface {v0, p1}, Lf/b/a/e/b;->isShown(Z)V
 
-    :cond_1a
+    :cond_1b
     return-void
 
-    :cond_1b
+    :cond_1c
     const-string p1, "cannotSendText"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_1c
+    :cond_1d
     const-string p1, "leftBtnsContainer"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_1d
+    :cond_1e
     const-string p1, "attachmentPreviewContainer"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_1e
+    :cond_1f
     invoke-static {v10}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_1f
+    :cond_20
     new-instance p1, Lz/l;
 
     const-string v0, "null cannot be cast to non-null type android.widget.RelativeLayout.LayoutParams"
@@ -1317,11 +1336,6 @@
 
     throw p1
 
-    :cond_20
-    invoke-static {v10}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    throw v6
-
     :cond_21
     invoke-static {v10}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
@@ -1333,34 +1347,39 @@
     throw v6
 
     :cond_23
+    invoke-static {v10}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    throw v6
+
+    :cond_24
     const-string p1, "sendBtnImage"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_24
+    :cond_25
     const-string p1, "galleryBtn"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_25
+    :cond_26
     const-string p1, "cameraBtn"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_26
+    :cond_27
     const-string p1, "expandBtn"
 
     invoke-static {p1}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
 
-    :cond_27
+    :cond_28
     invoke-static {v5}, Lz/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     throw v6
@@ -2353,10 +2372,6 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable;
-
-    move-result-object v0
-
     new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$l;
 
     invoke-direct {v1, p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$l;-><init>(Lcom/lytefast/flexinput/fragment/FlexInputFragment;)V